[fix] state name

This commit is contained in:
Al
2016-05-05 14:12:30 -04:00
parent 670da6c4bc
commit 62c0801683

View File

@@ -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)