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

[openaddresses] use override_country_dir config option in OA address formatter

Browse Source
This commit is contained in:
Al
2017-03-01 13:52:07 -05:00
parent 0890c712e2
commit a5d8700df3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,8 @@ class OpenAddressesFormatter(object):
pass pass
return num return num
def fix_component_encodings(self, components): @classmethod
def fix_component_encodings(cls, components):
return {k: ftfy.fix_encoding(safe_decode(v)) for k, v in six.iteritems(components)} return {k: ftfy.fix_encoding(safe_decode(v)) for k, v in six.iteritems(components)}
def formatted_addresses(self, country_dir, path, configs, tag_components=True): def formatted_addresses(self, country_dir, path, configs, tag_components=True):
@@ -307,6 +308,8 @@ class OpenAddressesFormatter(object):
city_replacements = self.get_property('city_replacements', *configs) city_replacements = self.get_property('city_replacements', *configs)
override_country_dir = set(self.get_property('override_country_dir', *configs) or None)
postcode_length = int(self.get_property('postcode_length', *configs) or 0) postcode_length = int(self.get_property('postcode_length', *configs) or 0)
drop_address_probability = place_only_probability + place_and_postcode_probability drop_address_probability = place_only_probability + place_and_postcode_probability
@@ -420,7 +423,7 @@ class OpenAddressesFormatter(object):
if components: if components:
country, candidate_languages = self.country_rtree.country_and_languages(latitude, longitude) country, candidate_languages = self.country_rtree.country_and_languages(latitude, longitude)
if not (country and candidate_languages) or country != country_dir: if not (country and candidate_languages) or (country != country_dir and not override_country_dir):
country = country_dir country = country_dir
candidate_languages = get_country_languages(country) candidate_languages = get_country_languages(country)
if not candidate_languages: if not candidate_languages: