A method of associating environmental context with wireless access points is disclosed. In some embodiments, a method on a user equipment may comprise determining at least one environmental context associated with a subset of one or more Access Points (APs) visible to the UE at an estimated location of the UE. The at least one environmental context associated with the subset may be determined based on one or more of wireless measurements by the UE, and/or sensor measurements by the UE. Further, at least one AP cluster may be determined by clustering the subset of the one or more APs visible to the UE based on the at least one environmental context and the estimated location. Environmental context for APs may be crowdsourced and stored and provided to a UE as location assistance information to facilitate location determination and other functions.