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

[addresses] let containing components include all boundaries, not just those that are larger than the current boundary (affects cases like Buenos Aires where the city has a lower admin level than its districts, so would be subject to the boundary config's contained_by override)

Browse Source
This commit is contained in:
Al
2017-01-23 10:48:08 -05:00
parent dbb4ef088a
commit c36611c060
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,8 +294,7 @@ class AddressComponents(object):
if not name: if not name:
continue continue
containing_components = osm_components[i + 1:] component = self.categorize_osm_component(country, props, osm_components)
component = self.categorize_osm_component(country, props, containing_components)
if component is not None: if component is not None:
components.append((props, component)) components.append((props, component))
@@ -1057,12 +1056,10 @@ class AddressComponents(object):
grouped_osm_components = defaultdict(list) grouped_osm_components = defaultdict(list)
for i, props in enumerate(osm_components): for i, props in enumerate(osm_components):
containing_components = osm_components[i + 1:]
if 'name' not in props: if 'name' not in props:
continue continue
component = self.categorize_osm_component(country, props, containing_components) component = self.categorize_osm_component(country, props, osm_components)
if component is None: if component is None:
continue continue
@@ -1073,7 +1070,7 @@ class AddressComponents(object):
props = props.get('admin_center', props) props = props.get('admin_center', props)
elif 'admin_center' in props: elif 'admin_center' in props:
admin_center = {k: v for k, v in six.iteritems(props['admin_center']) if k != 'admin_level'} admin_center = {k: v for k, v in six.iteritems(props['admin_center']) if k != 'admin_level'}
admin_center_component = self.categorize_osm_component(country, admin_center, containing_components) admin_center_component = self.categorize_osm_component(country, admin_center, osm_components)
if admin_center_component == component and admin_center.get('name') and admin_center['name'].lower() == props.get('name', '').lower(): if admin_center_component == component and admin_center.get('name') and admin_center['name'].lower() == props.get('name', '').lower():
props = props.copy() props = props.copy()
props.update({k: v for k, v in six.iteritems(admin_center) if k not in props}) props.update({k: v for k, v in six.iteritems(admin_center) if k not in props})