From f8e9d39e1238ad8ff60672c438c81faf185b4fb2 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 30 Jul 2016 19:14:59 -0400 Subject: [PATCH] [places] Implementing population-based place components in both place and address component expansion --- scripts/geodata/addresses/components.py | 4 ++-- scripts/geodata/osm/formatter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 8941e4e3..682a4b94 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -1092,7 +1092,7 @@ class AddressComponents(object): return False def expanded(self, address_components, latitude, longitude, language=None, - dropout_places=True, add_sub_building_components=True, + dropout_places=True, population=None, add_sub_building_components=True, num_floors=None, num_basements=None, zone=None): ''' Expanded components @@ -1169,7 +1169,7 @@ class AddressComponents(object): if dropout_places: # Perform dropout on places - address_components = place_config.dropout_components(address_components, all_osm_components, country=country) + address_components = place_config.dropout_components(address_components, all_osm_components, country=country, population=population) self.drop_invalid_components(address_components) diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py index 5c274a61..cd6e2fb6 100644 --- a/scripts/geodata/osm/formatter.py +++ b/scripts/geodata/osm/formatter.py @@ -552,7 +552,7 @@ class OSMAddressFormatter(object): if address_country: address_components[AddressFormatter.COUNTRY] = address_country - new_address_components = place_config.dropout_components(address_components, osm_components, country=country) + new_address_components = place_config.dropout_components(address_components, osm_components, country=country, population=population) new_address_components[component_name] = address_components[component_name] self.components.drop_invalid_components(new_address_components)