From 40cd86c3be191f2e94a1a21567cf4da03cf469bc Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 13 Dec 2016 16:10:52 -0500 Subject: [PATCH] [addresses] only add city relacement if a city is not found first --- scripts/geodata/addresses/components.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 03500b71..19658fdb 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -782,7 +782,9 @@ class AddressComponents(object): have_sub_city = AddressFormatter.SUBURB in grouped_components or AddressFormatter.CITY_DISTRICT in grouped_components - if (component == AddressFormatter.CITY or component in city_replacements) and component not in grouped_components and (not have_sub_city or not self.osm_component_is_village(props)): + have_city = AddressFormatter.CITY in grouped_components + + if (component == AddressFormatter.CITY or (component in city_replacements and not have_city)) and component not in grouped_components and (not have_sub_city or not self.osm_component_is_village(props)): grouped_components[component].append(props) def add_admin_boundaries(self, address_components,