[places] Implementing population-based place components in both place and address component expansion
This commit is contained in:
@@ -1092,7 +1092,7 @@ class AddressComponents(object):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def expanded(self, address_components, latitude, longitude, language=None,
|
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):
|
num_floors=None, num_basements=None, zone=None):
|
||||||
'''
|
'''
|
||||||
Expanded components
|
Expanded components
|
||||||
@@ -1169,7 +1169,7 @@ class AddressComponents(object):
|
|||||||
|
|
||||||
if dropout_places:
|
if dropout_places:
|
||||||
# Perform dropout on 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)
|
self.drop_invalid_components(address_components)
|
||||||
|
|
||||||
|
|||||||
@@ -552,7 +552,7 @@ class OSMAddressFormatter(object):
|
|||||||
if address_country:
|
if address_country:
|
||||||
address_components[AddressFormatter.COUNTRY] = 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]
|
new_address_components[component_name] = address_components[component_name]
|
||||||
|
|
||||||
self.components.drop_invalid_components(new_address_components)
|
self.components.drop_invalid_components(new_address_components)
|
||||||
|
|||||||
Reference in New Issue
Block a user