From 1ccea09a92761f6919525dd2612727e055ddec62 Mon Sep 17 00:00:00 2001 From: Al Date: Mon, 25 Jul 2016 01:16:27 -0400 Subject: [PATCH] [osm] Don't call components.normalize_place_names in OSM address formatting, only add place components population / 10000 + 1 times for the name tag itself, not loc_name, int_name, etc. --- scripts/geodata/osm/formatter.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py index 6314af12..dab0b7de 100644 --- a/scripts/geodata/osm/formatter.py +++ b/scripts/geodata/osm/formatter.py @@ -425,14 +425,12 @@ class OSMAddressFormatter(object): language_suffix = '' if name and name.strip(): - for i in xrange(num_references): + 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, language, random_key=num_references > 1, language_suffix=language_suffix) - self.components.normalize_place_names(address_components, osm_components, country=country, languages=all_local_languages) - place_tags.append((address_components, None, True)) for language, is_default in local_languages: @@ -446,14 +444,12 @@ class OSMAddressFormatter(object): if not name or not name.strip(): continue - for i in xrange(num_references if is_default else 1): + 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, random_key=is_default, language_suffix=language_suffix) - self.components.normalize_place_names(address_components, osm_components, country=country, languages=all_local_languages) - place_tags.append((address_components, language, is_default)) for language in random_languages - all_local_languages: @@ -472,7 +468,6 @@ class OSMAddressFormatter(object): non_local_language=language, language_suffix=language_suffix) - self.components.normalize_place_names(address_components, osm_components, country=country, languages=set([language])) place_tags.append((address_components, language, False)) if postal_codes: