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 3a74300106683f39ead38eb272abb9c433584272..6728bd57ee1cd457db640320dc9fb0e373ba41bb 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:botanical", "wikidata", "*:wikidata"],

     "values" : {
         "" : "extra"
     }
     "values" : {
         "" : "extra"
     }


@@ -76,6 +76,9 @@
         "mini_roundabout" : "skip",
         "noexit" : "skip",
         "crossing" : "skip",
         "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",
         "traffic_signals" : "main,with_name",
         "service" : "main,with_name",
         "cycleway" : "main,with_name",


@@ -98,6 +101,7 @@
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",

+        "rail" : "skip",

         "" : "main,with_name"
     }
 },
         "" : "main,with_name"
     }
 },


@@ -120,6 +124,8 @@
 {
     "keys" : ["boundary"],
     "values" : {
 {
     "keys" : ["boundary"],
     "values" : {

+        "place" : "skip",
+        "postal_code" : "main",

         "" : "main,with_name"
     }
 },
         "" : "main,with_name"
     }
 },


@@ -182,12 +188,12 @@
     "keys" : ["postal_code", "postcode", "addr:postcode",
               "tiger:zip_left", "tiger:zip_right"],
     "values" : {
     "keys" : ["postal_code", "postcode", "addr:postcode",
               "tiger:zip_left", "tiger:zip_right"],
     "values" : {

-        "" : "postcode"
+        "" : "postcode,fallback"

     }
 },
 {
     }
 },
 {

-    "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"
     }
     "values" : {
         "" : "country"
     }


@@ -205,7 +211,7 @@
     }
 },
 {
     }
 },
 {

-    "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
+    "keys" : ["addr:*", "is_in:*", "tiger:county"],

     "values" : {
         "" : "address"
     }
     "values" : {
         "" : "address"
     }


@@ -231,7 +237,8 @@
               "population", "description", "image", "attribution", "fax",
               "email", "url", "website", "phone", "real_ale", "smoking",
               "food", "camera", "brewery", "locality", "wikipedia",
               "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"
     }
     "values" : {
         "" : "extra"
     }