fix: 🎨 PR feedback

change to black for bridges, eleminate duplicate code, add comment, change name of layer
dch0ph · Oct 20, 2022 · 5b65f08 · 5b65f08
1 parent 7af20d5
commit 5b65f08
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 87 deletions.
diff --git a/project.mml b/project.mml
@@ -1006,7 +1006,7 @@ Layer:
         ) AS guideways
     properties:
       minzoom: 11
-  - id: roller-coaster-casing
+  - id: roller-coaster-gap-fill
     geometry: linestring
     <<: *extents
     Datasource:
@@ -1030,7 +1030,8 @@ Layer:
         (SELECT
             way,
             COALESCE(layer,0) AS layernotnull,
-            CASE WHEN (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes' OR tags->'indoor' = 'yes') THEN 'yes' ELSE 'no' END AS tunnel
+            CASE WHEN (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes' OR tags->'indoor' = 'yes') THEN 'yes' ELSE 'no' END AS tunnel,
+            CASE WHEN (bridge = 'yes' OR bridge = 'covered' OR bridge = 'viaduct') THEN 'yes' ELSE 'no' END AS bridge
           FROM planet_osm_line
           WHERE tags @> 'roller_coaster=>track' AND railway IS NULL
           ORDER BY

diff --git a/style/tourism.mss b/style/tourism.mss
@@ -3,99 +3,74 @@
 @track-casing: #707070;
 @track-fill: #ddd;
 
-#roller-coaster-casing[zoom >= 15] {
-  ::bridges[bridge = 'yes'] {
-    line-width: 1 + 2*@casing-width-z15;
-    line-color: darken(@track-casing, 20%);
-    line-join: round;
-    line-cap: round;
-
-    [tunnel = 'yes'] { line-color: @track-casing; }
-    [zoom >= 16] { line-width: 2.5 + 2*@casing-width-z16; }
-    [zoom >= 17] { line-width: 4 + 2*@casing-width-z17; }
-    [zoom >= 18] { line-width: 6 + 2*@casing-width-z18; }
-    [zoom >= 19] { line-width: 8 + 2*@casing-width-z19; }
-    [zoom >= 20] { line-width: 12 + 2*@casing-width-z20; }
-  }
-
-  ::casing {
-    line-width: 1;
-    line-color: mix(@track-casing, @track-fill, 50%);
-    line-join: round;
-    line-cap: round;
-
-    [tunnel = 'yes'][zoom >= 16] {
-      line-color: lighten(@track-casing, 20%);
-    }
-    [zoom >= 16] { 
-      line-color: @track-casing;
-      line-width: 2.5;
-    }
-    [zoom >= 17] { line-width: 4; }
-    [zoom >= 18] { line-width: 6; }
-    [zoom >= 19] { line-width: 8; }
-    [zoom >= 20] { line-width: 12; }
-  }
+/* The purpose of “roller-coaster-gap-fill” layer is to fill in the gaps between sections of roller coaster track. */
+#roller-coaster-gap-fill[zoom >= 15] {
+  ::bridges { line-cap: round; }
+  ::casing { line-cap: round; }
+  ::fill { line-cap: round; }
+}
 
-  ::fill[zoom >= 16] {
-    line-width: 1.25;
-    line-color: @track-fill;
-    line-join: round;
-    line-cap: round;
+#roller-coaster, #roller-coaster-gap-fill {
+  [zoom >= 15] {
+    ::bridges[bridge = 'yes'] {
+      line-width: 1 + 2*@casing-width-z15;
+      line-color: #000;
+      line-join: round;
+
+      [tunnel = 'yes'][zoom >= 16] {
+        line-color: lighten(#000, 20%);
+      }
 
-    [tunnel = 'yes'] {
-      line-color: lighten(@track-fill, 5%);
+      [zoom >= 16] { line-width: 2.5 + 2*@casing-width-z16; }
+      [zoom >= 17] { line-width: 4 + 2*@casing-width-z17; }
+      [zoom >= 18] { line-width: 6 + 2*@casing-width-z18; }
+      [zoom >= 19] { line-width: 8 + 2*@casing-width-z19; }
+      [zoom >= 20] { line-width: 12 + 2*@casing-width-z20; }
     }
-    [zoom >= 17] { line-width: 2; }
-    [zoom >= 18] { line-width: 3; }
-    [zoom >= 19] { line-width: 4; }
-    [zoom >= 20] { line-width: 6; }
-  }
-}
 
-#roller-coaster[zoom >= 15] {
-  ::casing {
-    line-width: 1;
-    line-color: mix(@track-casing, @track-fill, 50%);
-    line-join: round;
+    ::casing {
+      line-width: 1;
+      line-color: mix(@track-casing, @track-fill, 50%);
+      line-join: round;
 
-    [tunnel = 'yes'][zoom >= 16] {
-      line-color: lighten(#707070, 20%);
+      [tunnel = 'yes'][zoom >= 16] {
+        line-color: lighten(#707070, 20%);
+      }
+      [zoom >= 16] { 
+        line-color: @track-casing;
+        line-width: 2.5;
+      }
+      [zoom >= 17] { line-width: 4; }
+      [zoom >= 18] { line-width: 6; }
+      [zoom >= 19] { line-width: 8; }
+      [zoom >= 20] { line-width: 12; }
     }
-    [zoom >= 16] { 
-      line-color: @track-casing;
-      line-width: 2.5;
-    }
-    [zoom >= 17] { line-width: 4; }
-    [zoom >= 18] { line-width: 6; }
-    [zoom >= 19] { line-width: 8; }
-    [zoom >= 20] { line-width: 12; }
-  }
 
-  ::fill[zoom >= 16] {
-    line-width: 1.25;
-    line-color: @track-fill;
-    line-join: round;
-    line-dasharray: 2.5,0.5;
+    ::fill[zoom >= 16] {
+      line-width: 1.25;
+      line-color: @track-fill;
+      line-join: round;
+      line-dasharray: 2.5,0.5;
 
-    [tunnel = 'yes'] {
-      line-color: lighten(@track-fill, 5%);
-    }
-    [zoom >= 17] {
-      line-width: 2;
-      line-dasharray: 4,0.8;
-    }
-    [zoom >= 18] {
-      line-width: 3;
-      line-dasharray: 6,1.2;
-    }
-    [zoom >= 19] {
-      line-width: 4;
-      line-dasharray: 8,1.6;
-    }
-    [zoom >= 20] {
-      line-width: 6;
-      line-dasharray: 12,2.4;
+      [tunnel = 'yes'] {
+        line-color: lighten(@track-fill, 5%);
+      }
+      [zoom >= 17] {
+        line-width: 2;
+        line-dasharray: 4,0.8;
+      }
+      [zoom >= 18] {
+        line-width: 3;
+        line-dasharray: 6,1.2;
+      }
+      [zoom >= 19] {
+        line-width: 4;
+        line-dasharray: 8,1.6;
+      }
+      [zoom >= 20] {
+        line-width: 6;
+        line-dasharray: 12,2.4;
+      }
     }
   }
 }