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 e876faea367f14d480b103efd85829f91e3b70e8..2e2f25f0e938f8f30742e2e727b4174fe2f80cee 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -6,8 +6,8 @@
     }
 },
 {
-    "keys" : ["name:prefix", "name:suffix", "name:botanical", "wikidata",
-              "*:wikidata"],
+    "keys" : ["name:prefix", "name:suffix", "name:prefix:*", "name:suffix:*",
+              "name:etymology", "name:signed", "name:botanical", "wikidata", "*:wikidata"],
     "values" : {
         "" : "extra"
     }
@@ -76,6 +76,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",
@@ -121,6 +124,8 @@
 {
     "keys" : ["boundary"],
     "values" : {
+        "place" : "skip",
+        "postal_code" : "main",
         "" : "main,with_name"
     }
 },
@@ -206,7 +211,7 @@
     }
 },
 {
-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],
     "values" : {
         "" : "address"
     }
@@ -232,7 +237,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"
     }