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

[fix] toponym abbreviations after country name, may want to use it

Browse Source
This commit is contained in:
Al
2016-09-10 00:49:31 -04:00
parent bbc5131cb6
commit bcde9e2fe7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,6 +375,11 @@ class OpenAddressesFormatter(object):
components.pop(AddressFormatter.UNIT) components.pop(AddressFormatter.UNIT)
unit = None unit = None
# CLDR country name
country_name = self.cldr_country_name(country, language, configs)
if country_name:
components[AddressFormatter.COUNTRY] = country_name
for component_key in AddressFormatter.BOUNDARY_COMPONENTS: for component_key in AddressFormatter.BOUNDARY_COMPONENTS:
component = components.get(component_key, None) component = components.get(component_key, None)
if component is not None: if component is not None:
@@ -382,11 +387,6 @@ class OpenAddressesFormatter(object):
abbreviate_prob=abbreviate_toponym_prob) abbreviate_prob=abbreviate_toponym_prob)
components[component_key] = component components[component_key] = component
# CLDR country name
country_name = self.cldr_country_name(country, language, configs)
if country_name:
components[AddressFormatter.COUNTRY] = country_name
# Any components specified to be added by the config (usually state) # Any components specified to be added by the config (usually state)
if add_components: if add_components:
for k, v in six.iteritems(add_components): for k, v in six.iteritems(add_components):