From 0a8847d6ae71059e5385e7b97c4c655466b48ce0 Mon Sep 17 00:00:00 2001
From: lukasmartinelli <me@lukasmartinelli.ch>
Date: Mon, 24 Oct 2016 15:38:32 +0200
Subject: [PATCH] Add class attribute to waterway

---
 layers/waterway/waterway.sql  | 24 ++++++++++++------------
 layers/waterway/waterway.yaml |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql
index 9d0b9cfc..72010733 100644
--- a/layers/waterway/waterway.sql
+++ b/layers/waterway/waterway.sql
@@ -1,50 +1,50 @@
 CREATE OR REPLACE VIEW waterway_z3 AS (
-    SELECT geom, 'river' AS class FROM ne_110m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river' AS class FROM ne_110m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 CREATE OR REPLACE VIEW waterway_z4 AS (
-    SELECT geom, 'river' AS class FROM ne_50m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river' AS class FROM ne_50m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 CREATE OR REPLACE VIEW waterway_z6 AS (
-    SELECT geom, 'river' AS class FROM ne_10m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river' AS class FROM ne_10m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 CREATE OR REPLACE VIEW waterway_z8 AS (
-    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river') AND ST_Length(geometry) > 10000
 );
 
 CREATE OR REPLACE VIEW waterway_z9 AS (
-    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river') AND ST_Length(geometry) > 5000
 );
 
 CREATE OR REPLACE VIEW waterway_z11 AS (
-    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river') AND ST_Length(geometry) > 5000
 );
 
 CREATE OR REPLACE VIEW waterway_z12 AS (
-    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river', 'canal') OR (waterway = 'stream' AND ST_Length(geometry) > 1000)
 );
 
 CREATE OR REPLACE VIEW waterway_z13 AS (
-    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch') AND ST_Length(geometry) > 300
 );
 
 CREATE OR REPLACE VIEW waterway_z14 AS (
-    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class FROM osm_waterway_linestring
 );
 
 CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int)
-RETURNS TABLE(geom geometry, waterway text) AS $$
-    SELECT geom, class FROM (
+RETURNS TABLE(geometry geometry, class text) AS $$
+    SELECT geometry, class FROM (
         SELECT * FROM waterway_z3 WHERE zoom_level = 3
         UNION ALL
         SELECT * FROM waterway_z4 WHERE zoom_level BETWEEN 4 AND 5
@@ -63,5 +63,5 @@ RETURNS TABLE(geom geometry, waterway text) AS $$
         UNION ALL
         SELECT * FROM waterway_z14 WHERE zoom_level >= 14
     ) AS zoom_levels
-    WHERE geom && bbox;
+    WHERE geometry && bbox;
 $$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml
index 87b4da22..32b25af2 100644
--- a/layers/waterway/waterway.yaml
+++ b/layers/waterway/waterway.yaml
@@ -4,6 +4,7 @@ layer:
       OpenStreetMap waterways.
   buffer_size: 4
   datasource:
+    geometry_field: geometry
     query: (SELECT * FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./waterway.sql