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

[neighborhoods] fix neighborhoods index checks to include the borough points while still not making letting something like Santa Monica pass as a neighborhoods when it's a proper city

Browse Source
This commit is contained in:
Al
2016-12-13 02:28:59 -05:00
parent cb475d8245
commit cd91068f0f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/geodata/neighborhoods/reverse_geocode.py
View File

@@ -323,21 +323,22 @@ class NeighborhoodReverseGeocoder(RTreePolygonIndex):
for name_key in OSM_NAME_TAGS: for name_key in OSM_NAME_TAGS:
osm_names.extend([v for k, v in six.iteritems(attrs) if k.startswith('{}:'.format(name_key))]) osm_names.extend([v for k, v in six.iteritems(attrs) if k.startswith('{}:'.format(name_key))])
if component_name and component_name != AddressFormatter.SUBURB: if component_name and component_name not in (AddressFormatter.SUBURB, AddressFormatter.CITY_DISTRICT):
existing_osm_boundaries = osm_admin_rtree.point_in_poly(lat, lon, return_all=True) existing_osm_boundaries = osm_admin_rtree.point_in_poly(lat, lon, return_all=True)
containing_ids = [(boundary['type'], boundary['id']) for boundary in existing_osm_boundaries]
skip_node = False skip_node = False
for props in existing_osm_boundaries: for i, props in enumerate(existing_osm_boundaries):
containing_component = None containing_component = None
name = props.get('name') name = props.get('name')
# Only exact name matches here since we're comparins OSM to OSM # Only exact name matches here since we're comparins OSM to OSM
if name and name == attrs.get('name'): if name and name != attrs.get('name'):
continue continue
containing_ids = [(boundary['type'], boundary['id']) for boundary in existing_osm_boundaries[i + 1:]]
containing_component = osm_address_components.component_from_properties(country, props, containing=containing_ids) containing_component = osm_address_components.component_from_properties(country, props, containing=containing_ids)
if containing_component and containing_component != AddressFormatter.SUBURB: if containing_component and containing_component not in (AddressFormatter.SUBURB, AddressFormatter.CITY_DISTRICT):
skip_node = True skip_node = True
break break
# Skip this element # Skip this element