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

[addresses] sort combined Japanese suburbs by admin level

Browse Source
This commit is contained in:
Al
2016-12-25 02:29:06 -05:00
parent 98e427f027
commit 4cf40f8deb
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -834,6 +834,19 @@ class AddressComponents(object):
hyphen = six.u('-') if random.random < 0.5 else six.u(' ') hyphen = six.u('-') if random.random < 0.5 else six.u(' ')
address_components[AddressFormatter.SUBURB] = six.u('{}{}{}').format(neighborhood, hyphen, suffix) address_components[AddressFormatter.SUBURB] = six.u('{}{}{}').format(neighborhood, hyphen, suffix)
japanese_node_admin_level_map = {
'quarter': 9,
'neighborhood': 10,
'neighbourhood': 10,
}
def japanese_neighborhood_sort_key(self, val):
admin_level = val.get('admin_level')
if admin_level and admin_level.isdigit():
return int(admin_level)
else:
return self.japanese_node_admin_level_map.get(p.get('place'), 1000)
def abbreviated_state(self, state, country, language): def abbreviated_state(self, state, country, language):
abbreviate_state_prob = float(nested_get(self.config, ('state', 'abbreviated_probability'))) abbreviate_state_prob = float(nested_get(self.config, ('state', 'abbreviated_probability')))
@@ -955,6 +968,9 @@ class AddressComponents(object):
for component, components_values in grouped_osm_components.iteritems(): for component, components_values in grouped_osm_components.iteritems():
seen = set() seen = set()
if country == JAPAN and component == AddressFormatter.SUBURB:
component_values = sorted(component_values, key=self.japanese_neighborhood_sort_key)
for component_value in components_values: for component_value in components_values:
if random_key and not (component in (AddressFormatter.STATE_DISTRICT, AddressFormatter.STATE) and not have_city): if random_key and not (component in (AddressFormatter.STATE_DISTRICT, AddressFormatter.STATE) and not have_city):
key, raw_key = self.pick_random_name_key(component_value, component, suffix=language_suffix) key, raw_key = self.pick_random_name_key(component_value, component, suffix=language_suffix)