Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / import-admin.style

diff --git a/settings/import-admin.style b/settings/import-admin.style
index 89a1eb1688937c48250f7af5ff523f8b362187aa..2ad6cec8d86d2ea0ec62da086c18363e2127e64a 100644 (file)
--- a/settings/import-admin.style
+++ b/settings/import-admin.style
@@ -26,7 +26,7 @@
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",
-        "" : "fallback"
+        "" : "fallback,with_name"
     }
 },
 {
@@ -42,23 +42,29 @@
     }
 },
 {
-    "keys" : ["postal_code", "postcode", "addr:postcode",
-              "tiger:zip_left", "tiger:zip_right"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
-        "" : "postcode"
+        "" : "country"
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],
     "values" : {
-        "" : "country"
+        "" : "address"
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county"],
+    "keys" : ["postal_code", "postcode", "addr:postcode",
+              "tiger:zip_left", "tiger:zip_right"],
     "values" : {
-        "" : "address"
+        "" : "postcode"
+    }
+},
+{
+    "keys" : ["capital"],
+    "values" : {
+        "" : "extra"
     }
 }
 ]