Merge branch 'main' into zlw-move-shield-helpers

osm-americana · Sep 19, 2023 · 3094060 · 3094060
2 parents bfc27cd + de40a62
commit 3094060
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/icons/shield_badge_crossbar_2.svg b/icons/shield_badge_crossbar_2.svg
diff --git a/icons/shield_badge_crossbar_3.svg b/icons/shield_badge_crossbar_3.svg
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -78,6 +78,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"] = {
@@ -492,11 +503,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"] = {

diff --git 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"]]]],
   ],
 };