tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] if no venue names are passed in to formatted_addresses_with_venue_names, remove any existing venue name from the components as well

Browse Source
This commit is contained in:
Al
2016-11-19 03:46:16 -05:00
parent e6fe576ec7
commit 8e905fd17d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/geodata/osm/formatter.py
View File

@@ -423,6 +423,7 @@ class OSMAddressFormatter(object):
formatted_addresses = [] formatted_addresses = []
if not venue_names: if not venue_names:
address_components = {c: v for c, v in six.iteritems(address_components) if c != AddressFormatter.HOUSE}
return [self.formatter.format_address(address_components, country, language=language, return [self.formatter.format_address(address_components, country, language=language,
tag_components=tag_components, minimal_only=minimal_only)] tag_components=tag_components, minimal_only=minimal_only)]
@@ -976,9 +977,10 @@ class OSMAddressFormatter(object):
address_only_components = self.components.drop_postcode(address_only_components) address_only_components = self.components.drop_postcode(address_only_components)
if address_only_components: if address_only_components:
address_only_venue_names = venue_names address_only_venue_names = []
if not address_only_components or (len(address_only_components) == 1 and list(address_only_components)[0] == AddressFormatter.HOUSE): if not address_only_components or (len(address_only_components) == 1 and list(address_only_components)[0] == AddressFormatter.HOUSE):
address_only_venue_names = [venue_name for venue_name in venue_names if self.valid_venue_name(venue_name, address_only_components, street_languages)] address_only_venue_names = [venue_name for venue_name in venue_names if self.valid_venue_name(venue_name, address_only_components, street_languages)]
formatted_addresses.extend(self.formatted_addresses_with_venue_names(address_only_components, address_only_venue_names, country, language=language, formatted_addresses.extend(self.formatted_addresses_with_venue_names(address_only_components, address_only_venue_names, country, language=language,
tag_components=tag_components, minimal_only=False)) tag_components=tag_components, minimal_only=False))