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

[fix] languages

Browse Source
This commit is contained in:
Al
2016-08-18 02:24:34 -04:00
parent e3ac3200b3
commit 688f103e80
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/geodata/osm/formatter.py
View File

@@ -1079,17 +1079,23 @@ class OSMAddressFormatter(object):
break break
way_names = [] way_names = []
languages = set([None]) namespaced_languages = set([None])
default_language = None default_language = None
for way in ways: for way in ways:
names = defaultdict(list) names = defaultdict(list)
for tag in way: for tag in way:
base_tag = tag.rsplit(':', 1)[0] tag = safe_decode(tag)
base_tag = tag.rsplit(six.u(':'), 1)[0]
if base_tag not in all_name_tags: if base_tag not in all_name_tags:
continue continue
lang = tag.rsplit(':')[-1] if ':' in tag else None lang = safe_decode(tag.rsplit(six.u(':'))[-1]) if six.u(':') in tag else None
languages.add(lang) if lang and lang.lower() in all_languages:
lang = lang.lower()
else:
lang = None
namespaced_languages.add(lang)
name = way[tag] name = way[tag]
if default_language is None and tag == 'name': if default_language is None and tag == 'name':
@@ -1112,7 +1118,7 @@ class OSMAddressFormatter(object):
language_components = {} language_components = {}
for namespaced_language in languages: for namespaced_language in namespaced_languages:
address_components, _, _ = self.components.expanded({}, latitude, longitude, language=namespaced_language or default_language) address_components, _, _ = self.components.expanded({}, latitude, longitude, language=namespaced_language or default_language)
language_components[namespaced_language] = address_components language_components[namespaced_language] = address_components