Merge remote-tracking branch 'upstream/master'

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

diff --git a/settings/import-full.style b/settings/import-full.style
index 9069c78069087fb83597b4852e82982c45ca1ebe..57993386130fdb8a48c3f31db4d34fb25ee3fcc7 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -6,15 +6,16 @@
     }
 },
 {
-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "wikidata",
-              "*:wikidata"],
+    "keys" : ["*:prefix", "*:suffix", "name:prefix:*", "name:suffix:*",
+              "name:etymology", "name:signed", "name:botanical", "wikidata", "*:wikidata",
+              "addr:street:name", "addr:street:type"],
     "values" : {
         "" : "extra"
     }
 },
 {
     "keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
-              "iata", "icao", "pcode", "pcode:*"],
+              "iata", "icao", "pcode", "pcode:*", "ISO3166-2"],
     "values" : {
         "" : "ref"
     }
@@ -76,6 +77,9 @@
         "mini_roundabout" : "skip",
         "noexit" : "skip",
         "crossing" : "skip",
+        "give_way" : "skip",
+        "stop" : "skip",
+        "street_lamp" : "main,with_name",
         "traffic_signals" : "main,with_name",
         "service" : "main,with_name",
         "cycleway" : "main,with_name",
@@ -98,6 +102,7 @@
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",
+        "rail" : "skip",
         "" : "main,with_name"
     }
 },
@@ -120,6 +125,8 @@
 {
     "keys" : ["boundary"],
     "values" : {
+        "place" : "skip",
+        "postal_code" : "main",
         "" : "main,with_name"
     }
 },
@@ -205,7 +212,7 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],
     "values" : {
         "" : "address"
     }
@@ -231,7 +238,8 @@
               "population", "description", "image", "attribution", "fax",
               "email", "url", "website", "phone", "real_ale", "smoking",
               "food", "camera", "brewery", "locality", "wikipedia",
-              "wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*"],
+              "wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*",
+              "area"],
     "values" : {
         "" : "extra"
     }