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

[fix] var names in osm component mapping

Browse Source
This commit is contained in:
Al
2016-07-23 02:05:41 -04:00
parent ba507fded0
commit 53f6053ec6
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/geodata/osm/components.py
View File

@@ -101,20 +101,22 @@ class OSMAddressComponents(object):
config.update(config_updates) config.update(config_updates)
break break
# Necessary to do this. # place=city, place=suburb, etc. override per-country boundaries
for k, v in six.iteritems(properties): for k, v in six.iteritems(properties):
override_component = self.global_keys_override.get(k, {}).get(v, None) containing_component = self.global_keys_override.get(k, {}).get(v, None)
if override_component is not None:
return containing_component
for k, v in six.iteritems(properties):
if containing_component is None:
containing_component = config.get(k, {}).get(v, None)
if containing_component is not None: if containing_component is not None:
return containing_component return containing_component
# admin_level tags are mapped per country
for k, v in six.iteritems(properties):
containing_component = config.get(k, {}).get(v, None)
if containing_component is not None:
return containing_component
# other place keys like place=state, etc. serve as a backup
# when no boundaries are available
for k, v in six.iteritems(properties): for k, v in six.iteritems(properties):
containing_component = self.global_keys.get(k, {}).get(v, None) containing_component = self.global_keys.get(k, {}).get(v, None)