From 169a3c3d70bc441cf73cce0764273e94c9a25e60 Mon Sep 17 00:00:00 2001 From: Al Date: Fri, 7 Oct 2016 01:10:16 -0400 Subject: [PATCH] [osm] drop postcode as well for address-only format --- scripts/geodata/osm/formatter.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py index d00a34da..61179714 100644 --- a/scripts/geodata/osm/formatter.py +++ b/scripts/geodata/osm/formatter.py @@ -852,8 +852,11 @@ class OSMAddressFormatter(object): # However, where there are streets, it's useful to have address-only queries as well if country != JAPAN: address_only_components = self.components.drop_places(address_components) - formatted_addresses.extend(self.formatted_addresses_with_venue_names(address_only_components, venue_names, country, language=language, - tag_components=tag_components, minimal_only=False)) + address_only_components = self.components.drop_postcode(address_only_components) + + if address_only_components: + formatted_addresses.extend(self.formatted_addresses_with_venue_names(address_only_components, venue_names, country, language=language, + tag_components=tag_components, minimal_only=False)) # Generate a PO Box address at random (only returns non-None values occasionally) and add it to the list po_box_components = self.components.po_box_address(address_components, language, country=country)