tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] Quattroshapes neighborhoods index uses geohashes for slightly better coverage

Browse Source
This commit is contained in:
Al
2015-11-26 12:45:54 -05:00
parent 98d8054a2b
commit 4cff1f8a9d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/geodata/polygons/reverse_geocode.py
View File

@@ -252,7 +252,7 @@ class NeighborhoodReverseGeocoder(RTreePolygonIndex):
ensure_dir(qs_scratch_dir) ensure_dir(qs_scratch_dir)
logger.info('Creating Quattroshapes neighborhoods') logger.info('Creating Quattroshapes neighborhoods')
qs = QuattroshapesReverseGeocoder.create_neighborhoods_index(quattroshapes_dir, qs_scratch_dir) qs = QuattroshapesNeighborhoodsReverseGeocoder.create_neighborhoods_index(quattroshapes_dir, qs_scratch_dir)
logger.info('Creating Zetashapes neighborhoods') logger.info('Creating Zetashapes neighborhoods')
zs = cls.create_zetashapes_neighborhoods_index() zs = cls.create_zetashapes_neighborhoods_index()
@@ -574,6 +574,16 @@ class QuattroshapesReverseGeocoder(RTreePolygonIndex):
output_dir, index_filename=index_filename, output_dir, index_filename=index_filename,
polys_filename=polys_filename) polys_filename=polys_filename)
def sort_level(self, i):
props, p = self.polygons[i]
return self.sort_levels.get(props[self.LEVEL], 0)
def get_candidate_polygons(self, lat, lon):
candidates = super(QuattroshapesReverseGeocoder, self).get_candidate_polygons(lat, lon)
return sorted(candidates, key=self.sort_level, reverse=True)
class QuattroshapesNeighborhoodsReverseGeocoder(GeohashPolygonIndex, QuattroshapesReverseGeocoder):
@classmethod @classmethod
def create_neighborhoods_index(cls, quattroshapes_dir, def create_neighborhoods_index(cls, quattroshapes_dir,
output_dir, output_dir,
@@ -585,14 +595,6 @@ class QuattroshapesReverseGeocoder(RTreePolygonIndex):
output_dir, index_filename=index_filename, output_dir, index_filename=index_filename,
polys_filename=polys_filename) polys_filename=polys_filename)
def sort_level(self, i):
props, p = self.polygons[i]
return self.sort_levels.get(props[self.LEVEL], 0)
def get_candidate_polygons(self, lat, lon, return_all=False):
candidates = super(QuattroshapesReverseGeocoder, self).get_candidate_polygons(lat, lon, return_all=return_all)
return sorted(candidates, key=self.sort_level, reverse=True)
class OSMReverseGeocoder(RTreePolygonIndex): class OSMReverseGeocoder(RTreePolygonIndex):
''' '''