From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 8 Jan 2020 22:53:23 +0000 (+0100)
Subject: remove special handling of rail
X-Git-Tag: v3.5.0~103
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ddaf1b79d4c234254860ded13a7d9974fdd981dc

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 b2f3f9b9..49c55e57 100644
--- 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 9069c780..e876faea 100644
--- 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 953c5430..03a00805 100644
--- 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;