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

[fix] moving language code replacements out of address components

Browse Source
This commit is contained in:
Al
2016-05-24 16:55:46 -04:00
parent c4aebeebc3
commit 206cd56cd2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/geodata/addresses/components.py
View File

@@ -136,8 +136,6 @@ class AddressComponents(object):
# Non-admin component dropout # Non-admin component dropout
self.address_level_dropout_probabilities = {k: v['probability'] for k, v in six.iteritems(self.config['dropout'])} self.address_level_dropout_probabilities = {k: v['probability'] for k, v in six.iteritems(self.config['dropout'])}
self.language_code_replacements = nested_get(self.config, ('languages', 'language_code_replacements'))
self.osm_admin_rtree = osm_admin_rtree self.osm_admin_rtree = osm_admin_rtree
self.language_rtree = language_rtree self.language_rtree = language_rtree
self.neighborhoods_rtree = neighborhoods_rtree self.neighborhoods_rtree = neighborhoods_rtree
@@ -1113,8 +1111,7 @@ class AddressComponents(object):
self.drop_invalid_components(address_components) self.drop_invalid_components(address_components)
if language_suffix and not non_local_language: if language_suffix and not non_local_language:
suffix_lang = language_suffix.lstrip(':') language = language_suffix.lstrip(':')
language = self.language_code_replacements.get(suffix_lang, language)
return address_components, country, language return address_components, country, language
@@ -1182,4 +1179,8 @@ class AddressComponents(object):
self.replace_names(address_components) self.replace_names(address_components)
self.prune_duplicate_names(address_components) self.prune_duplicate_names(address_components)
if language_suffix and not non_local_language:
language = language_suffix.lstrip(':').lower()
return address_components, country, language return address_components, country, language