Render attraction=water_slide (gravitystorm#3335).

johsin18 · Aug 14, 2018 · 1dc491e · 1dc491e
1 parent 236a903
commit 1dc491e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git 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
@@ -306,15 +306,17 @@ Layer:
         (SELECT
             way,
             waterway,
+            attraction,
             name,
             CASE WHEN tags->'intermittent' IN ('yes')
               OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
               THEN 'yes' ELSE 'no' END AS int_intermittent,
             CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel,
             'no' AS bridge
           FROM planet_osm_line
-          WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch', 'wadi')
-            AND (bridge IS NULL OR bridge NOT IN ('yes', 'aqueduct'))
+          WHERE (waterway IN ('river', 'canal', 'stream', 'drain', 'ditch', 'wadi')
+                 AND (bridge IS NULL OR bridge NOT IN ('yes', 'aqueduct')))
+            OR attraction IN ('water_slide')
           ORDER BY COALESCE(layer,0)
         ) AS water_lines
     properties:
@@ -1009,15 +1011,17 @@ Layer:
         (SELECT
             way,
             waterway,
+            attraction,
             name,
             CASE WHEN tags->'intermittent' IN ('yes')
               OR tags->'seasonal' IN ('yes', 'spring', 'summer', 'autumn', 'winter', 'wet_season', 'dry_season')
               THEN 'yes' ELSE 'no' END AS int_intermittent,
             CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel,
             'yes' AS bridge
           FROM planet_osm_line
-          WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch', 'wadi')
-            AND bridge IN ('yes', 'aqueduct')
+          WHERE (waterway IN ('river', 'canal', 'stream', 'drain', 'ditch', 'wadi')
+                 AND bridge IN ('yes', 'aqueduct'))
+            OR attraction IN ('water_slide')
           ORDER BY COALESCE(layer,0)
         ) AS waterway_bridges
     properties:

diff --git a/water.mss b/water.mss
@@ -244,6 +244,23 @@
     }
   }
 
+  [attraction = 'water_slide'] {
+    [zoom >= 15] {
+      [zoom >= 17] {
+        bridgecasing/line-color: saturate(darken(@water-color, 40%), 30%);
+        bridgecasing/line-join: round;
+        bridgecasing/line-width: 2;
+        [zoom >= 18] { bridgecasing/line-width: 3.5; }
+        [zoom >= 19] { bridgecasing/line-width: 7; }
+      }
+      water/line-color: @water-color;
+      water/line-width: 1;
+      water/line-join: round;
+      [zoom >= 17] { water/line-width: 1.5; }
+      [zoom >= 18] { water/line-width: 3; }
+      [zoom >= 19] { water/line-width: 6; }
+    }
+  }
 }
 
 #water-lines-text {