[fix] don't short-circuit OSM address formatting unless there are no components and no venue names

This commit is contained in:
Al
2016-11-18 23:31:24 -05:00
parent 25ceeed6ef
commit 8ef8d88186

View File

@@ -896,12 +896,12 @@ class OSMAddressFormatter(object):
zone=zone, add_sub_building_components=add_sub_building_components,
population_from_city=True)
if not address_components:
return None, None, None
languages = country_languages[country].keys()
venue_names = self.venue_names(tags, languages) or []
if not address_components and not venue_names:
return None, None, None
# Abbreviate the street name with random probability
street_name = address_components.get(AddressFormatter.ROAD)
@@ -949,7 +949,6 @@ class OSMAddressFormatter(object):
formatted_addresses.extend(self.chain_queries(venue_name, address_components, language, country, tag_components=tag_components))
if tag_components:
if not address_components:
return []