Merge branch 'main' into zlw-banner-fix

osm-americana · Dec 5, 2024 · 40c53c7 · 40c53c7
2 parents 24e5cf4 + c4f03be
commit 40c53c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -1058,12 +1058,14 @@ export function loadShields() {
     },
   };
   [
+    "Arapahoe",
     "Archuleta",
     "Chaffee",
     "Conejos",
     "Grand",
     "Gunnison",
     "Jackson",
+    "Jefferson",
     "Lake",
     "La_Plata",
     "Larimer",
@@ -3153,6 +3155,14 @@ export function loadShields() {
     },
   };
 
+  // Bolivia
+  shields["BO:fundamental"] = {
+    ...badgeShieldCrossbar,
+    colorDarken: Color.shields.green,
+    colorLighten: Color.shields.white,
+    textColor: Color.shields.white,
+  };
+
   // Uruguay
   shields["UY"] = homePlateDownShield(
     5,

diff --git a/src/layer/place.js b/src/layer/place.js
@@ -394,7 +394,7 @@ export const state = {
     ],
     "text-halo-blur": labelHaloBlur,
   },
-  filter: ["==", ["get", "class"], "state"],
+  filter: ["in", ["get", "class"], ["literal", ["state", "province"]]],
   layout: {
     "text-font": ["Americana-Regular"],
     "text-size": {