A technique for the estimation of the location of a wireless terminal. The disclosed technique considers boundaries that are represented in a geographic information system (GIS) database in combination with a first, unenhanced estimate of location, in order to generate a second, enhanced estimate of location. To do so, the technique generates a point cloud based on the first estimate of location. At least some of the data points in the point cloud are then removed, depending on their positions in relation to certain boundaries stored in the GIS database, such as the exterior walls of buildings and other structures. By considering these boundaries, the disclosed technique can increase the probability that the estimated location is within an area that is occupiable by a person, thereby providing a more reasonable result. The technique generates the second, enhanced estimate based on the distribution of the remaining data points.