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 f6251260307908e22224dd968fb25b3ac894a830..4e41763f276554c3e11f6b96060f12b09b20a61c 100644 (file)
--- a/settings/import-admin.style
+++ b/settings/import-admin.style
@@ -1,6 +1,12 @@
 [
+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata"],
+    "values" : {
+        "" : "extra"
+    }
+},
 {
-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
+              "name:etymology", "name:signed", "name:botanical", "*wikidata"],
     "values" : {
         "" : "skip"
     }
@@ -26,7 +32,7 @@
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",
-        "" : "fallback,with-name"
+        "" : "fallback,with_name"
     }
 },
 {
@@ -42,8 +48,8 @@
     }
 },
 {
-    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
-              "addr:country", "addr:country", "addr:country_code"],
+    "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
+              "addr:country", "addr:country_code"],
     "values" : {
         "" : "country"
     }
@@ -53,5 +59,18 @@
     "values" : {
         "" : "address"
     }
+},
+{
+    "keys" : ["postal_code", "postcode", "addr:postcode",
+              "tiger:zip_left", "tiger:zip_right"],
+    "values" : {
+        "" : "postcode"
+    }
+},
+{
+    "keys" : ["capital"],
+    "values" : {
+        "" : "extra"
+    }
 }
 ]