From a109ffd72e22456d5d2bd5a3afeefc2b49e86eb9 Mon Sep 17 00:00:00 2001
From: Lukas Martinelli <me@lukasmartinelli.ch>
Date: Fri, 2 Dec 2016 12:36:10 +0000
Subject: [PATCH] Remove subclass from transport

---
 layers/transportation/layer.sql           |  3 +-
 layers/transportation/transportation.yaml | 65 +++++------------------
 2 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/layers/transportation/layer.sql b/layers/transportation/layer.sql
index 0e431f9b..924ab96b 100644
--- a/layers/transportation/layer.sql
+++ b/layers/transportation/layer.sql
@@ -6,14 +6,13 @@ $$ LANGUAGE SQL IMMUTABLE STRICT;
 -- etldoc: layer_transportation[shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="<sql> layer_transportation |<z4z6> z4-z6 |<z7z8> z7-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 text, subclass text, ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, class text, ramp int, oneway int, brunnel TEXT, service TEXT) AS $$
     SELECT
         osm_id, geometry,
         CASE
             WHEN highway IS NOT NULL THEN highway_class(highway)
             WHEN railway IS NOT NULL THEN railway_class(railway)
         END AS class,
-        COALESCE(NULLIF(highway,''), NULLIF(railway, '')) AS subclass,
         -- All links are considered as ramps as well
         CASE WHEN highway_is_link(highway) OR highway = 'steps'
              THEN 1 ELSE is_ramp::int END AS ramp,
diff --git a/layers/transportation/transportation.yaml b/layers/transportation/transportation.yaml
index 3788f8cf..5ce76b30 100644
--- a/layers/transportation/transportation.yaml
+++ b/layers/transportation/transportation.yaml
@@ -1,23 +1,23 @@
 layer:
   id: "transportation"
   description: |
-      **transportation** containsrRoads and railways.
-      This layer is directly derived from the OSM road hierarchy which is why it is called `highway`. Only
-      at zoom level 4 to 7 some major highways from Natural Earth are used otherwise it is only OSM data.
-      It contains all roads from motorways to primary, secondary and tertiary roads to residential roads and
-      foot paths. Styling the roads is the most essential part of the map. If you can put enough effort into it
-      makes sense to carefully style each `subclass`. For more comfortable styling you can also just style the roads
-      by `class`. Roads can have different properties, a road can have `oneway=yes` and `bridge=yes` at the same time.
-      These properties are reflected in the field `properties`.
-      This layer is not meant for labelling the roads (the purpose of the layer `highway_name`).
-
+      **transportation** contains roads and railways.
+      This layer is directly derived from the OSM road hierarchy.
+      Only at zoom level 4 to 6 some major highways from Natural Earth
+      are used.
+      It contains all roads from motorways to primary, secondary and
+      tertiary roads to residential roads and
+      foot paths. Styling the roads is the most essential part of the map.
       The `highway` layer also contains polygons for things like plazas.
   buffer_size: 4
   srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
   fields:
     class:
       description: |
-          Distinguish between more and less important roads.
+          Distinguish between more and less important roads or railways.
+          Class is derived from the value of the
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
+          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
       values:
       - motorway
       - trunk
@@ -25,49 +25,12 @@ layer:
       - secondary
       - tertiary
       - minor
-      - track
       - service
+      - track
       - path
-    subclass:
-      description: |
-          Use **subclass** to do more precise styling.
-          Original value of the
-          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
-          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
-      values:
-      - 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
       - rail
-      - narrow_gauge
-      - preserved
-      - funicular
-      - subway
-      - light_rail
-      - monorail
-      - tram
+      - transit
     brunnel:
       description: |
           Mark whether way is a tunnel or bridge.
@@ -99,7 +62,7 @@ layer:
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT geometry, class, subclass, oneway, ramp, brunnel, service FROM layer_transportation(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class, oneway, ramp, brunnel, service FROM layer_transportation(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./class.sql
   - ./layer.sql