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

[fix] make sure values are hashable in mapping OSM components

Browse Source
This commit is contained in:
Al
2016-07-23 03:04:23 -04:00
parent 31db378303
commit 2a634797ec
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
import collections
import os import os
import six import six
import yaml import yaml
@@ -101,15 +102,17 @@ class OSMAddressComponents(object):
config.update(config_updates) config.update(config_updates)
break break
values = [(k, v) for k, v in six.iteritems(properties) if isinstance(v, collections.Hashable)]
# place=city, place=suburb, etc. override per-country boundaries # place=city, place=suburb, etc. override per-country boundaries
for k, v in six.iteritems(properties): for k, v in values:
containing_component = self.global_keys_override.get(k, {}).get(v, None) containing_component = self.global_keys_override.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 # admin_level tags are mapped per country
for k, v in six.iteritems(properties): for k, v in values:
containing_component = config.get(k, {}).get(v, None) containing_component = config.get(k, {}).get(v, None)
if containing_component is not None: if containing_component is not None:
@@ -117,7 +120,7 @@ class OSMAddressComponents(object):
# other place keys like place=state, etc. serve as a backup # other place keys like place=state, etc. serve as a backup
# when no boundaries are available # when no boundaries are available
for k, v in six.iteritems(properties): for k, v in values:
containing_component = self.global_keys.get(k, {}).get(v, None) containing_component = self.global_keys.get(k, {}).get(v, None)
if containing_component is not None: if containing_component is not None: