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..058d83a9147eae791369b97aedc48ad1a15be3d5 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:botanical", "*wikidata"],

     "values" : {
         "" : "skip"
     }
     "values" : {
         "" : "skip"
     }


@@ -26,7 +32,7 @@
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",

-        "" : "fallback"
+        "" : "fallback,with_name"

     }
 },
 {
     }
 },
 {


@@ -42,23 +48,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" : {
     "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" : {
     "values" : {

-        "" : "country"
+        "" : "address"

     }
 },
 {
     }
 },
 {

-    "keys" : ["addr:*", "is_in:*", "tiger:county"],
+    "keys" : ["postal_code", "postcode", "addr:postcode",
+              "tiger:zip_left", "tiger:zip_right"],

     "values" : {
     "values" : {

-        "" : "address"
+        "" : "postcode"
+    }
+},
+{
+    "keys" : ["capital"],
+    "values" : {
+        "" : "extra"

     }
 }
 ]
     }
 }
 ]