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 6d87407b6195d74019b06290c60e3d8e8ef9d6c5..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"
     }
 },


@@ -187,7 +188,7 @@
 },
 {
     "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",
 },
 {
     "keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in:country",

-              "addr:country", "addr:country", "addr:country_code"],
+              "addr:country", "addr:country_code"],

     "values" : {
         "" : "country"
     }
     "values" : {
         "" : "country"
     }