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

[fix] only using the revised address components for CLDR country name

Browse Source
This commit is contained in:
Al
2017-01-12 02:33:16 -05:00
parent 88a80f4e30
commit 122d7b2b79
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,7 +734,7 @@ class OSMAddressFormatter(object):
for name_tag in ('name', 'alt_name', 'loc_name', 'short_name', 'int_name', 'name:simple', 'official_name'): for name_tag in ('name', 'alt_name', 'loc_name', 'short_name', 'int_name', 'name:simple', 'official_name'):
if more_than_one_official_language: if more_than_one_official_language:
name = revised_tags.get(name_tag) name = tags.get(name_tag)
language_suffix = '' language_suffix = ''
if name and name.strip(): if name and name.strip():
@@ -769,10 +769,10 @@ class OSMAddressFormatter(object):
for language, is_default in local_languages: for language, is_default in local_languages:
if is_default and not more_than_one_official_language: if is_default and not more_than_one_official_language:
language_suffix = '' language_suffix = ''
name = revised_tags.get(name_tag) name = tags.get(name_tag)
else: else:
language_suffix = ':{}'.format(language) language_suffix = ':{}'.format(language)
name = revised_tags.get('{}{}'.format(name_tag, language_suffix)) name = tags.get('{}{}'.format(name_tag, language_suffix))
if not name or not name.strip(): if not name or not name.strip():
continue continue
@@ -814,9 +814,9 @@ class OSMAddressFormatter(object):
for language in random_languages - all_local_languages: for language in random_languages - all_local_languages:
language_suffix = ':{}'.format(language) language_suffix = ':{}'.format(language)
name = revised_tags.get('{}{}'.format(name_tag, language_suffix)) name = tags.get('{}{}'.format(name_tag, language_suffix))
if (not name or not name.strip()) and language == ENGLISH: if (not name or not name.strip()) and language == ENGLISH:
name = revised_tags.get(name_tag) name = tags.get(name_tag)
if not name or not name.strip(): if not name or not name.strip():
continue continue