From ff66151109c3a6c036803815bb525838cd138a69 Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 14 Jul 2016 16:33:38 -0400 Subject: [PATCH] [components] Check global keys first (e.g. place= before admin_level=) in boundary component mapping --- scripts/geodata/osm/components.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/geodata/osm/components.py b/scripts/geodata/osm/components.py index 506c8593..2993ef7f 100644 --- a/scripts/geodata/osm/components.py +++ b/scripts/geodata/osm/components.py @@ -60,9 +60,10 @@ class OSMAddressComponents(object): self.config[country_code] = data def get_component(self, country, prop, value): - props = self.config.get(country, {}).get(prop, {}) - if not props and prop in self.global_keys: + if prop in self.global_keys: props = self.global_keys[prop] + else: + props = self.config.get(country, {}).get(prop, {}) return props.get(value, None) osm_address_components = OSMAddressComponents()