Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-address.style b/settings/import-address.style
index 8390f8f06db490918692ef841bc6302721115344..d872e2890c68a0e4abd61f507b7d57107cd04a33 100644 (file)
--- a/settings/import-address.style
+++ b/settings/import-address.style
@@ -5,8 +5,14 @@
         "no" : "skip"
     }
 },
+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata", "area"],
+    "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"
     }
@@ -32,13 +38,14 @@
     "keys" : ["landuse"],
     "values" : {
         "cemetry" : "skip",
-        "" : "fallback,with-name"
+        "" : "fallback,with_name"
     }
 },
 {
     "keys" : ["boundary"],
     "values" : {
-        "administrative" : "main"
+        "administrative" : "main",
+        "postal_code" : "main"
     }
 },
 {
@@ -60,21 +67,21 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:interpolation"],
     "values" : {
-        "" : "address"
+        "" : "interpolation,address"
     }
 },
 {
     "keys" : ["postal_code", "postcode", "addr:postcode",
               "tiger:zip_left", "tiger:zip_right"],
     "values" : {
-        "" : "postcode"
+        "" : "postcode,fallback"
     }
 },
 {
-    "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"
     }