From ebdf6431f73f159759886cf1cf58441c7b04abc7 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sat, 2 Feb 2019 15:32:36 -0500
Subject: [PATCH] Support classing of aerialway and piste, and adjust line
 widths (closes #5843)

---
 css/50_misc.css            | 118 ++++++++++++++++++++++---------------
 modules/svg/tag_classes.js |   8 ++-
 2 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/css/50_misc.css b/css/50_misc.css
index a8dcd4c95..265d641bb 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -1,4 +1,56 @@
 
+/* narrow width miscellanous things */
+path.line.shadow.tag-aerialway,
+path.line.shadow.tag-attraction-summer_toboggan,
+path.line.shadow.tag-attraction-water_slide,
+path.line.shadow.tag-man_made-pipeline,
+path.line.shadow.tag-natural-tree_row,
+path.line.shadow.tag-piste {
+    stroke-width: 16;
+}
+path.line.casing.tag-aerialway,
+path.line.casing.tag-attraction-summer_toboggan,
+path.line.casing.tag-attraction-water_slide,
+path.line.casing.tag-man_made-pipeline,
+path.line.casing.tag-natural-tree_row,
+path.line.casing.tag-piste {
+    stroke-width: 7;
+}
+path.line.stroke.tag-aerialway,
+path.line.stroke.tag-attraction-summer_toboggan,
+path.line.stroke.tag-attraction-water_slide,
+path.line.stroke.tag-man_made-pipeline,
+path.line.stroke.tag-natural-tree_row,
+path.line.stroke.tag-piste {
+    stroke-width: 5;
+}
+
+.low-zoom path.line.shadow.tag-aerialway,
+.low-zoom path.line.shadow.tag-attraction-summer_toboggan,
+.low-zoom path.line.shadow.tag-attraction-water_slide,
+.low-zoom path.line.shadow.tag-man_made-pipeline,
+.low-zoom path.line.shadow.tag-natural-tree_row,
+.low-zoom path.line.shadow.tag-piste {
+    stroke-width: 12;
+}
+.low-zoom path.line.casing.tag-aerialway,
+.low-zoom path.line.casing.tag-attraction-summer_toboggan,
+.low-zoom path.line.casing.tag-attraction-water_slide,
+.low-zoom path.line.casing.tag-man_made-pipeline,
+.low-zoom path.line.casing.tag-natural-tree_row,
+.low-zoom path.line.casing.tag-piste {
+    stroke-width: 5;
+}
+.low-zoom path.line.stroke.tag-aerialway,
+.low-zoom path.line.stroke.tag-attraction-summer_toboggan,
+.low-zoom path.line.stroke.tag-attraction-water_slide,
+.low-zoom path.line.stroke.tag-man_made-pipeline,
+.low-zoom path.line.stroke.tag-natural-tree_row,
+.low-zoom path.line.stroke.tag-piste {
+    stroke-width: 3;
+}
+
+
 /* ferry routes  */
 .preset-icon .icon.tag-route-ferry {
     color: #58a9ed;
@@ -24,6 +76,22 @@ path.line.stroke.tag-route-ferry {
 }
 
 
+/* aerialways */
+path.line.stroke.tag-aerialway {
+    stroke: #c55;
+}
+path.line.casing.tag-aerialway {
+    stroke: #444;
+}
+
+/* pistes */
+path.line.stroke.tag-piste {
+    stroke: #9ac;
+}
+path.line.casing.tag-piste {
+    stroke: #444;
+}
+
 /* power and pipeline */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
@@ -31,6 +99,7 @@ path.line.stroke.tag-route-ferry {
     fill: #939393;
 }
 
+
 /* power */
 path.line.stroke.tag-power {
     stroke: #939393;
@@ -40,21 +109,21 @@ path.line.casing.tag-power {
     stroke: none;
 }
 
+
 /* pipeline */
 path.line.stroke.tag-man_made-pipeline {
     stroke: #cbd0d8;
     stroke-linecap: butt;
-    stroke-width: 3;
     stroke-dasharray: 80, 1.25;
 }
 path.line.casing.tag-man_made-pipeline {
     stroke: #666;
-    stroke-width: 4.5;
 }
 .low-zoom path.line.stroke.tag-man_made-pipeline {
     stroke-dasharray: 40, 1;
 }
 
+
 /* boundaries */
 path.line.stroke.tag-boundary {
     stroke: #fff;
@@ -73,27 +142,6 @@ path.line.casing.tag-boundary-national_park {
 }
 
 
-/* Tree Rows */
-path.line.shadow.tag-natural-tree_row {
-    stroke-width: 16;
-}
-path.line.casing.tag-natural-tree_row {
-    stroke-width: 7;
-}
-path.line.stroke.tag-natural-tree_row {
-    stroke-width: 5;
-}
-.low-zoom path.line.shadow.tag-natural-tree_row {
-    stroke-width: 12;
-}
-.low-zoom path.line.casing.tag-natural-tree_row {
-    stroke-width: 5;
-}
-.low-zoom path.line.stroke.tag-natural-tree_row {
-    stroke-width: 3;
-}
-
-
 /* barriers and similar */
 path.line.stroke.tag-barrier {
     stroke: #ddd;
@@ -416,30 +464,6 @@ path.line.stroke.tag-crossing.tag-crossing-zebra {
 }
 
 /* Attractions */
-path.line.shadow.tag-attraction-summer_toboggan,
-path.line.shadow.tag-attraction-water_slide {
-	stroke-width: 16;
-}
-path.line.casing.tag-attraction-summer_toboggan,
-path.line.casing.tag-attraction-water_slide {
-	stroke-width: 7;
-}
-path.line.stroke.tag-attraction-summer_toboggan,
-path.line.stroke.tag-attraction-water_slide {
-	stroke-width: 5;
-}
-.low-zoom path.line.shadow.tag-attraction-summer_toboggan,
-.low-zoom path.line.shadow.tag-attraction-water_slide {
-    stroke-width: 12;
-}
-.low-zoom path.line.casing.tag-attraction-summer_toboggan,
-.low-zoom path.line.casing.tag-attraction-water_slide {
-    stroke-width: 5;
-}
-.low-zoom path.line.stroke.tag-attraction-summer_toboggan,
-.low-zoom path.line.stroke.tag-attraction-water_slide {
-	stroke-width: 3;
-}
 path.line.stroke.tag-attraction-summer_toboggan {
     stroke: #9e9e9e;
 }
diff --git a/modules/svg/tag_classes.js b/modules/svg/tag_classes.js
index 8d4a195cd..0e0a08479 100644
--- a/modules/svg/tag_classes.js
+++ b/modules/svg/tag_classes.js
@@ -4,8 +4,8 @@ import { osmPavedTags } from '../osm/tags';
 
 export function svgTagClasses() {
     var primaries = [
-        'building', 'highway', 'railway', 'waterway', 'aeroway',
-        'motorway', 'boundary', 'power', 'amenity', 'natural', 'landuse',
+        'building', 'highway', 'railway', 'waterway', 'aeroway', 'aerialway',
+        'piste:type', 'boundary', 'power', 'amenity', 'natural', 'landuse',
         'leisure', 'military', 'place', 'man_made', 'route', 'attraction'
     ];
     var statuses = [
@@ -59,6 +59,10 @@ export function svgTagClasses() {
                 v = t[k];
                 if (!v || v === 'no') continue;
 
+                if (k === 'piste:type') {  // avoid a ':' in the class name
+                    k = 'piste';
+                }
+
                 primary = k;
                 if (statuses.indexOf(v) !== -1) {   // e.g. `railway=abandoned`
                     status = v;