[osm] In the case of semicolon delimited names, choose one at random

This commit is contained in:
Al
2016-07-26 18:20:56 -04:00
parent 0c1b12b65c
commit bdba0a4200

View File

@@ -445,6 +445,9 @@ class OSMAddressFormatter(object):
language_suffix = ''
if name and name.strip():
if six.u(';') in name:
name = random.choice(name.split(six.u(';')))
for i in xrange(num_references if name_tag == 'name' else 1):
address_components = {component_name: name.strip()}
self.components.add_admin_boundaries(address_components, osm_components, country, UNKNOWN_LANGUAGE,
@@ -465,6 +468,9 @@ class OSMAddressFormatter(object):
if not name or not name.strip():
continue
if six.u(';') in name:
name = random.choice(name.split(six.u(';')))
for i in xrange(num_references if is_default and name_tag == 'name' else 1):
address_components = {component_name: name.strip()}
self.components.add_admin_boundaries(address_components, osm_components, country, language,
@@ -484,6 +490,9 @@ class OSMAddressFormatter(object):
if not name or not name.strip():
continue
if six.u(';') in name:
name = random.choice(name.split(six.u(';')))
address_components = {component_name: name.strip()}
self.components.add_admin_boundaries(address_components, osm_components, country, language,
random_key=False,