From 62c0801683425fdd794dd8ca0b52915c9e3b84a1 Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 5 May 2016 14:12:30 -0400 Subject: [PATCH] [fix] state name --- scripts/geodata/addresses/components.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 7fe88a7e..a39ffe87 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -692,6 +692,10 @@ class AddressExpander(object): if address_country: address_components[AddressFormatter.COUNTRY] = address_country + address_state = self.state_name(address_components, country, language, non_local_language=non_local_language) + if address_state: + address_components[AddressFormatter.STATE] = address_state + osm_suffix = self.tag_suffix(language, non_local_language, more_than_one_official_language) osm_components = self.osm_reverse_geocoded_components(latitude, longitude) @@ -713,10 +717,6 @@ class AddressExpander(object): self.add_neighborhoods(address_components, neighborhoods, osm_suffix=osm_suffix) - address_state = self.state_name(address_components, country, language, non_local_language=non_local_language) - if address_state: - address_components[AddressFormatter.STATE] = address_state - street = address_components.get(AddressFormatter.ROAD) self.replace_name_affixes(address_components) @@ -795,10 +795,6 @@ class AddressExpander(object): self.add_neighborhoods(address_components, neighborhoods, osm_suffix=osm_suffix) - address_state = self.state_name(address_components, country, language, non_local_language=non_local_language) - if address_state: - address_components[AddressFormatter.STATE] = address_state - self.replace_name_affixes(address_components) self.replace_names(address_components)