[osm] In the case of semicolon delimited names, choose one at random
This commit is contained in:
@@ -445,6 +445,9 @@ class OSMAddressFormatter(object):
|
|||||||
language_suffix = ''
|
language_suffix = ''
|
||||||
|
|
||||||
if name and name.strip():
|
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):
|
for i in xrange(num_references if name_tag == 'name' else 1):
|
||||||
address_components = {component_name: name.strip()}
|
address_components = {component_name: name.strip()}
|
||||||
self.components.add_admin_boundaries(address_components, osm_components, country, UNKNOWN_LANGUAGE,
|
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():
|
if not name or not name.strip():
|
||||||
continue
|
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):
|
for i in xrange(num_references if is_default and name_tag == 'name' else 1):
|
||||||
address_components = {component_name: name.strip()}
|
address_components = {component_name: name.strip()}
|
||||||
self.components.add_admin_boundaries(address_components, osm_components, country, language,
|
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():
|
if not name or not name.strip():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
if six.u(';') in name:
|
||||||
|
name = random.choice(name.split(six.u(';')))
|
||||||
|
|
||||||
address_components = {component_name: name.strip()}
|
address_components = {component_name: name.strip()}
|
||||||
self.components.add_admin_boundaries(address_components, osm_components, country, language,
|
self.components.add_admin_boundaries(address_components, osm_components, country, language,
|
||||||
random_key=False,
|
random_key=False,
|
||||||
|
|||||||
Reference in New Issue
Block a user