From 1bcc156ac3e0345b1579e86fcf192f1073731fe4 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 13 Mar 2019 11:50:01 -0400
Subject: [PATCH] Deprecate crossing=zebra Style crossing=unmarked differently
 from other crossings Style piers and transit platforms with a highway tag
 differently from those without

---
 css/30_highways.css  | 70 ++++++++++++++++++++++++++++++---
 css/50_misc.css      | 93 +++++---------------------------------------
 data/deprecated.json |  4 ++
 3 files changed, 78 insertions(+), 89 deletions(-)

diff --git a/css/30_highways.css b/css/30_highways.css
index 0eea4ed66..6fd91732b 100644
--- a/css/30_highways.css
+++ b/css/30_highways.css
@@ -244,6 +244,7 @@ path.line.stroke.tag-highway-road {
 
 path.line.shadow.tag-highway-path,
 path.line.shadow.tag-highway-footway,
+path.line.shadow.tag-highway-bus_stop,
 path.line.shadow.tag-highway-cycleway,
 path.line.shadow.tag-highway-bridleway,
 path.line.shadow.tag-highway-corridor,
@@ -253,6 +254,7 @@ path.line.shadow.tag-highway-steps {
 }
 path.line.casing.tag-highway-path,
 path.line.casing.tag-highway-footway,
+path.line.casing.tag-highway-bus_stop,
 path.line.casing.tag-highway-cycleway,
 path.line.casing.tag-highway-bridleway,
 path.line.casing.tag-highway-corridor,
@@ -262,6 +264,7 @@ path.line.casing.tag-highway-steps {
 }
 path.line.stroke.tag-highway-path,
 path.line.stroke.tag-highway-footway,
+path.line.stroke.tag-highway-bus_stop,
 path.line.stroke.tag-highway-cycleway,
 path.line.stroke.tag-highway-bridleway,
 path.line.stroke.tag-highway-corridor,
@@ -294,6 +297,7 @@ path.line.stroke.tag-highway-steps {
 
 .low-zoom path.line.shadow.tag-highway-path,
 .low-zoom path.line.shadow.tag-highway-footway,
+.low-zoom path.line.shadow.tag-highway-bus_stop,
 .low-zoom path.line.shadow.tag-highway-cycleway,
 .low-zoom path.line.shadow.tag-highway-bridleway,
 .low-zoom path.line.shadow.tag-highway-corridor,
@@ -303,6 +307,7 @@ path.line.stroke.tag-highway-steps {
 }
 .low-zoom path.line.casing.tag-highway-path,
 .low-zoom path.line.casing.tag-highway-footway,
+.low-zoom path.line.casing.tag-highway-bus_stop,
 .low-zoom path.line.casing.tag-highway-cycleway,
 .low-zoom path.line.casing.tag-highway-bridleway,
 .low-zoom path.line.casing.tag-highway-corridor,
@@ -312,6 +317,7 @@ path.line.stroke.tag-highway-steps {
 }
 .low-zoom path.line.stroke.tag-highway-path,
 .low-zoom path.line.stroke.tag-highway-footway,
+.low-zoom path.line.stroke.tag-highway-bus_stop,
 .low-zoom path.line.stroke.tag-highway-cycleway,
 .low-zoom path.line.stroke.tag-highway-bridleway,
 .low-zoom path.line.stroke.tag-highway-corridor,
@@ -320,7 +326,7 @@ path.line.stroke.tag-highway-steps {
     stroke-width: 1;
 }
 
-
+/* living streets */
 .preset-icon .icon.tag-highway-living-street {
     color: #bbb;
     fill: #ddd;
@@ -334,6 +340,7 @@ path.line.casing.tag-living_street {
     stroke: #fff;
 }
 
+/* pedestrian streets and corridors */
 .preset-icon .icon.tag-highway-corridor,
 .preset-icon .icon.tag-highway-pedestrian {
     color: #8cd05f;
@@ -365,6 +372,7 @@ path.line.casing.tag-pedestrian.tag-unpaved {
     stroke-dasharray: none;
 }
 
+/* unknown roads */
 .preset-icon .icon.tag-highway-road {
     color: #9e9e9e;
     fill: #666;
@@ -378,6 +386,7 @@ path.line.casing.tag-road {
     stroke: #666;
 }
 
+/* service roads */
 .preset-icon .icon.tag-highway-service {
     color: #fff;
     fill: #666;
@@ -409,6 +418,7 @@ path.line.casing.tag-service.tag-service {
     stroke: #666;
 }
 
+/* unmaintained track roads */
 .preset-icon .icon.tag-highway-track {
     color: #eaeaea;
     fill: #c5b59f;
@@ -422,8 +432,10 @@ path.line.casing.tag-track {
     stroke: #746f6f;
 }
 
+/* paths */
 path.line.stroke.tag-highway-path,
 path.line.stroke.tag-highway-footway,
+path.line.stroke.tag-highway-bus_stop,
 path.line.stroke.tag-highway-cycleway,
 path.line.stroke.tag-highway-bridleway {
     stroke-linecap: butt;
@@ -431,14 +443,27 @@ path.line.stroke.tag-highway-bridleway {
 }
 .low-zoom path.line.stroke.tag-highway-path,
 .low-zoom path.line.stroke.tag-highway-footway,
+.low-zoom path.line.stroke.tag-highway-bus_stop,
 .low-zoom path.line.stroke.tag-highway-cycleway,
 .low-zoom path.line.stroke.tag-highway-bridleway {
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
 
+path.line.stroke.tag-crossing,
+path.line.stroke.tag-highway-bus_stop,
+path.line.stroke.tag-public_transport-platform,
+path.line.stroke.tag-railway-platform,
+path.line.stroke.tag-man_made-pier {
+    stroke: #dca;
+}
+
 path.line.casing.tag-highway-path,
-path.line.casing.tag-highway-path.tag-unpaved {
+path.line.casing.tag-highway-path.tag-unpaved,
+path.line.casing.tag-highway-bus_stop,
+path.line.casing.tag-highway-footway.tag-public_transport-platform,
+path.line.casing.tag-highway-footway.tag-man_made-pier,
+path.line.casing.tag-highway-footway.tag-footway-crossing {
     stroke: #dca;
     stroke-linecap: round;
     stroke-dasharray: none;
@@ -455,14 +480,20 @@ path.line.casing.tag-highway-bridleway.tag-unpaved {
 }
 
 .preset-icon .icon.iD-category-path,
-.preset-icon .icon.tag-highway-path {
+.preset-icon .icon.tag-highway-path,
+.preset-icon .icon.tag-highway-footway.tag-public_transport-platform,
+.preset-icon .icon.tag-highway-footway.tag-man_made-pier,
+.preset-icon .icon.tag-highway-bus_stop,
+.preset-icon .icon.tag-footway.tag-footway-crossing {
     color: #988;
     fill: #dca;
 }
-path.line.stroke.tag-highway-path {
+path.line.stroke.tag-highway-path,
+path.line.stroke.tag-highway-bus_stop {
     stroke: #988;
 }
 
+/* footways */
 .preset-icon .icon.tag-route-foot,
 .preset-icon .icon.tag-route-hiking,
 .preset-icon .icon.tag-highway-footway {
@@ -470,13 +501,15 @@ path.line.stroke.tag-highway-path {
     fill: #fff;
 }
 path.line.stroke.tag-highway-footway,
+path.line.stroke.tag-highway_bus_stop,
 .preset-icon-line path.casing.tag-highway-footway {
     stroke: #988;
 }
-.preset-icon-line path.stroke.tag-highway-footway {
+.preset-icon-line path.stroke.tag-highway-footway:not(.tag-footway-crossing, .tag-man_made-pier, .tag-public_transport-platform) {
     stroke: #fff;
 }
 
+/* cycleways */
 .preset-icon .icon.tag-route-bicycle,
 .preset-icon .icon.tag-highway-cycleway {
     color: #58a9ed;
@@ -490,6 +523,7 @@ path.line.stroke.tag-highway-cycleway,
     stroke: #fff;
 }
 
+/* bridleways */
 .preset-icon .icon.tag-route-horse,
 .preset-icon .icon.tag-highway-bridleway {
     color: #e06d5f;
@@ -503,6 +537,7 @@ path.line.stroke.tag-highway-bridleway,
     stroke: #fff;
 }
 
+/* racetracks */
 .preset-icon .icon.tag-leisure-track {
     color: rgb(229, 184, 43);
 }
@@ -514,6 +549,7 @@ path.line.stroke.tag-leisure-track,
     stroke: #fff;
 }
 
+/* steps */
 .preset-icon .icon.tag-highway-steps {
     color: #81d25c;
     fill: #fff;
@@ -539,6 +575,30 @@ path.line.stroke.tag-highway-steps,
     stroke: #fff;
 }
 
+
+/* crossings */
+path.line.stroke.tag-highway-footway.tag-crossing-marked,
+path.line.stroke.tag-highway-footway.tag-crossing-unmarked {
+    stroke-dasharray: 6, 4;
+}
+.low-zoom path.line.stroke.tag-highway-footway.tag-crossing-marked,
+.low-zoom path.line.stroke.tag-highway-footway.tag-crossing-unmarked {
+    stroke-dasharray: 3, 2;
+}
+.preset-icon .icon.tag-highway-footway.tag-crossing-marked {
+    color: #444;
+}
+path.line.stroke.tag-highway-footway.tag-crossing-marked {
+    stroke: #444;
+}
+.preset-icon .icon.tag-highway-footway.tag-crossing-unmarked {
+    color: #888;
+}
+path.line.stroke.tag-highway-footway.tag-crossing-unmarked {
+    stroke: #888;
+}
+
+
 /* highway midpoints */
 g.midpoint.tag-highway-corridor .fill,
 g.midpoint.tag-highway-pedestrian .fill,
diff --git a/css/50_misc.css b/css/50_misc.css
index 067e1b3db..5e21e5681 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -414,120 +414,45 @@ path.fill.tag-building {
     stroke: rgba(224, 110, 95, 0.3);
     fill: rgba(224, 110, 95, 0.3);
 }
-.preset-icon-fill-area.tag-parking-multi-storey,
-.preset-icon-fill-area.tag-building {
-    border-color: rgb(224, 110, 95);
-    background-color: rgba(224, 110, 95, 0.3);
-}
 
 
-/* "Special" paths - platforms, piers, crossings */
-.preset-icon .icon.tag-golf-path,
-.preset-icon .icon.tag-public_transport-platform,
-.preset-icon .icon.tag-railway-platform,
-.preset-icon .icon.tag-man_made-pier,
-.preset-icon .icon.tag-footway.tag-footway-crossing,
-.preset-icon .icon.tag-crossing {
+/* "Special" paths - highways that aren't highways */
+.preset-icon .icon.tag-golf-path {
     color: #988;
     fill: #dca;
 }
 
-.preset-icon-fill-area.tag-golf-path,
-.preset-icon-fill-area.tag-public_transport-platform,
-.preset-icon-fill-area.tag-railway-platform,
-.preset-icon-fill-area.tag-man_made-pier,
-.preset-icon-fill-area.tag-footway.tag-footway-crossing,
-.preset-icon-fill-area.tag-crossing {
-    border-color: #988;
-    background-color: #dca;
-}
-
-path.line.shadow.tag-golf-path,
-path.line.shadow.tag-public_transport-platform,
-path.line.shadow.tag-railway-platform,
-path.line.shadow.tag-man_made-pier,
-path.line.shadow.tag-footway.tag-footway-crossing,
-path.line.shadow.tag-crossing {
+path.line.shadow.tag-golf-path {
     stroke-width: 16;
 }
-path.line.casing.tag-golf-path,
-path.line.casing.tag-public_transport-platform,
-path.line.casing.tag-railway-platform,
-path.line.casing.tag-man_made-pier,
-path.line.casing.tag-footway.tag-footway-crossing,
-path.line.casing.tag-crossing {
+path.line.casing.tag-golf-path {
     stroke: #dca;
     stroke-width: 5;
     stroke-linecap: round;
     stroke-dasharray: none;
 }
-path.line.stroke.tag-golf-path,
-path.line.stroke.tag-public_transport-platform,
-path.line.stroke.tag-railway-platform,
-path.line.stroke.tag-man_made-pier,
-path.line.stroke.tag-footway.tag-footway-crossing,
-path.line.stroke.tag-crossing {
+path.line.stroke.tag-golf-path {
     stroke: #988;
     stroke-width: 3;
     stroke-linecap: butt;
     stroke-dasharray: 6, 6;
 }
 
-.low-zoom path.line.shadow.tag-golf-path,
-.low-zoom path.line.shadow.tag-public_transport-platform,
-.low-zoom path.line.shadow.tag-railway-platform,
-.low-zoom path.line.shadow.tag-man_made-pier,
-.low-zoom path.line.shadow.tag-footway.tag-footway-crossing,
-.low-zoom path.line.shadow.tag-crossing {
+.low-zoom path.line.shadow.tag-golf-path {
     stroke-width: 12;
 }
-.low-zoom path.line.casing.tag-golf-path,
-.low-zoom path.line.casing.tag-public_transport-platform,
-.low-zoom path.line.casing.tag-railway-platform,
-.low-zoom path.line.casing.tag-man_made-pier,
-.low-zoom path.line.casing.tag-footway.tag-footway-crossing,
-.low-zoom path.line.casing.tag-crossing {
+.low-zoom path.line.casing.tag-golf-path {
     stroke-width: 3;
 }
-.low-zoom path.line.stroke.tag-golf-path,
-.low-zoom path.line.stroke.tag-public_transport-platform,
-.low-zoom path.line.stroke.tag-railway-platform,
-.low-zoom path.line.stroke.tag-man_made-pier,
-.low-zoom path.line.stroke.tag-footway.tag-footway-crossing,
-.low-zoom path.line.stroke.tag-crossing {
+.low-zoom path.line.stroke.tag-golf-path {
     stroke-width: 1;
     stroke-linecap: butt;
     stroke-dasharray: 3, 3;
 }
 
-g.midpoint.tag-golf-path .fill,
-g.midpoint.tag-public_transport-platform .fill,
-g.midpoint.tag-railway-platform .fill,
-g.midpoint.tag-man_made-pier .fill,
-g.midpoint.tag-footway.tag-footway-crossing .fill,
-g.midpoint.tag-crossing .fill {
+g.midpoint.tag-golf-path .fill {
     fill: #fff;
     stroke: #333;
     stroke-opacity: .8;
     opacity: .8;
 }
-
-/* marked crossings, zebras */
-.preset-icon .icon.tag-crossing.tag-crossing-marked,
-.preset-icon .icon.tag-crossing.tag-crossing-zebra {
-    color: #444;
-    fill: #dca;
-}
-path.line.casing.tag-crossing.tag-crossing-marked,
-path.line.casing.tag-crossing.tag-crossing-zebra {
-    stroke: #dca;
-}
-path.line.stroke.tag-crossing.tag-crossing-marked,
-path.line.stroke.tag-crossing.tag-crossing-zebra {
-    stroke: #444;
-    stroke-dasharray: 6, 4;
-}
-.low-zoom path.line.stroke.tag-crossing.tag-crossing-marked,
-.low-zoom path.line.stroke.tag-crossing.tag-crossing-zebra {
-    stroke-dasharray: 3, 2;
-}
diff --git a/data/deprecated.json b/data/deprecated.json
index 1f1eb093a..303398aeb 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -116,6 +116,10 @@
       "old": {"craft": "optician"},
       "replace": {"shop": "optician"}
     },
+    {
+      "old": {"crossing": "zebra"},
+      "replace": {"crossing": "marked"}
+    },
     {
       "old": {"cuisine": "gluten-free"},
       "replace": {"diet:gluten_free": "yes"}