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 892bebdabac1f0db6def9b6229731678d8afd433..a1b0e8d611dc9d3d32bc22f13d4410a56231e830 100644 (file)
--- a/settings/import-street.style
+++ b/settings/import-street.style
@@ -1,13 +1,20 @@
 [
+{   "keys" : ["wikipedia", "wikipedia:*", "wikidata", "area"],
+    "values" : {
+        "" : "extra"
+    }
+},
 {
-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
+    "keys" : ["*:prefix", "*:suffix", "name:prefix:*", "name:suffix:*",
+              "name:etymology", "name:signed", "name:botanical", "*:wikidata",
+              "addr:street:name", "addr:street:type"],
     "values" : {
         "" : "skip"
     }
 },
 {
     "keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
-              "iata", "icao", "pcode"],
+              "iata", "icao", "pcode", "ISO3166-2"],
     "values" : {
         "" : "ref"
     }
@@ -43,7 +50,7 @@
 },
 {
     "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
-              "addr:country", "addr:country", "addr:country_code"],
+              "addr:country", "addr:country_code"],
     "values" : {
         "" : "country"
     }