Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-street.style b/settings/import-street.style
index db2cd2a8939993f0302a1b86878454bdf2c3b7d7..7f0c03b9739acc6d93ca586552503ffbd186f251 100644 (file)
--- a/settings/import-street.style
+++ b/settings/import-street.style
@@ -1,6 +1,12 @@
 [
+{   "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: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"
     }