From 6510713cee33669c1dfb0693e1886362f26c8c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Sun, 17 Sep 2023 01:51:17 -0700
Subject: [PATCH 1/2] Add vintage U.S. Route shield for historic routes (#922)

* Added vintage U.S. Route shield for historic routes

* Added banner to Historic U.S. Route shield

* Generalize badge shield with crossbar
---
 icons/shield_badge_crossbar_2.svg |  4 ++++
 icons/shield_badge_crossbar_3.svg |  4 ++++
 src/js/shield_defs.js             | 24 +++++++++++++++++++-----
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 icons/shield_badge_crossbar_2.svg
 create mode 100644 icons/shield_badge_crossbar_3.svg

diff --git a/icons/shield_badge_crossbar_2.svg b/icons/shield_badge_crossbar_2.svg
new file mode 100644
index 000000000..be80b8769
--- /dev/null
+++ b/icons/shield_badge_crossbar_2.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 9.9997048,0.50008871 C 10.771647,1.1577175 11.772514,1.5546812 12.866059,1.5546812 c 1.093546,0 2.094423,-0.3970141 2.866355,-1.05469344 L 19.499609,4.2672259 C 18.806353,5.2526295 18.3993,6.454039 18.3993,7.7503995 c 0,0.9324568 0.210533,1.8156313 0.586706,2.6047335 0.325025,0.682209 0.513573,1.459591 0.513573,2.265654 0,2.894753 -2.346585,5.241263 -5.241205,5.241263 h -0.822667 c -1.387197,0 -2.625094,0.638651 -3.4359921,1.637965 C 9.1889085,18.500721 7.9509199,17.86205 6.5637234,17.86205 H 5.7410559 c -2.8947204,0 -5.24120446,-2.346611 -5.24120446,-5.241263 0,-0.806023 0.18856666,-1.583455 0.51362206,-2.265654 0.3761441,-0.7891122 0.5867068,-1.6722866 0.5867068,-2.6047335 0,-1.2963605 -0.4070839,-2.4977296 -1.10030867,-3.4831736 L 4.2670662,0.49998776 C 5.0390084,1.1576166 6.0398754,1.5546812 7.1334208,1.5546812 c 1.0935453,0 2.0944224,-0.3969132 2.8663546,-1.05459249 z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.864" stroke-width="1.178" style="stroke:#000;stroke-width:1;stroke-miterlimit:3.864;stroke-dasharray:none;stroke-opacity:1"/>
+ <path style="fill:none;stroke:#000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none" d="M 1.1685971,5.5 H 18.830863"/>
+</svg>
diff --git a/icons/shield_badge_crossbar_3.svg b/icons/shield_badge_crossbar_3.svg
new file mode 100644
index 000000000..5cdda03ce
--- /dev/null
+++ b/icons/shield_badge_crossbar_3.svg
@@ -0,0 +1,4 @@
+<svg width="25" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 12.499997,0.50008973 C 11.305653,1.2359789 9.8977891,1.6606637 8.3904732,1.6606637 c -1.5073159,0 -2.915282,-0.4247779 -4.1095233,-1.16067746 L 0.5001393,4.2672462 c 0.6957551,0.9854115 1.1042952,2.1867101 1.1042952,3.483171 0,0.9355795 -0.2127538,1.8216892 -0.5926746,2.6127908 -0.32794619,0.683626 -0.51156948,1.449218 -0.51156948,2.2575 0,2.894812 2.35505968,5.241419 5.26032488,5.241419 h 3.2914208 c 1.3921229,0 2.6345059,0.638606 3.4482139,1.637885 0.813708,-0.999279 2.056091,-1.637885 3.448214,-1.637885 h 3.291421 c 2.905162,0 5.260324,-2.346607 5.260324,-5.241419 0,-0.808282 -0.183613,-1.573926 -0.511569,-2.2575 -0.379941,-0.7911016 -0.592674,-1.6772113 -0.592674,-2.6127908 0,-1.2964609 0.408488,-2.4978111 1.104295,-3.483171 L 20.71935,0.49998624 C 19.525006,1.2358754 18.117143,1.6606637 16.609826,1.6606637 c -1.507418,0 -2.915281,-0.4247158 -4.109523,-1.16057397 z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width="1.159" style="stroke:#000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+ <path style="fill:none;stroke:#000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" d="M 1.1713048,5.5 H 23.828964"/>
+</svg>
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index ef9d929a1..e4534a85b 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -767,6 +767,17 @@ export function loadShields() {
     },
   };
 
+  let badgeShieldCrossbar = {
+    spriteBlank: ["shield_badge_crossbar_2", "shield_badge_crossbar_3"],
+    textColor: Color.shields.black,
+    padding: {
+      left: 1,
+      right: 1,
+      top: 6,
+      bottom: 4,
+    },
+  };
+
   // Default
 
   shields["default"] = {
@@ -1181,11 +1192,14 @@ export function loadShields() {
     "BUS",
   ]);
 
-  shields["US:US:Historic"] = {
-    ...badgeShield,
-    textColor: Color.shields.brown,
-    colorLighten: Color.shields.brown,
-  };
+  shields["US:US:Historic"] = banneredShield(
+    {
+      ...badgeShieldCrossbar,
+      textColor: Color.shields.brown,
+      colorLighten: Color.shields.brown,
+    },
+    ["HIST"]
+  );
 
   // Federal Agencies
   shields["US:BIA"] = {

From e0519596901655838f2e72a5ed57628069295a63 Mon Sep 17 00:00:00 2001
From: Daniel Schep <dschep@gmail.com>
Date: Sun, 17 Sep 2023 12:42:35 -0400
Subject: [PATCH 2/2] Don't render one-way arrows on highway features that
 aren't rendered

---
 src/layer/oneway.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layer/oneway.js b/src/layer/oneway.js
index 47253b9c6..e8f50eb06 100644
--- a/src/layer/oneway.js
+++ b/src/layer/oneway.js
@@ -10,6 +10,7 @@ export const surface = {
     ["==", ["get", "oneway"], 1],
     ["!=", ["get", "ramp"], 1],
     ["!", ["in", ["get", "brunnel"], ["literal", ["bridge", "tunnel"]]]],
+    ["!", ["in", ["get", "class"], ["literal", ["path", "track"]]]],
   ],
   source: "openmaptiles",
   "source-layer": "transportation",
@@ -73,6 +74,7 @@ export const tunnel = {
     ["==", ["get", "oneway"], 1],
     ["!=", ["get", "ramp"], 1],
     ["==", ["get", "brunnel"], "tunnel"],
+    ["!", ["in", ["get", "class"], ["literal", ["path", "track"]]]],
   ],
   paint: {
     "icon-opacity": 0.2,
@@ -87,5 +89,6 @@ export const bridge = {
     ["==", ["get", "oneway"], 1],
     ["!=", ["get", "ramp"], 1],
     ["==", ["get", "brunnel"], "bridge"],
+    ["!", ["in", ["get", "class"], ["literal", ["path", "track"]]]],
   ],
 };