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

[addresses] if suburb/city_district is already listed, and we're finding the closest city by point rather than by boundary, use the closest actual city, not something smaller like a village/hamlet

Browse Source
This commit is contained in:
Al
2016-12-08 02:39:27 -05:00
parent 28d9ef12c0
commit f9945103ba
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/geodata/addresses/components.py
View File

@@ -231,6 +231,9 @@ class AddressComponents(object):
def osm_country_and_languages(self, osm_components): def osm_country_and_languages(self, osm_components):
return OSMCountryReverseGeocoder.country_and_languages_from_components(osm_components) return OSMCountryReverseGeocoder.country_and_languages_from_components(osm_components)
def osm_component_is_village(self, component):
return component.get('place', '').lower() in ('locality', 'village', 'hamlet')
def categorize_osm_component(self, country, props, containing_components): def categorize_osm_component(self, country, props, containing_components):
containing_ids = [(c['type'], c['id']) for c in containing_components if 'type' in c and 'id' in c] containing_ids = [(c['type'], c['id']) for c in containing_components if 'type' in c and 'id' in c]
@@ -757,10 +760,13 @@ class AddressComponents(object):
def add_city_and_equivalent_points(self, grouped_components, containing_components, country, latitude, longitude): def add_city_and_equivalent_points(self, grouped_components, containing_components, country, latitude, longitude):
city_replacements = place_config.city_replacements(country) city_replacements = place_config.city_replacements(country)
for props, lat, lon, dist in self.places_index.nearest_points(latitude, longitude): for props, lat, lon, dist in self.places_index.nearest_points(latitude, longitude):
component = self.categorize_osm_component(country, props, containing_components) component = self.categorize_osm_component(country, props, containing_components)
if (component == AddressFormatter.CITY or component in city_replacements) and component not in grouped_components: have_sub_city = AddressFormatter.SUBURB in grouped_components or AddressFormatter.CITY_DISTRICT in grouped_components
if (component == AddressFormatter.CITY or component in city_replacements) and component not in grouped_components and (not have_sub_city or not self.osm_component_is_village(props)):
grouped_components[component].append(props) grouped_components[component].append(props)
def add_admin_boundaries(self, address_components, def add_admin_boundaries(self, address_components,