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 6728bd57ee1cd457db640320dc9fb0e373ba41bb..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"
     }


@@ -129,13 +130,6 @@
         "" : "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"],


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

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

     }
 },
 {
     }
 },
 {


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

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

     }
 },
 {
     }
 },
 {


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

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

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