[polygons/quattroshapes] Converting Quattroshapes lookups to an R-tree index

This commit is contained in:
Al
2015-11-25 19:37:57 -05:00
parent 8a8e45f2a6
commit 98d8054a2b

View File

@@ -391,7 +391,7 @@ class NeighborhoodReverseGeocoder(RTreePolygonIndex):
return sorted(candidates, key=self.priority) return sorted(candidates, key=self.priority)
class QuattroshapesReverseGeocoder(GeohashPolygonIndex): class QuattroshapesReverseGeocoder(RTreePolygonIndex):
''' '''
Quattroshapes polygons, for levels up to localities, are relatively Quattroshapes polygons, for levels up to localities, are relatively
accurate and provide concordance with GeoPlanet and in some cases accurate and provide concordance with GeoPlanet and in some cases
@@ -589,8 +589,8 @@ class QuattroshapesReverseGeocoder(GeohashPolygonIndex):
props, p = self.polygons[i] props, p = self.polygons[i]
return self.sort_levels.get(props[self.LEVEL], 0) return self.sort_levels.get(props[self.LEVEL], 0)
def get_candidate_polygons(self, lat, lon, all_levels=False): def get_candidate_polygons(self, lat, lon, return_all=False):
candidates = super(QuattroshapesReverseGeocoder, self).get_candidate_polygons(lat, lon, all_levels=all_levels) candidates = super(QuattroshapesReverseGeocoder, self).get_candidate_polygons(lat, lon, return_all=return_all)
return sorted(candidates, key=self.sort_level, reverse=True) return sorted(candidates, key=self.sort_level, reverse=True)