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

---
 layers/transportation_name/layer.sql          |  4 +-
 .../transportation_name.yaml                  | 43 ++-----------------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/layers/transportation_name/layer.sql b/layers/transportation_name/layer.sql
index 7afbcd8..90716e4 100644
--- a/layers/transportation_name/layer.sql
+++ b/layers/transportation_name/layer.sql
@@ -3,12 +3,12 @@
 -- 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, network text, class text, subclass text) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, network text, class text) AS $$
     SELECT osm_id, geometry, name,
       NULLIF(ref, ''), NULLIF(LENGTH(ref), 0) AS ref_length,
       --TODO: The road network of the road is not yet implemented
       NULL::text AS network,
-      highway_class(highway) AS class, highway AS subclass
+      highway_class(highway) AS class
     FROM (
 
         -- etldoc: osm_transportation_name_linestring_gen3 ->  layer_transportation_name:z8
diff --git a/layers/transportation_name/transportation_name.yaml b/layers/transportation_name/transportation_name.yaml
index b5615a0..60e668d 100644
--- a/layers/transportation_name/transportation_name.yaml
+++ b/layers/transportation_name/transportation_name.yaml
@@ -22,53 +22,16 @@ 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
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT geometry, name, ref, ref_length, class::text, subclass FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, name, ref, ref_length, class::text FROM layer_transportation_name(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./merge_highways.sql
   - ./layer.sql