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

[fix] include properties

Browse Source
This commit is contained in:
Al
2015-10-13 10:58:42 -04:00
parent 5b1447684d
commit b90bf19133
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ sys.path.append(os.path.realpath(os.path.join(os.pardir, os.pardir)))
from geodata.polygons.index import * from geodata.polygons.index import *
from geodata.encoding import safe_decode from geodata.encoding import safe_decode
class ReverseGeocoder(RTreePolygonIndex): class ReverseGeocoder(RTreePolygonIndex):
COUNTRIES_FILENAME = 'qs_adm0.shp' COUNTRIES_FILENAME = 'qs_adm0.shp'
ADMIN1_FILENAME = 'qs_adm1.shp' ADMIN1_FILENAME = 'qs_adm1.shp'
@@ -94,8 +95,7 @@ class ReverseGeocoder(RTreePolygonIndex):
input_files, input_files,
output_dir, output_dir,
index_filename=DEFAULT_INDEX_FILENAME, index_filename=DEFAULT_INDEX_FILENAME,
polys_filename=DEFAULT_POLYS_FILENAME, polys_filename=DEFAULT_POLYS_FILENAME):
include_only_properties=None):
index = cls(save_dir=output_dir, index_filename=index_filename) index = cls(save_dir=output_dir, index_filename=index_filename)
@@ -104,7 +104,7 @@ class ReverseGeocoder(RTreePolygonIndex):
for input_file in input_files: for input_file in input_files:
f = fiona.open(input_file) f = fiona.open(input_file)
include_props = polygon_properties.get(input_file) include_props = cls.polygon_properties.get(input_file)
filename = os.path.split(input_file)[-1] filename = os.path.split(input_file)[-1]
@@ -161,17 +161,11 @@ class ReverseGeocoder(RTreePolygonIndex):
localities_filename = os.path.join(quattroshapes_dir, cls.LOCALITIES_FILENAME) localities_filename = os.path.join(quattroshapes_dir, cls.LOCALITIES_FILENAME)
neighborhoods_filename = os.path.join(quattroshapes_dir, cls.NEIGHBORHOODS_FILENAME) neighborhoods_filename = os.path.join(quattroshapes_dir, cls.NEIGHBORHOODS_FILENAME)
include_properties = {
os.path.join(quattroshapes_dir, filename): value
for filename, value in cls.include_properties_by_file.iteritems()
}
return cls.create_from_shapefiles([admin0_filename, admin1_filename, admin1r_filename, return cls.create_from_shapefiles([admin0_filename, admin1_filename, admin1r_filename,
admin2_filename, admin2r_filename, local_admin_filename, admin2_filename, admin2r_filename, local_admin_filename,
localities_filename, neighborhoods_filename], localities_filename, neighborhoods_filename],
output_dir, index_filename=index_filename, output_dir, index_filename=index_filename,
polys_filename=polys_filename, polys_filename=polys_filename)
include_only_properties=include_properties)
def sort_level(self, i): def sort_level(self, i):
props, p = self.polygons[i] props, p = self.polygons[i]