From d51f9dbb0e8d957a952c602fa006a8d2a3d0b50d Mon Sep 17 00:00:00 2001 From: Al Date: Fri, 6 Jan 2017 10:19:01 -0500 Subject: [PATCH] [addresses] stripping unit phrases from streets in OpenAddresses as well, return value wasn't getting used before --- scripts/geodata/openaddresses/formatter.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py index 01d51452..61ea1fa8 100644 --- a/scripts/geodata/openaddresses/formatter.py +++ b/scripts/geodata/openaddresses/formatter.py @@ -195,11 +195,6 @@ class OpenAddressesFormatter(object): pass return num - def strip_unit_phrases_for_language(self, value, language): - if language in self.unit_type_regexes: - return self.unit_type_regexes[language].sub(six.u(''), value) - return value - def fix_component_encodings(self, components): return {k: ftfy.fix_encoding(safe_decode(v)) for k, v in six.iteritems(components)} @@ -345,7 +340,7 @@ class OpenAddressesFormatter(object): else: strip_unit_language = language - self.strip_unit_phrases_for_language(street, strip_unit_language) + street = self.components.strip_unit_phrases_for_language(street, strip_unit_language) street = abbreviate(street_types_gazetteer, street, language, abbreviate_prob=abbreviate_street_prob,