remove special handling of rail

Skip railway=rail in the style, so that installations can remove
it if they wish.

diff --git a/settings/import-extratags.style b/settings/import-extratags.style
index b2f3f9b9e8aab0ee5ddb0f8626618ed871f71403..49c55e5702d87198522e32345bc992168edd4391 100644 (file)
--- a/settings/import-extratags.style
+++ b/settings/import-extratags.style
@@ -98,6 +98,7 @@
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",
+        "rail" : "extra",
         "" : "main,with_name"
     }
 },

diff --git a/settings/import-full.style b/settings/import-full.style
index 9069c78069087fb83597b4852e82982c45ca1ebe..e876faea367f14d480b103efd85829f91e3b70e8 100644 (file)
--- a/settings/import-full.style
+++ b/settings/import-full.style
@@ -98,6 +98,7 @@
     "values" : {
         "level_crossing" : "skip",
         "no" : "skip",
+        "rail" : "skip",
         "" : "main,with_name"
     }
 },

diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql
index 953c54302c8262d480053645949917c6f438354f..03a0080555b53bc1aa7341bdbfa6584dbd45d550 100644 (file)
--- a/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@ -62,8 +62,6 @@ BEGIN
     ELSEIF NEW.class = 'boundary' AND NEW.type = 'administrative'
            AND NEW.admin_level <= 4 AND NEW.osm_type = 'W' THEN
         return NULL;
-    ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
-        return NULL;
     ELSEIF NEW.osm_type = 'N' AND NEW.class = 'highway' THEN
         NEW.rank_search = 30;
         NEW.rank_address = 0;