diff --git a/layers/transportation/etl_diagram.png b/layers/transportation/etl_diagram.png index 338152e..ae7cfe9 100644 Binary files a/layers/transportation/etl_diagram.png and b/layers/transportation/etl_diagram.png differ diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql index 22b8558..03ff726 100644 --- a/layers/transportation/layer.sql +++ b/layers/transportation/layer.sql @@ -150,7 +150,8 @@ 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_gen3 - WHERE zoom_level = 10 AND railway='rail' AND service = '' + WHERE zoom_level = 10 + AND railway IN ('rail', 'narrow_gauge') AND service = '' UNION ALL -- etldoc: osm_railway_linestring_gen2 -> layer_transportation:z11 @@ -160,7 +161,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order FROM osm_railway_linestring_gen2 WHERE zoom_level = 11 - AND railway IN ('rail', 'light_rail') AND service = '' + AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = '' UNION ALL -- etldoc: osm_railway_linestring_gen1 -> layer_transportation:z12 @@ -170,7 +171,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order FROM osm_railway_linestring_gen1 WHERE zoom_level = 12 - AND railway IN ('rail', 'light_rail') AND service = '' + AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = '' UNION ALL -- etldoc: osm_railway_linestring -> layer_transportation:z13 @@ -181,7 +182,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order FROM osm_railway_linestring WHERE zoom_level = 13 - AND railway IN ('rail', 'light_rail') AND service = '' + AND railway IN ('rail', 'narrow_gauge', 'light_rail') AND service = '' OR zoom_Level >= 14 UNION ALL diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml index f6d6c38..d9484d5 100644 --- a/layers/transportation/mapping.yaml +++ b/layers/transportation/mapping.yaml @@ -22,7 +22,7 @@ generalized_tables: # etldoc: imposm3 -> osm_railway_linestring_gen1 railway_linestring_gen1: source: railway_linestring - sql_filter: railway IN ('rail', 'light_rail') AND service='' + sql_filter: railway IN ('rail', 'narrow_gauge', 'light_rail') AND service='' tolerance: ZRES13 # etldoc: imposm3 -> osm_highway_linestring_gen2