From 6ff1024c02ead6fd28f2350c22463f2f60b8d211 Mon Sep 17 00:00:00 2001 From: Al Date: Fri, 7 Oct 2016 19:49:32 -0400 Subject: [PATCH] [fix] null candidate languages --- scripts/geodata/addresses/components.py | 4 ++-- scripts/geodata/osm/formatter.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index d6243d30..da4c8812 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -1342,6 +1342,8 @@ class AddressComponents(object): osm_components = self.osm_reverse_geocoded_components(latitude, longitude) country, candidate_languages = self.osm_country_and_languages(osm_components) + if not (country and candidate_languages): + return None, None, None more_than_one_official_language = len(candidate_languages) > 1 @@ -1378,8 +1380,6 @@ class AddressComponents(object): if city: address_components[AddressFormatter.CITY] = city - - self.add_neighborhoods(address_components, neighborhoods, language_suffix=language_suffix) diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py index 61179714..563b5593 100644 --- a/scripts/geodata/osm/formatter.py +++ b/scripts/geodata/osm/formatter.py @@ -479,6 +479,8 @@ class OSMAddressFormatter(object): osm_components = self.components.osm_reverse_geocoded_components(latitude, longitude) country, candidate_languages = OSMCountryReverseGeocoder.country_and_languages_from_components(osm_components) + if not (country and candidate_languages): + return (), None local_languages = candidate_languages