From 5ec752e88793fd4edc018fb93c051933c5ee8502 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 6 Aug 2016 20:43:13 -0400 Subject: [PATCH] [fix] order of ops --- scripts/geodata/addresses/components.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 8aa69274..a27f8e7e 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -1213,6 +1213,11 @@ class AddressComponents(object): non_local_language = None 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: language = self.address_language(address_components, candidate_languages) non_local_language = self.non_local_language() @@ -1224,13 +1229,8 @@ class AddressComponents(object): if 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_osm_components = osm_components + neighborhoods - self.normalize_place_names(address_components, all_osm_components, country=country, languages=all_languages) # If a country was already specified