[fix] order of ops
This commit is contained in:
@@ -1213,6 +1213,11 @@ class AddressComponents(object):
|
|||||||
non_local_language = None
|
non_local_language = None
|
||||||
language_suffix = ''
|
language_suffix = ''
|
||||||
|
|
||||||
|
osm_components = self.osm_reverse_geocoded_components(latitude, longitude)
|
||||||
|
neighborhoods = self.neighborhood_components(latitude, longitude)
|
||||||
|
|
||||||
|
all_osm_components = osm_components + neighborhoods
|
||||||
|
|
||||||
if not language:
|
if not language:
|
||||||
language = self.address_language(address_components, candidate_languages)
|
language = self.address_language(address_components, candidate_languages)
|
||||||
non_local_language = self.non_local_language()
|
non_local_language = self.non_local_language()
|
||||||
@@ -1224,13 +1229,8 @@ class AddressComponents(object):
|
|||||||
if address_state:
|
if address_state:
|
||||||
address_components[AddressFormatter.STATE] = address_state
|
address_components[AddressFormatter.STATE] = address_state
|
||||||
|
|
||||||
osm_components = self.osm_reverse_geocoded_components(latitude, longitude)
|
|
||||||
neighborhoods = self.neighborhood_components(latitude, longitude)
|
|
||||||
|
|
||||||
all_languages = set([l['lang'] for l in candidate_languages])
|
all_languages = set([l['lang'] for l in candidate_languages])
|
||||||
|
|
||||||
all_osm_components = osm_components + neighborhoods
|
|
||||||
|
|
||||||
self.normalize_place_names(address_components, all_osm_components, country=country, languages=all_languages)
|
self.normalize_place_names(address_components, all_osm_components, country=country, languages=all_languages)
|
||||||
|
|
||||||
# If a country was already specified
|
# If a country was already specified
|
||||||
|
|||||||
Reference in New Issue
Block a user