[osm] adding no_global_overrides option for boundary configs

This commit is contained in:
Al
2016-08-30 12:43:02 -04:00
parent 7ccb0cf584
commit e4e35d0593

View File

@@ -131,11 +131,12 @@ class OSMAddressComponents(object):
values = [(k, v) for k, v in six.iteritems(properties) if isinstance(v, collections.Hashable)]
# place=city, place=suburb, etc. override per-country boundaries
for k, v in values:
containing_component = self.global_keys_override.get(k, {}).get(v, None)
if not config.get('no_global_overrides', False):
for k, v in values:
containing_component = self.global_keys_override.get(k, {}).get(v, None)
if containing_component is not None:
return containing_component
if containing_component is not None:
return containing_component
# admin_level tags are mapped per country
for k, v in values: