[neighborhoods] check polygon boundaries in OSM neighborhood points for a name match at the city level or below
This commit is contained in:
@@ -324,30 +324,28 @@ 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))])
|
||||||
|
|
||||||
existing_osm_boundaries = None
|
existing_osm_boundaries = osm_admin_rtree.point_in_poly(lat, lon, return_all=True)
|
||||||
|
|
||||||
if component_name and component_name not in (AddressFormatter.SUBURB, AddressFormatter.CITY_DISTRICT):
|
skip_node = False
|
||||||
existing_osm_boundaries = osm_admin_rtree.point_in_poly(lat, lon, return_all=True)
|
for i, props in enumerate(existing_osm_boundaries):
|
||||||
|
containing_component = None
|
||||||
skip_node = False
|
name = props.get('name')
|
||||||
for i, props in enumerate(existing_osm_boundaries):
|
# Only exact name matches here since we're comparins OSM to OSM
|
||||||
containing_component = None
|
if name and name.lower() != attrs.get('name', ''.lower()):
|
||||||
name = props.get('name')
|
|
||||||
# Only exact name matches here since we're comparins OSM to OSM
|
|
||||||
if name and name != attrs.get('name'):
|
|
||||||
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)
|
|
||||||
|
|
||||||
if containing_component and containing_component not in (AddressFormatter.SUBURB, AddressFormatter.CITY_DISTRICT):
|
|
||||||
skip_node = True
|
|
||||||
break
|
|
||||||
# Skip this element
|
|
||||||
if skip_node:
|
|
||||||
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)
|
||||||
|
|
||||||
|
if containing_component and containing_component != component_name and AddressFormatter.component_order[containing_component] <= AddressFormatter.component_order[AddressFormatter.CITY]:
|
||||||
|
skip_node = True
|
||||||
|
break
|
||||||
|
|
||||||
|
# Skip this element
|
||||||
|
if skip_node:
|
||||||
|
continue
|
||||||
|
|
||||||
for idx in (cth, qs):
|
for idx in (cth, qs):
|
||||||
candidates = idx.get_candidate_polygons(lat, lon, return_all=True)
|
candidates = idx.get_candidate_polygons(lat, lon, return_all=True)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user