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

[osm] Add CLDR country before dropout

Browse Source
This commit is contained in:
Al
2016-07-28 14:41:14 -04:00
parent bebb33fe64
commit 854e6d901f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -536,16 +536,17 @@ class OSMAddressFormatter(object):
revised_place_tags = [] revised_place_tags = []
for address_components, language, is_default in place_tags: for address_components, language, is_default in place_tags:
if (AddressFormatter.COUNTRY in address_components or place_config.include_component(AddressFormatter.COUNTRY, containing_ids, country=country)) and random.random() < cldr_country_prob:
address_country = self.components.cldr_country_name(country, language)
if address_country:
address_components[AddressFormatter.COUNTRY] = address_country
new_address_components = place_config.dropout_components(address_components, osm_components, country=country) new_address_components = place_config.dropout_components(address_components, osm_components, country=country)
new_address_components[component_name] = address_components[component_name] new_address_components[component_name] = address_components[component_name]
self.components.drop_invalid_components(new_address_components) self.components.drop_invalid_components(new_address_components)
if new_address_components:
if (AddressFormatter.COUNTRY in new_address_components or place_config.include_component(AddressFormatter.COUNTRY, containing_ids, country=country)) and random.random() < cldr_country_prob:
address_country = self.components.cldr_country_name(country, language)
if address_country:
new_address_components[AddressFormatter.COUNTRY] = address_country
if new_address_components:
revised_place_tags.append((new_address_components, language, is_default)) revised_place_tags.append((new_address_components, language, is_default))
return revised_place_tags, country return revised_place_tags, country