Merge branch 'main' into 1ec5-road-rebuild

osm-americana · Nov 30, 2023 · 76c8190 · 76c8190
2 parents 6868d35 + c5c4f05
commit 76c8190
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 44 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "tokenfield": "^1.5.2"
   },
   "devDependencies": {
-    "@basemaps/sprites": "^6.41.0",
+    "@basemaps/sprites": "^7.0.0",
     "@mapbox/vector-tile": "^1.3.1",
     "@maplibre/maplibre-gl-style-spec": "^17.0.1",
     "@playwright/test": "^1.38.1",

diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -2490,6 +2490,11 @@ export function loadShields() {
     ["ALT"],
     Color.shields.green
   );
+  shields["US:VT:Truck"] = banneredShield(
+    shields["US:VT"],
+    ["TRK"],
+    Color.shields.green
+  );
 
   // Vermont routes town maintained sections - black and white ovals
   shields["US:VT:Town"] = ovalShield(Color.shields.white, Color.shields.black);

diff --git a/src/layer/road_label.js b/src/layer/road_label.js
@@ -157,7 +157,7 @@ export const bridgeSpacer = {
   layout: {
     "symbol-placement": "line",
     "symbol-spacing": 2,
-    "icon-image": "dot_city",
+    "icon-image": "place_dot",
     "icon-allow-overlap": true,
     "icon-size": 0.1,
   },

diff --git a/src/layer/transportation_label.js b/src/layer/transportation_label.js
@@ -184,7 +184,7 @@ export const bridgeSpacer = {
   layout: {
     "symbol-placement": "line",
     "symbol-spacing": 2,
-    "icon-image": "dot_city",
+    "icon-image": "place_dot",
     "icon-allow-overlap": true,
     "icon-size": 0.1,
   },

diff --git a/src/shieldtest.js b/src/shieldtest.js
@@ -214,6 +214,7 @@ let networks = [
   "US:LA:Business",
   "US:MD:Business",
   "US:VT:Alternate",
+  "US:VT:Truck",
   "US:MO:Spur",
   "US:NC:Bypass",
   "US:ND:Alternate",