[addresses/JP] more checks for matching major/minor neighborhood polygons with nodes in Japan

This commit is contained in:
Al
2016-12-24 20:21:25 -05:00
parent e4e86261d1
commit 826cbc7f24

View File

@@ -863,7 +863,11 @@ class AddressComponents(object):
if is_japan and component == AddressFormatter.SUBURB and not first_suburb:
existing = grouped_components[component]
for p in existing:
if (props['id'] == p['id'] and props['type'] == p['type']) or ('place' in p and 'place' in props and props['place'] == p['place']) or ('name' in props and name in 'p' and props['name'] == p['name']):
if (props['id'] == p['id'] and props['type'] == p['type']) or \
(props.get('place') in ('neighbourhood', 'neighborhood') and p.get('admin_level') == '10') or \
(props.get('place') == 'quarter' and p.get('admin_level') == '9') or \
('place' in p and 'place' in props and props['place'] == p['place']) or \
('name' in props and name in 'p' and props['name'] == p['name']):
break
else:
grouped_components[component].append(props)