Merge pull request #2838 from lonvia/update-osm2pgsql

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

diff --git a/settings/import-full.style b/settings/import-full.style
index e446f18a02ff7555b1ec26775c3cb0e15a2c0bf8..ed874a177ae3f5f4aaf59d572555bb190dead2a1 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -6,15 +6,16 @@
     }
 },
 {
     }
 },
 {

-    "keys" : ["name:prefix", "name:suffix", "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",
     "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"
     }
     "values" : {
         "" : "ref"
     }


@@ -76,6 +77,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",


@@ -121,16 +125,11 @@
 {
     "keys" : ["boundary"],
     "values" : {
 {
     "keys" : ["boundary"],
     "values" : {

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

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

-{
-    "keys" : ["amenity"],
-    "values" : {
-        "restaurant" : "main,operator",
-        "fuel" : "main,operator"
-    }
-},

 {
     "keys" : ["aeroway", "amenity", "club", "craft", "leisure",
               "office", "mountain_pass"],
 {
     "keys" : ["aeroway", "amenity", "club", "craft", "leisure",
               "office", "mountain_pass"],


@@ -143,7 +142,7 @@
     "keys" : ["shop"],
     "values" : {
         "no" : "skip",
     "keys" : ["shop"],
     "values" : {
         "no" : "skip",

-        "" : "main,operator"
+        "" : "main"

     }
 },
 {
     }
 },
 {


@@ -151,7 +150,7 @@
     "values" : {
         "yes" : "skip",
         "no" : "skip",
     "values" : {
         "yes" : "skip",
         "no" : "skip",

-        "" : "main,operator"
+        "" : "main"

     }
 },
 {
     }
 },
 {


@@ -174,7 +173,7 @@
     }
 },
 {
     }
 },
 {

-    "keys" : ["junction"],
+    "keys" : ["junction", "healthcare"],

     "values" : {
         "" : "main,fallback,with_name"
     }
     "values" : {
         "" : "main,fallback,with_name"
     }


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

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

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


@@ -232,7 +231,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"
     }