From 0f9ad259dc28a1628b87307db18a12fd8f75d6e7 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 3 Oct 2015 14:40:38 -0400 Subject: [PATCH] [osm] Doing initial formatting after replacing country/state --- scripts/geodata/osm/osm_address_training_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/geodata/osm/osm_address_training_data.py b/scripts/geodata/osm/osm_address_training_data.py index 0eed2c7e..27d63945 100644 --- a/scripts/geodata/osm/osm_address_training_data.py +++ b/scripts/geodata/osm/osm_address_training_data.py @@ -489,9 +489,6 @@ def build_address_format_training_data(language_rtree, infile, out_dir, tag_comp address_components = {k: v for k, v in value.iteritems() if k.startswith('addr:')} formatter.replace_aliases(address_components) - # Version with all components - formatted_address = formatter.format_address(country, address_components, tag_components=tag_components, minimal_only=not tag_components) - address_country = address_components.get(AddressFormatter.COUNTRY) ''' @@ -553,6 +550,9 @@ def build_address_format_training_data(language_rtree, infile, out_dir, tag_comp if state_full_name and random.random() < 0.3: address_components[AddressFormatter.STATE] = state_full_name + # Version with all components + formatted_address = formatter.format_address(country, address_components, tag_components=tag_components, minimal_only=not tag_components) + if tag_components: formatted_addresses = [] formatted_addresses.append(formatted_address)