From 35b6951c81f7c2c152f137536d31edd7789e87cb Mon Sep 17 00:00:00 2001
From: Lukas Martinelli <me@lukasmartinelli.ch>
Date: Sat, 26 Nov 2016 20:19:43 +0000
Subject: [PATCH] Move highway and railway into transportation

---
 Makefile                                      |  12 ++--
 layers/highway_name/layer.sql                 |  50 ---------------
 layers/highway_name/merge_highways.sql        |  57 ------------------
 layers/railway/README.md                      |  19 ------
 layers/railway/mapping                        |  14 -----
 layers/railway/mapping.png                    | Bin 13139 -> 0 bytes
 layers/railway/mapping.yaml                   |  34 -----------
 layers/railway/railway.sql                    |  35 -----------
 layers/railway/railway.yaml                   |  25 --------
 layers/railway/types.sql                      |  15 -----
 layers/{highway => transportation}/README.md  |   0
 .../{highway => transportation}/highway.sql   |  46 +++++++-------
 layers/transportation/mapping                 |  39 ++++++++++++
 .../{highway => transportation}/mapping.png   | Bin
 .../{highway => transportation}/mapping.yaml  |  51 +++++++++++-----
 .../ne_global_roads.sql                       |   0
 .../transportation.yaml}                      |   4 +-
 layers/{highway => transportation}/types.sql  |   0
 .../README.md                                 |   0
 layers/transportation_name/layer.sql          |  50 +++++++++++++++
 layers/transportation_name/merge_highways.sql |  57 ++++++++++++++++++
 .../transportation_name.yaml}                 |   6 +-
 openmaptiles.yaml                             |   5 +-
 23 files changed, 216 insertions(+), 303 deletions(-)
 delete mode 100644 layers/highway_name/layer.sql
 delete mode 100644 layers/highway_name/merge_highways.sql
 delete mode 100644 layers/railway/README.md
 delete mode 100644 layers/railway/mapping
 delete mode 100644 layers/railway/mapping.png
 delete mode 100644 layers/railway/mapping.yaml
 delete mode 100644 layers/railway/railway.sql
 delete mode 100644 layers/railway/railway.yaml
 delete mode 100644 layers/railway/types.sql
 rename layers/{highway => transportation}/README.md (100%)
 rename layers/{highway => transportation}/highway.sql (63%)
 create mode 100644 layers/transportation/mapping
 rename layers/{highway => transportation}/mapping.png (100%)
 rename layers/{highway => transportation}/mapping.yaml (66%)
 rename layers/{highway => transportation}/ne_global_roads.sql (100%)
 rename layers/{highway/highway.yaml => transportation/transportation.yaml} (96%)
 rename layers/{highway => transportation}/types.sql (100%)
 rename layers/{highway_name => transportation_name}/README.md (100%)
 create mode 100644 layers/transportation_name/layer.sql
 create mode 100644 layers/transportation_name/merge_highways.sql
 rename layers/{highway_name/highway_name.yaml => transportation_name/transportation_name.yaml} (90%)

diff --git a/Makefile b/Makefile
index ca51ae4..0cf6d7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: build/openmaptiles.tm2source/data.yml build/mapping.yaml build/tileset.sql
 
 .PHONY: docs
-docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/highway/README.md layers/highway_name/README.md layers/poi/README.md layers/place/README.md layers/waterway/README.md layers/water_name/README.md layers/landcover/README.md layers/landuse/README.md layers/housenumber/README.md
+docs: layers/railway/README.md layers/boundary/README.md layers/water/README.md layers/building/README.md layers/transportation/README.md layers/transportation_name/README.md layers/poi/README.md layers/place/README.md layers/waterway/README.md layers/water_name/README.md layers/landcover/README.md layers/landuse/README.md layers/housenumber/README.md
 
 build/openmaptiles.tm2source/data.yml:
 	mkdir -p build/openmaptiles.tm2source && generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > build/openmaptiles.tm2source/data.yml
@@ -15,11 +15,11 @@ build/tileset.sql:
 layers/poi/README.md:
 	generate-doc layers/poi/poi.yaml --diagram layers/poi/mapping > layers/poi/README.md
 
-layers/highway/README.md:
-	generate-doc layers/highway/highway.yaml --diagram layers/highway/mapping > layers/highway/README.md
+layers/transportation/README.md:
+	generate-doc layers/transportation/transportation.yaml --diagram layers/transportation/mapping > layers/transportation/README.md
 
-layers/highway_name/README.md:
-	generate-doc layers/highway_name/highway_name.yaml > layers/highway_name/README.md
+layers/transportation_name/README.md:
+	generate-doc layers/transportation_name/transportation_name.yaml > layers/transportation_name/README.md
 
 layers/railway/README.md:
 	generate-doc layers/railway/railway.yaml --diagram layers/railway/mapping > layers/railway/README.md
@@ -52,4 +52,4 @@ layers/housenumber/README.md:
 	generate-doc layers/housenumber/housenumber.yaml > layers/housenumber/README.md
 
 clean:
-	rm -f build/openmaptiles.tm2source/data.yml && rm -f build/mapping.yaml && rm -f build/tileset.sql && rm -f layers/**/README.md&& rm -f layers/**/*.png
+	rm -f build/openmaptiles.tm2source/data.yml && rm -f build/mapping.yaml && rm -f build/tileset.sql
diff --git a/layers/highway_name/layer.sql b/layers/highway_name/layer.sql
deleted file mode 100644
index 100b1fc..0000000
--- a/layers/highway_name/layer.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-
--- etldoc: layer_highway_name[shape=record fillcolor=lightpink, style="rounded,filled",  
--- etldoc:     label="layer_highway_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
-
-CREATE OR REPLACE FUNCTION layer_highway_name(bbox geometry, zoom_level integer)
-RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, class highway_class, subclass text) AS $$
-    SELECT osm_id, geometry, name,
-      NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length,
-      to_highway_class(highway) AS class, highway AS subclass
-    FROM (
-
-        -- etldoc: osm_highway_name_linestring_gen3 ->  layer_highway_name:z8
-        SELECT * FROM osm_highway_name_linestring_gen3
-        WHERE zoom_level = 8
-        UNION ALL
-
-        -- etldoc: osm_highway_name_linestring_gen2 ->  layer_highway_name:z9
-        SELECT * FROM osm_highway_name_linestring_gen2
-        WHERE zoom_level = 9
-        UNION ALL
-
-        -- etldoc: osm_highway_name_linestring_gen1 ->  layer_highway_name:z10 
-        -- etldoc: osm_highway_name_linestring_gen1 ->  layer_highway_name:z11          
-        SELECT * FROM osm_highway_name_linestring_gen1
-        WHERE zoom_level BETWEEN 10 AND 11
-        UNION ALL
-
-        -- etldoc: osm_highway_name_linestring ->  layer_highway_name:z12        
-        SELECT * FROM osm_highway_name_linestring
-        WHERE zoom_level = 12
-            AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
-            AND to_highway_class(highway) < 'minor_road'::highway_class
-            AND NOT highway_is_link(highway)
-        UNION ALL
-
-        -- etldoc: osm_highway_name_linestring ->  layer_highway_name:z13
-        SELECT * FROM osm_highway_name_linestring
-        WHERE zoom_level = 13
-            AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
-            AND to_highway_class(highway) < 'path'::highway_class
-        UNION ALL
-
-        -- etldoc: osm_highway_name_linestring ->  layer_highway_name:z14_
-        SELECT * FROM osm_highway_name_linestring
-        WHERE zoom_level >= 14
-
-    ) AS zoom_levels
-    WHERE geometry && bbox
-    ORDER BY z_order ASC;
-$$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/highway_name/merge_highways.sql b/layers/highway_name/merge_highways.sql
deleted file mode 100644
index a96f6d1..0000000
--- a/layers/highway_name/merge_highways.sql
+++ /dev/null
@@ -1,57 +0,0 @@
--- Instead of using relations to find out the road names we
--- stitch together the touching ways with the same name
--- to allow for nice label rendering
--- Because this works well for roads that do not have relations as well
-
--- etldoc: osm_highway_linestring ->  osm_highway_name_linestring
-CREATE TABLE IF NOT EXISTS osm_highway_name_linestring AS (
-	SELECT
-		(ST_Dump(geometry)).geom AS geometry,
-        -- NOTE: The osm_id is no longer the original one which can make it difficult
-        -- to lookup road names by OSM ID
-		member_osm_ids[0] AS osm_id,
-		member_osm_ids,
-		name,
-        ref,
-		highway,
-		z_order
-	FROM (
-		SELECT
-			ST_LineMerge(ST_Union(geometry)) AS geometry,
-			name,
-            ref,
-			highway,
-			min(z_order) AS z_order,
-			array_agg(DISTINCT osm_id) AS member_osm_ids
-	    FROM osm_highway_linestring
-        -- We only care about roads for labelling
-	    WHERE name <> '' OR ref <> ''
-	    GROUP BY name, highway, ref
-	) AS highway_union
-);
-
-CREATE INDEX IF NOT EXISTS osm_highway_name_linestring_geometry_idx ON osm_highway_name_linestring USING gist(geometry);
-
--- etldoc: osm_highway_name_linestring -> osm_highway_name_linestring_gen1 
-CREATE TABLE IF NOT EXISTS osm_highway_name_linestring_gen1 AS (
-    SELECT ST_Simplify(geometry, 50) AS geometry, osm_id, member_osm_ids, name, ref, highway, z_order
-    FROM osm_highway_name_linestring
-    WHERE highway IN ('motorway','trunk')  AND ST_Length(geometry) > 8000
-);
-CREATE INDEX IF NOT EXISTS osm_highway_name_linestring_gen1_geometry_idx ON osm_highway_name_linestring_gen1 USING gist(geometry);
-
--- etldoc: osm_highway_name_linestring_gen1 -> osm_highway_name_linestring_gen2
-CREATE TABLE IF NOT EXISTS osm_highway_name_linestring_gen2 AS (
-    SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, ref, highway, z_order
-    FROM osm_highway_name_linestring_gen1
-    WHERE highway IN ('motorway','trunk')  AND ST_Length(geometry) > 14000
-);
-CREATE INDEX IF NOT EXISTS osm_highway_name_linestring_gen2_geometry_idx ON osm_highway_name_linestring_gen2 USING gist(geometry);
-
--- etldoc: osm_highway_name_linestring_gen2 -> osm_highway_name_linestring_gen3
-CREATE TABLE IF NOT EXISTS osm_highway_name_linestring_gen3 AS (
-    SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, ref, highway, z_order
-    FROM osm_highway_name_linestring_gen2
-    WHERE highway = 'motorway' AND ST_Length(geometry) > 20000
-);
-CREATE INDEX IF NOT EXISTS osm_highway_name_linestring_gen3_geometry_idx ON osm_highway_name_linestring_gen3 USING gist(geometry);
diff --git a/layers/railway/README.md b/layers/railway/README.md
deleted file mode 100644
index 8a1bc51..0000000
--- a/layers/railway/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# railway
-
-The `railway` layer contains linestrings marking tracks from [OSM Railways](http://wiki.openstreetmap.org/wiki/Railways).
-It contains tracks for [passenger and freight trains]() and smaller tracks for [Trams](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dtram) or [similar](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dlight_rail) vehicles. But also tracks for [subways](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dsubway), [narrow-gauge trains](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dnarrow_gauge) or [historic trains](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dpreserved).
-Non mainline tracks (marked with class `minor_rail`) used for [storage of trains](http://wiki.openstreetmap.org/wiki/Tag:service%3Dyard) and [maintenance](http://wiki.openstreetmap.org/wiki/Tag:service%3Dsiding) are contained in the highest zoom levels and should be styled more subtle than the mainline tracks with class `rail`.
-
-## Fields
-
-- **class**: Divides the track into mainline tracks (class `rail`) and less important tracks
-used for maintenance (class `minor_rail`).
-- **subclass**: Original value of the [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) can be one of
-`rail`, `light_rail`, `subway`, `narrow_gauge`, `preserved`, `tram`.
-- **properties**: Additional properties describing the nature of tracks. Can be either `bridge` or `tunnel`.
-
-## Mapping
-
-![](mapping.png)
-
-
diff --git a/layers/railway/mapping b/layers/railway/mapping
deleted file mode 100644
index d068987..0000000
--- a/layers/railway/mapping
+++ /dev/null
@@ -1,14 +0,0 @@
-digraph "Imposm Mapping" {
-	graph [rankdir=LR ranksep=3]
-		subgraph railway_linestring {
-			node [fixed_size=shape "width:"=20]
-				railway_linestring [shape=box]
-				key_railway [label=railway shape=box]
-					key_railway -> railway_linestring [label="rail
-light_rail
-subway
-narrow_gauge
-preserved
-tram"]
-		}
-}
\ No newline at end of file
diff --git a/layers/railway/mapping.png b/layers/railway/mapping.png
deleted file mode 100644
index 52a472337b77d0c4713abdb97eec597e6ff00d8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13139
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

diff --git a/layers/railway/mapping.yaml b/layers/railway/mapping.yaml
deleted file mode 100644
index 2d21cf2..0000000
--- a/layers/railway/mapping.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-tables:
-  # etldoc: imposm3 -> osm_railway_linestring
-  railway_linestring:
-    type: linestring
-    fields:
-    - name: osm_id
-      type: id
-    - name: geometry
-      type: geometry
-    - key: railway
-      name: railway
-      type: string
-    - name: z_order
-      type: wayzorder
-    - key: tunnel
-      name: is_tunnel
-      type: bool
-    - key: bridge
-      name: is_bridge
-      type: bool
-    - key: service
-      name: service
-      type: string
-    - key: usage
-      name: usage
-      type: string
-    mapping:
-      railway:
-      - rail
-      - light_rail
-      - subway
-      - narrow_gauge
-      - preserved
-      - tram
diff --git a/layers/railway/railway.sql b/layers/railway/railway.sql
deleted file mode 100644
index 7902211..0000000
--- a/layers/railway/railway.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE FUNCTION railway_class(railway text, service text) RETURNS TEXT AS $$
-    SELECT CASE
-        WHEN railway='rail' AND service='' THEN 'rail'
-        ELSE 'minor_rail'
-    END;
-$$ LANGUAGE SQL IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION railway_brunnel(is_bridge boolean, is_tunnel boolean) RETURNS TEXT AS $$
-    SELECT CASE
-         WHEN is_bridge THEN 'bridge'
-         WHEN is_tunnel THEN 'tunnel'
-        ELSE NULL
-    END;
-$$ LANGUAGE SQL IMMUTABLE;
-
--- etldoc: layer_railway[shape=record fillcolor=lightpink, style="rounded,filled",  
--- etldoc:     label="layer_railway | <z13> z13 | <z14_> z14_" ] ;
-
-CREATE OR REPLACE FUNCTION layer_railway(bbox geometry, zoom_level int)
-RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text, properties railway_properties) AS $$
-    SELECT osm_id, geometry,
-        railway_class(railway, service) AS class,
-        railway AS subclass,
-        to_railway_properties(is_bridge, is_tunnel) AS properties
-    FROM (
-        -- etldoc: osm_railway_linestring ->  layer_railway :z13 
-        SELECT * FROM osm_railway_linestring
-        WHERE zoom_level = 13 AND railway = 'rail' AND service=''
-        UNION ALL
-        -- etldoc: osm_railway_linestring ->  layer_railway :z14_        
-        SELECT * FROM osm_railway_linestring WHERE zoom_level >= 14
-    ) AS zoom_levels
-    WHERE geometry && bbox
-    ORDER BY z_order ASC;
-$$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/railway/railway.yaml b/layers/railway/railway.yaml
deleted file mode 100644
index 913f4d6..0000000
--- a/layers/railway/railway.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-layer:
-  id: "railway"
-  description: |
-      The `railway` layer contains linestrings marking tracks from [OSM Railways](http://wiki.openstreetmap.org/wiki/Railways).
-      It contains tracks for [passenger and freight trains]() and smaller tracks for [Trams](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dtram) or [similar](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dlight_rail) vehicles. But also tracks for [subways](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dsubway), [narrow-gauge trains](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dnarrow_gauge) or [historic trains](http://wiki.openstreetmap.org/wiki/Tag:railway%3Dpreserved).
-      Non mainline tracks (marked with class `minor_rail`) used for [storage of trains](http://wiki.openstreetmap.org/wiki/Tag:service%3Dyard) and [maintenance](http://wiki.openstreetmap.org/wiki/Tag:service%3Dsiding) are contained in the highest zoom levels and should be styled more subtle than the mainline tracks with class `rail`.
-  fields:
-    class: |
-        Divides the track into mainline tracks (class `rail`) and less important tracks
-        used for maintenance (class `minor_rail`).
-    subclass: |
-        Original value of the [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) can be one of
-        `rail`, `light_rail`, `subway`, `narrow_gauge`, `preserved`, `tram`.
-    properties: |
-        Additional properties describing the nature of tracks. Can be either `bridge` or `tunnel`.
-  buffer_size: 4
-  datasource:
-    geometry_field: geometry
-    query: (SELECT geometry, class, subclass, properties::text FROM layer_railway(!bbox!, z(!scale_denominator!))) AS t
-schema:
-  - ./types.sql
-  - ./railway.sql
-datasources:
-  - type: imposm3
-    mapping_file: ./mapping.yaml
diff --git a/layers/railway/types.sql b/layers/railway/types.sql
deleted file mode 100644
index e323edd..0000000
--- a/layers/railway/types.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-DO $$
-BEGIN
-    IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'railway_properties') THEN
-        CREATE TYPE railway_properties AS ENUM ('bridge', 'tunnel');
-    END IF;
-END
-$$;
-
-CREATE OR REPLACE FUNCTION to_railway_properties(is_bridge boolean, is_tunnel boolean) RETURNS railway_properties AS $$
-    SELECT CASE
-         WHEN is_bridge THEN 'bridge'::railway_properties
-         WHEN is_tunnel THEN 'tunnel'::railway_properties
-        ELSE NULL
-    END;
-$$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/highway/README.md b/layers/transportation/README.md
similarity index 100%
rename from layers/highway/README.md
rename to layers/transportation/README.md
diff --git a/layers/highway/highway.sql b/layers/transportation/highway.sql
similarity index 63%
rename from layers/highway/highway.sql
rename to layers/transportation/highway.sql
index 09bf901..fa10c6a 100644
--- a/layers/highway/highway.sql
+++ b/layers/transportation/highway.sql
@@ -1,13 +1,11 @@
- 
-
 CREATE OR REPLACE FUNCTION highway_is_link(highway TEXT) RETURNS BOOLEAN AS $$
     SELECT highway LIKE '%_link';
 $$ LANGUAGE SQL IMMUTABLE STRICT;
 
 
--- etldoc: layer_highway[shape=record fillcolor=lightpink, style="rounded,filled",  
--- etldoc:     label="<sql> layer_highway |<z4z7> z4-z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
-CREATE OR REPLACE FUNCTION layer_highway(bbox geometry, zoom_level int)
+-- etldoc: layer_transportation[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="<sql> layer_transportation |<z4z7> z4-z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
+CREATE OR REPLACE FUNCTION layer_transportation(bbox geometry, zoom_level int)
 RETURNS TABLE(osm_id bigint, geometry geometry, class highway_class, subclass text, properties highway_properties) AS $$
     SELECT
 		osm_id, geometry,
@@ -15,8 +13,8 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class highway_class, subclass te
 		to_highway_properties(is_bridge, is_tunnel, is_ford, is_ramp, is_oneway) AS properties
 	FROM (
 
-		-- etldoc: ne_10m_global_roads ->  layer_highway:z4z7
-		SELECT 
+		-- etldoc: ne_10m_global_roads ->  layer_transportation:z4z7
+		SELECT
 			NULL::bigint AS osm_id, geometry, highway,
 			FALSE AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford, FALSE AS is_ramp, FALSE AS is_oneway,
 			0 AS z_order
@@ -24,59 +22,59 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class highway_class, subclass te
 		WHERE zoom_level BETWEEN 4 AND 7 AND scalerank <= 1 + zoom_level
 		UNION ALL
 
-		-- etldoc: osm_highway_linestring_gen4  ->  layer_highway:z8
+		-- etldoc: osm_transportation_linestring_gen4  ->  layer_transportation:z8
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring_gen4
+        FROM osm_transportation_linestring_gen4
 		WHERE zoom_level = 8
 		UNION ALL
 
-		-- etldoc: osm_highway_linestring_gen3  ->  layer_highway:z9
+		-- etldoc: osm_transportation_linestring_gen3  ->  layer_transportation:z9
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring_gen3
+        FROM osm_transportation_linestring_gen3
 		WHERE zoom_level = 9
 		UNION ALL
 
-		-- etldoc: osm_highway_linestring_gen2  ->  layer_highway:z10
+		-- etldoc: osm_transportation_linestring_gen2  ->  layer_transportation:z10
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring_gen2
+        FROM osm_transportation_linestring_gen2
 		WHERE zoom_level = 10
 		UNION ALL
 
-		-- etldoc: osm_highway_linestring_gen1  ->  layer_highway:z11
+		-- etldoc: osm_transportation_linestring_gen1  ->  layer_transportation:z11
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring_gen1
+        FROM osm_transportation_linestring_gen1
 		WHERE zoom_level = 11
 		UNION ALL
 
-		-- etldoc: osm_highway_linestring       ->  layer_highway:z12
+		-- etldoc: osm_transportation_linestring       ->  layer_transportation:z12
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring
+        FROM osm_transportation_linestring
 		WHERE zoom_level = 12
             AND (to_highway_class(highway) < 'minor_road'::highway_class OR highway IN ('unclassified', 'residential'))
             AND NOT highway_is_link(highway)
             AND NOT is_area
         UNION ALL
 
-		-- etldoc: osm_highway_linestring       ->  layer_highway:z13
+		-- etldoc: osm_transportation_linestring       ->  layer_transportation:z13
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring
+        FROM osm_transportation_linestring
 		WHERE zoom_level = 13
             AND to_highway_class(highway) < 'path'::highway_class
             AND NOT is_area
         UNION ALL
 
-		-- etldoc: osm_highway_linestring       ->  layer_highway:z14_
+		-- etldoc: osm_transportation_linestring       ->  layer_transportation:z14_
 		SELECT osm_id, geometry, highway, is_bridge, is_tunnel, is_ford, is_ramp, is_oneway, z_order
-        FROM osm_highway_linestring
+        FROM osm_transportation_linestring
 		WHERE zoom_level >= 14 AND NOT is_area
         UNION ALL
 
         -- NOTE: We limit the selection of polys because we need to be careful to net get false positives here because
         -- it is possible that closed linestrings appear both as highway linestrings and as polygon
-        -- etldoc: osm_highway_polygon          ->  layer_highway:z13
-        -- etldoc: osm_highway_polygon          ->  layer_highway:z14_
+        -- etldoc: osm_transportation__polygon          ->  layer_transportation:z13
+        -- etldoc: osm_transportation__polygon          ->  layer_transportation:z14_
 		SELECT osm_id, geometry, highway, FALSE AS is_bridge, FALSE AS is_tunnel, FALSE AS is_ford, FALSE AS is_ramp, FALSE AS is_oneway, z_order
-        FROM osm_highway_polygon
+        FROM osm_transportation_polygon
         -- We do not want underground pedestrian areas for now
 		WHERE zoom_level >= 13 AND is_area AND COALESCE(layer, 0) >= 0
     ) AS zoom_levels
diff --git a/layers/transportation/mapping b/layers/transportation/mapping
new file mode 100644
index 0000000..b5a7470
--- /dev/null
+++ b/layers/transportation/mapping
@@ -0,0 +1,39 @@
+digraph "Imposm Mapping" {
+	graph [rankdir=LR ranksep=3]
+		subgraph highway_polygon {
+			node [fixed_size=shape "width:"=20]
+				highway_polygon [shape=box]
+				key_highway [label=highway shape=box]
+					key_highway -> highway_polygon [label=pedestrian]
+		}
+		subgraph highway_linestring {
+			node [fixed_size=shape "width:"=20]
+				highway_linestring [shape=box]
+				key_highway [label=highway shape=box]
+					key_highway -> highway_linestring [label="motorway
+motorway_link
+trunk
+trunk_link
+primary
+primary_link
+secondary
+secondary_link
+tertiary
+tertiary_link
+unclassified
+residential
+road
+living_street
+raceway
+construction
+track
+service
+path
+cycleway
+bridleway
+footway
+corridor
+crossing
+pedestrian"]
+		}
+}
\ No newline at end of file
diff --git a/layers/highway/mapping.png b/layers/transportation/mapping.png
similarity index 100%
rename from layers/highway/mapping.png
rename to layers/transportation/mapping.png
diff --git a/layers/highway/mapping.yaml b/layers/transportation/mapping.yaml
similarity index 66%
rename from layers/highway/mapping.yaml
rename to layers/transportation/mapping.yaml
index cbd8fed..3ba3da0 100644
--- a/layers/highway/mapping.yaml
+++ b/layers/transportation/mapping.yaml
@@ -1,33 +1,33 @@
 
 generalized_tables:
 
-# etldoc: imposm3 -> osm_highway_linestring_gen4
-  highway_linestring_gen4:
-    source: highway_linestring_gen3
+# etldoc: imposm3 -> osm_transportation_linestring_gen4
+  transportation_linestring_gen4:
+    source: transportation_linestring_gen3
     sql_filter: highway IN ('motorway','trunk') AND NOT is_area
     tolerance: 200.0
 
-# etldoc: imposm3 -> osm_highway_linestring_gen3    
-  highway_linestring_gen3:
-    source: highway_linestring_gen2
+# etldoc: imposm3 -> osm_transportation_linestring_gen3
+  transportation_linestring_gen3:
+    source: transportation_linestring_gen2
     sql_filter: highway IN ('motorway','trunk', 'primary') AND NOT is_area
     tolerance: 120.0
 
-# etldoc: imposm3 -> osm_highway_linestring_gen2    
-  highway_linestring_gen2:
-    source: highway_linestring_gen1
+# etldoc: imposm3 -> osm_transportation_linestring_gen2
+  transportation_linestring_gen2:
+    source: transportation_linestring_gen1
     sql_filter: highway IN ('motorway','trunk', 'primary', 'secondary') AND NOT is_area
     tolerance: 50.0
 
-# etldoc: imposm3 -> osm_highway_linestring_gen1    
-  highway_linestring_gen1:
-    source: highway_linestring
+# etldoc: imposm3 -> osm_transportation_linestring_gen1
+  transportation_linestring_gen1:
+    source: transportation_linestring
     sql_filter: highway IN ('motorway','trunk', 'primary', 'secondary', 'tertiary') AND NOT is_area
     tolerance: 20.0
 
 tables:
-# etldoc: imposm3 -> osm_highway_linestring
-  highway_linestring:
+# etldoc: imposm3 -> osm_transportation_linestring
+  transportation_linestring:
     type: linestring
     fields:
     - name: osm_id
@@ -37,6 +37,9 @@ tables:
     - name: highway
       key: highway
       type: string
+    - key: railway
+      name: railway
+      type: string
     - key: ref
       name: ref
       type: string
@@ -63,12 +66,21 @@ tables:
     - key: name
       name: name
       type: string
+    - key: short_name
+      name: short_name
+      type: string
     - name: name_en
       key: name:en
       type: string
     - name: is_area
       key: area
       type: bool
+    - key: service
+      name: service
+      type: string
+    - key: usage
+      name: usage
+      type: string
     mapping:
       highway:
       - motorway
@@ -96,9 +108,16 @@ tables:
       - corridor
       - crossing
       - pedestrian
+      railway:
+      - rail
+      - light_rail
+      - subway
+      - narrow_gauge
+      - preserved
+      - tram
 
-# etldoc: imposm3 -> osm_highway_polygon     
-  highway_polygon:
+# etldoc: imposm3 -> osm_transportation_polygon
+  transportation_polygon:
     type: polygon
     fields:
     - name: osm_id
diff --git a/layers/highway/ne_global_roads.sql b/layers/transportation/ne_global_roads.sql
similarity index 100%
rename from layers/highway/ne_global_roads.sql
rename to layers/transportation/ne_global_roads.sql
diff --git a/layers/highway/highway.yaml b/layers/transportation/transportation.yaml
similarity index 96%
rename from layers/highway/highway.yaml
rename to layers/transportation/transportation.yaml
index f028095..3d53067 100644
--- a/layers/highway/highway.yaml
+++ b/layers/transportation/transportation.yaml
@@ -1,5 +1,5 @@
 layer:
-  id: "highway"
+  id: "transportation"
   description: |
       Roads or [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) in OpenStreetMap lingo.
       This layer is directly derived from the OSM road hierarchy which is why it is called `highway`. Only
@@ -29,7 +29,7 @@ layer:
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT geometry, class::text, subclass, properties::text FROM layer_highway(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class::text, subclass, properties::text FROM layer_transportation(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./types.sql
   - ./ne_global_roads.sql
diff --git a/layers/highway/types.sql b/layers/transportation/types.sql
similarity index 100%
rename from layers/highway/types.sql
rename to layers/transportation/types.sql
diff --git a/layers/highway_name/README.md b/layers/transportation_name/README.md
similarity index 100%
rename from layers/highway_name/README.md
rename to layers/transportation_name/README.md
diff --git a/layers/transportation_name/layer.sql b/layers/transportation_name/layer.sql
new file mode 100644
index 0000000..6f62a9c
--- /dev/null
+++ b/layers/transportation_name/layer.sql
@@ -0,0 +1,50 @@
+
+-- etldoc: layer_transportation_name[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="layer_transportation_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
+
+CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer)
+RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, class highway_class, subclass text) AS $$
+    SELECT osm_id, geometry, name,
+      NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length,
+      to_highway_class(highway) AS class, highway AS subclass
+    FROM (
+
+        -- etldoc: osm_transportation_name_linestring_gen3 ->  layer_transportation_name:z8
+        SELECT * FROM osm_transportation_name_linestring_gen3
+        WHERE zoom_level = 8
+        UNION ALL
+
+        -- etldoc: osm_transportation_name_linestring_gen2 ->  layer_transportation_name:z9
+        SELECT * FROM osm_transportation_name_linestring_gen2
+        WHERE zoom_level = 9
+        UNION ALL
+
+        -- etldoc: osm_transportation_name_linestring_gen1 ->  layer_transportation_name:z10
+        -- etldoc: osm_transportation_name_linestring_gen1 ->  layer_transportation_name:z11
+        SELECT * FROM osm_transportation_name_linestring_gen1
+        WHERE zoom_level BETWEEN 10 AND 11
+        UNION ALL
+
+        -- etldoc: osm_transportation_name_linestring ->  layer_transportation_name:z12
+        SELECT * FROM osm_transportation_name_linestring
+        WHERE zoom_level = 12
+            AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
+            AND to_highway_class(highway) < 'minor_road'::highway_class
+            AND NOT highway_is_link(highway)
+        UNION ALL
+
+        -- etldoc: osm_transportation_name_linestring ->  layer_transportation_name:z13
+        SELECT * FROM osm_transportation_name_linestring
+        WHERE zoom_level = 13
+            AND LineLabel(zoom_level, COALESCE(NULLIF(name, ''), ref), geometry)
+            AND to_highway_class(highway) < 'path'::highway_class
+        UNION ALL
+
+        -- etldoc: osm_transportation_name_linestring ->  layer_transportation_name:z14_
+        SELECT * FROM osm_transportation_name_linestring
+        WHERE zoom_level >= 14
+
+    ) AS zoom_levels
+    WHERE geometry && bbox
+    ORDER BY z_order ASC;
+$$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/transportation_name/merge_highways.sql b/layers/transportation_name/merge_highways.sql
new file mode 100644
index 0000000..f681163
--- /dev/null
+++ b/layers/transportation_name/merge_highways.sql
@@ -0,0 +1,57 @@
+-- Instead of using relations to find out the road names we
+-- stitch together the touching ways with the same name
+-- to allow for nice label rendering
+-- Because this works well for roads that do not have relations as well
+
+-- etldoc: osm_transportation_linestring ->  osm_transportation_name_linestring
+CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS (
+	SELECT
+		(ST_Dump(geometry)).geom AS geometry,
+        -- NOTE: The osm_id is no longer the original one which can make it difficult
+        -- to lookup road names by OSM ID
+		member_osm_ids[0] AS osm_id,
+		member_osm_ids,
+		name,
+        ref,
+		highway,
+		z_order
+	FROM (
+		SELECT
+			ST_LineMerge(ST_Union(geometry)) AS geometry,
+			name,
+            ref,
+			highway,
+			min(z_order) AS z_order,
+			array_agg(DISTINCT osm_id) AS member_osm_ids
+	    FROM osm_transportation_linestring
+        -- We only care about highways (not railways) for labeling
+	    WHERE (name <> '' OR ref <> '') AND NULLIF(highway, '') IS NOT NULL
+	    GROUP BY name, highway, ref
+	) AS highway_union
+);
+
+CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_geometry_idx ON osm_transportation_name_linestring USING gist(geometry);
+
+-- etldoc: osm_transportation_name_linestring -> osm_transportation_name_linestring_gen1
+CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring_gen1 AS (
+    SELECT ST_Simplify(geometry, 50) AS geometry, osm_id, member_osm_ids, name, ref, highway, z_order
+    FROM osm_transportation_name_linestring
+    WHERE highway IN ('motorway','trunk')  AND ST_Length(geometry) > 8000
+);
+CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen1_geometry_idx ON osm_transportation_name_linestring_gen1 USING gist(geometry);
+
+-- etldoc: osm_transportation_name_linestring_gen1 -> osm_transportation_name_linestring_gen2
+CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring_gen2 AS (
+    SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, ref, highway, z_order
+    FROM osm_transportation_name_linestring_gen1
+    WHERE highway IN ('motorway','trunk')  AND ST_Length(geometry) > 14000
+);
+CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen2_geometry_idx ON osm_transportation_name_linestring_gen2 USING gist(geometry);
+
+-- etldoc: osm_transportation_name_linestring_gen2 -> osm_transportation_name_linestring_gen3
+CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring_gen3 AS (
+    SELECT ST_Simplify(geometry, 120) AS geometry, osm_id, member_osm_ids, name, ref, highway, z_order
+    FROM osm_transportation_name_linestring_gen2
+    WHERE highway = 'motorway' AND ST_Length(geometry) > 20000
+);
+CREATE INDEX IF NOT EXISTS osm_transportation_name_linestring_gen3_geometry_idx ON osm_transportation_name_linestring_gen3 USING gist(geometry);
diff --git a/layers/highway_name/highway_name.yaml b/layers/transportation_name/transportation_name.yaml
similarity index 90%
rename from layers/highway_name/highway_name.yaml
rename to layers/transportation_name/transportation_name.yaml
index 69751b3..27e55bf 100644
--- a/layers/highway_name/highway_name.yaml
+++ b/layers/transportation_name/transportation_name.yaml
@@ -1,5 +1,5 @@
 layer:
-  id: "highway_name"
+  id: "transportation_name"
   description: |
       This is the layer for labelling the highways. Only highways that are named `name=*` and are long enough
       to place text upon appear. The OSM roads are stitched together if they contain the same name
@@ -20,10 +20,10 @@ layer:
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT geometry, name, ref, ref_length, class::text, subclass FROM layer_highway_name(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, name, ref, ref_length, class::text, subclass FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./merge_highways.sql
   - ./layer.sql
 datasources:
   - type: imposm3
-    mapping_file: ../highway/mapping.yaml
+    mapping_file: ../transportation/mapping.yaml
diff --git a/openmaptiles.yaml b/openmaptiles.yaml
index 0ab0126..2013d40 100644
--- a/openmaptiles.yaml
+++ b/openmaptiles.yaml
@@ -1,13 +1,12 @@
 tileset:
   layers:
     - layers/boundary/boundary.yaml
-    - layers/highway/highway.yaml
-    - layers/highway_name/highway_name.yaml
+    - layers/transportation/transportation.yaml
+    - layers/transportation_name/transportation_name.yaml
     - layers/building/building.yaml
     - layers/housenumber/housenumber.yaml
     - layers/place/place.yaml
     - layers/poi/poi.yaml
-    - layers/railway/railway.yaml
     - layers/water_name/water_name.yaml
     - layers/water/water.yaml
     - layers/waterway/waterway.yaml