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 f84b9305e92af1153ce823c7c5df98896ff88109..e876faea367f14d480b103efd85829f91e3b70e8 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -98,6 +98,7 @@
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",

+        "rail" : "skip",

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


@@ -182,12 +183,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"
     }


@@ -198,6 +199,12 @@
         "" : "address,house"
     }
 },
         "" : "address,house"
     }
 },

+{
+    "keys" : ["addr:interpolation"],
+    "values" : {
+        "" : "interpolation,address"
+    }
+},

 {
     "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
     "values" : {
 {
     "keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
     "values" : {