Merge pull request #1358 from mtmail/travis-php-7dot1

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

diff --git a/settings/import-admin.style b/settings/import-admin.style
index 89a1eb1688937c48250f7af5ff523f8b362187aa..02a54f12a04fcb90d64c3b85ff1acbec8fedb5eb 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"
     }
 },
 {
@@ -41,13 +41,6 @@
         "" : "main"
     }
 },
-{
-    "keys" : ["postal_code", "postcode", "addr:postcode",
-              "tiger:zip_left", "tiger:zip_right"],
-    "values" : {
-        "" : "postcode"
-    }
-},
 {
     "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
               "addr:country", "addr:country", "addr:country_code"],
@@ -60,5 +53,18 @@
     "values" : {
         "" : "address"
     }
+},
+{
+    "keys" : ["postal_code", "postcode", "addr:postcode",
+              "tiger:zip_left", "tiger:zip_right"],
+    "values" : {
+        "" : "postcode"
+    }
+},
+{
+    "keys" : ["capital"],
+    "values" : {
+        "" : "extra"
+    }
 }
 ]