An estimated location of an access point is generated based on identification of indoor and outdoor locations and the presumption that most access points are in an indoor location. The estimated location may be produced using location information for the access point and the identification of the indoor and outdoor locations while prioritizing the indoor location to produce the estimated location on or within a boundary of the indoor location. The location information may be, e.g., a preliminary estimated location or wireless signal measurements and associated position fixes for the access point. For example, a preliminary estimated location may be shifted to be on or within the nearest boundary of an indoor location or may be adjusted based on the location information. The estimated location may be calculated directly using weights to bias the calculation of the estimated location to be on or within the boundary of the indoor location.