From ca33ce8fcecadb5f60497d65bd9ba5a03eff2330 Mon Sep 17 00:00:00 2001
From: Johannes Singler <johannes@singler.name>
Date: Wed, 15 Aug 2018 21:12:04 +0200
Subject: [PATCH] Render attraction=water_slide (#3335).

---
 amenity-points.mss        | 19 +++++++++++++++++++
 openstreetmap-carto.style |  1 +
 project.mml               |  5 ++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/amenity-points.mss b/amenity-points.mss
index 1adf5bdeb0..636f1c4d2b 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -2892,6 +2892,25 @@
     marker-file: url('symbols/transport_slipway.p.20.svg');
     marker-fill: @transportation-icon;
   }
+
+  [feature = 'attraction_water_slide'] {
+    [zoom >= 16] {
+      [zoom >= 17] {
+        bridgecasing/line-color: saturate(darken(@water-color, 40%), 30%);
+        bridgecasing/line-join: round;
+        bridgecasing/line-smooth: 1;
+        bridgecasing/line-width: 1.25;
+        [zoom >= 18] { bridgecasing/line-width: 2.5; }
+        [zoom >= 19] { bridgecasing/line-width: 5; }
+      }
+      line-color: @pitch;
+      line-join: round;
+      line-smooth: 1;
+      line-width: 1;
+      [zoom >= 18] { line-width: 2; }
+      [zoom >= 19] { line-width: 4; }
+    }
+  }
 }
 
 #trees [zoom >= 16] {
diff --git a/openstreetmap-carto.style b/openstreetmap-carto.style
index 77134cb705..c9dc2e79ea 100644
--- a/openstreetmap-carto.style
+++ b/openstreetmap-carto.style
@@ -14,6 +14,7 @@ node,way   admin_level  text         linear
 node,way   aerialway    text         linear
 node,way   aeroway      text         polygon
 node,way   amenity      text         polygon
+node,way   attraction   text         polygon
 node,way   barrier      text         linear
 way        bicycle      text         linear
 way        bridge       text         linear
diff --git a/project.mml b/project.mml
index 8175c02020..8f6a1f0544 100644
--- a/project.mml
+++ b/project.mml
@@ -1562,14 +1562,17 @@ Layer:
       table: |-
         (SELECT
           way,
+          name,
           COALESCE(
            'highway_' || CASE WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' ELSE NULL END,
-           'leisure_' || CASE WHEN leisure IN ('slipway') THEN leisure ELSE NULL END
+           'leisure_' || CASE WHEN leisure IN ('slipway') THEN leisure ELSE NULL END,
+           'attraction_' || CASE WHEN attraction IN ('water_slide') THEN attraction ELSE NULL END
             ) AS feature
           FROM planet_osm_line
           -- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
           WHERE tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones'
             OR leisure IN ('slipway')
+            OR attraction IN ('water_slide')
         ) AS amenity_line
     properties:
       minzoom: 16