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

[fix] ordering and reverse geocoder fields

Browse Source
This commit is contained in:
Al
2015-10-13 22:26:30 -04:00
parent e7b1040a47
commit f5bf7b8f2d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,10 +41,10 @@ class ReverseGeocoder(RTreePolygonIndex):
NEIGHBORHOOD = 'neighborhood' NEIGHBORHOOD = 'neighborhood'
sorted_levels = (COUNTRY, sorted_levels = (COUNTRY,
ADMIN1,
ADMIN1_REGION, ADMIN1_REGION,
ADMIN2, ADMIN1,
ADMIN2_REGION, ADMIN2_REGION,
ADMIN2,
LOCAL_ADMIN, LOCAL_ADMIN,
LOCALITY, LOCALITY,
NEIGHBORHOOD, NEIGHBORHOOD,
@@ -103,21 +103,19 @@ class ReverseGeocoder(RTreePolygonIndex):
}, },
LOCALITIES_FILENAME: { LOCALITIES_FILENAME: {
NAME: ('qs_loc', safe_decode), NAME: ('qs_loc', safe_decode),
CODE: ('qs_loc_alt', safe_decode),
LEVEL: ('qs_level', safe_decode), LEVEL: ('qs_level', safe_decode),
GEONAMES_ID: ('qs_gn_id', str), GEONAMES_ID: ('qs_gn_id', str),
WOE_ID: ('qs_woe_id', str), WOE_ID: ('qs_woe_id', str),
}, },
NEIGHBORHOODS_FILENAME: { NEIGHBORHOODS_FILENAME: {
NAME: (NAME, safe_decode), NAME: ('name', safe_decode),
CODE: ('name_en', safe_decode), CODE: ('name_en', safe_decode),
LEVEL: ('qs_level', safe_decode), LEVEL: ('qs_level', safe_decode),
GEONAMES_ID: (WOE_ID, str_id), GEONAMES_ID: ('gn_id', str_id),
WOE_ID: ('gn_id', str_id), WOE_ID: ('woe_id', str_id),
} }
} }
@classmethod @classmethod
def create_from_shapefiles(cls, def create_from_shapefiles(cls,
input_files, input_files,