From 23c276f4ddb662d40562624218d4530b38c8614a Mon Sep 17 00:00:00 2001
From: Lukas Martinelli <me@lukasmartinelli.ch>
Date: Fri, 20 Jan 2017 17:46:47 +0100
Subject: [PATCH] Show generalized railways after z11 #146

---
 layers/transportation/layer.sql    | 21 +++++++++++++++++++--
 layers/transportation/mapping.yaml | 12 +++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql
index 2765a1e..edd97c9 100644
--- a/layers/transportation/layer.sql
+++ b/layers/transportation/layer.sql
@@ -96,7 +96,24 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
         )
         UNION ALL
 
-        -- etldoc: osm_railway_linestring       ->  layer_transportation:z12"
+        -- etldoc: osm_railway_linestring_gen2  ->  layer_transportation:z11"
+        SELECT
+            osm_id, geometry, NULL AS highway, railway,
+            service_value(service) AS service,
+            is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
+        FROM osm_railway_linestring_gen2
+        WHERE zoom_level = 11 AND (railway='rail' AND service = '')
+        UNION ALL
+
+        -- etldoc: osm_railway_linestring_gen1  ->  layer_transportation:z12"
+        SELECT
+            osm_id, geometry, NULL AS highway, railway,
+            service_value(service) AS service,
+            is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
+        FROM osm_railway_linestring_gen1
+        WHERE zoom_level = 12 AND (railway='rail' AND service = '')
+        UNION ALL
+
         -- etldoc: osm_railway_linestring       ->  layer_transportation:z13
         -- etldoc: osm_railway_linestring       ->  layer_transportation:z14_
         SELECT
@@ -104,7 +121,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int
             service_value(service) AS service,
             is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
         FROM osm_railway_linestring
-        WHERE zoom_level BETWEEN 12 AND 13 AND (railway='rail' AND service = '')
+        WHERE zoom_level = 13 AND (railway='rail' AND service = '')
            OR zoom_Level >= 14
         UNION ALL
 
diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml
index c442507..392b910 100644
--- a/layers/transportation/mapping.yaml
+++ b/layers/transportation/mapping.yaml
@@ -1,6 +1,16 @@
-
 generalized_tables:
 
+# etldoc: imposm3 -> osm_railway_linestring_gen2
+  railway_linestring_gen2:
+    source: railway_linestring_gen1
+    tolerance: 40.0
+
+# etldoc: imposm3 -> osm_railway_linestring_gen1
+  railway_linestring_gen1:
+    source: railway_linestring
+    sql_filter: railway='rail' AND service=''
+    tolerance: 20.0
+
 # etldoc: imposm3 -> osm_highway_linestring_gen4
   highway_linestring_gen4:
     source: highway_linestring_gen3