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 0a866c95d10ff5aff3783c47db040ca3a55fdf1b..16f2e929b311d11e15b78432c94cf0bb54295119 100644 (file)
--- a/settings/import-address.style
+++ b/settings/import-address.style
@@ -5,8 +5,14 @@
         "no" : "skip"
     }
 },
+{   "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"
     }
@@ -38,7 +44,8 @@
 {
     "keys" : ["boundary"],
     "values" : {
-        "administrative" : "main"
+        "administrative" : "main",
+        "postal_code" : "main"
     }
 },
 {
@@ -73,8 +80,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"
     }