[components] Check global keys first (e.g. place= before admin_level=) in boundary component mapping

2016-07-14 16:33:38 -04:00
parent 46f83ce3ef
commit ff66151109
1 changed files with 3 additions and 2 deletions
--- 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()