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

[fix] all_names, use values instead of name keys

Browse Source
This commit is contained in:
Al
2016-12-18 17:29:15 -05:00
parent e9c7bc43e3
commit d02a18a5a8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/geodata/addresses/components.py
View File

@@ -310,15 +310,17 @@ class AddressComponents(object):
def all_names(self, props, languages, component=None, keys=ALL_OSM_NAME_KEYS): def all_names(self, props, languages, component=None, keys=ALL_OSM_NAME_KEYS):
# Preserve uniqueness and order # Preserve uniqueness and order
valid_names, _ = boundary_names.name_key_dist(props, component) valid_names, _ = boundary_names.name_key_dist(props, component)
names = OrderedDict.fromkeys([k for k in valid_names if k in keys]) names = OrderedDict()
valid_names = set(names) valid_names = set([k for k in valid_names if k in keys])
for k, v in six.iteritems(props): for k, v in six.iteritems(props):
if ':' in k: if k in valid_names:
names[v] = None
elif ':' in k:
if k == 'name:simple' and 'en' in languages and k in keys: if k == 'name:simple' and 'en' in languages and k in keys:
names[v] = None names[v] = None
k, qual = k.split(':', 1) k, qual = k.split(':', 1)
if k in valid_names and qual.split('_', 1)[0] in languages and k in keys: if k in valid_names and qual.split('_', 1)[0] in languages:
names[v] = None names[v] = None
return names.keys() return names.keys()