From bc748b6d62a8c598f7cbe9d0c61af50d4ab38888 Mon Sep 17 00:00:00 2001 From: Al Date: Mon, 23 Jan 2017 23:30:29 -0500 Subject: [PATCH] [addresses] supplying country arg when stripping name affixes both for OSM place-based data sets (ways, localities) and OpenAddresses (shouldn't affect any of the countries currently in OA though) --- scripts/geodata/addresses/components.py | 2 +- scripts/geodata/openaddresses/formatter.py | 2 +- scripts/geodata/osm/formatter.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 614ed699..da8c7887 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -1888,7 +1888,7 @@ class AddressComponents(object): self.add_neighborhoods(address_components, neighborhoods, country, language, language_suffix=language_suffix) - self.replace_name_affixes(address_components, non_local_language or language) + self.replace_name_affixes(address_components, non_local_language or language, country=country) self.replace_names(address_components) diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py index 30e5d64a..e55be693 100644 --- a/scripts/geodata/openaddresses/formatter.py +++ b/scripts/geodata/openaddresses/formatter.py @@ -477,7 +477,7 @@ class OpenAddressesFormatter(object): self.components.cleanup_boundary_names(components) self.components.country_specific_cleanup(components, country) - self.components.replace_name_affixes(components, language) + self.components.replace_name_affixes(components, language, country=country) self.components.replace_names(components) diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py index bcc653b4..c1ed9373 100644 --- a/scripts/geodata/osm/formatter.py +++ b/scripts/geodata/osm/formatter.py @@ -621,7 +621,7 @@ class OSMAddressFormatter(object): self.components.drop_invalid_components(revised_address_components, country) - self.components.replace_name_affixes(revised_address_components, language) + self.components.replace_name_affixes(revised_address_components, language, country=country) self.components.replace_names(revised_address_components) self.components.remove_numeric_boundary_names(revised_address_components)