From cd4c9e66e4ef432bc3865c22156080f9388579f4 Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 26 Nov 2024 06:11:35 -0500 Subject: [PATCH 1/4] Add Bolivia national shields --- doc-img/shield_map_world.svg | 1 + src/js/shield_defs.js | 1 + 2 files changed, 2 insertions(+) diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg index 1a8d20598..7402f7dc3 100644 --- a/doc-img/shield_map_world.svg +++ b/doc-img/shield_map_world.svg @@ -118,6 +118,7 @@ See the end of this file for a list of available jurisdictions and their codes. .ht, .mx, .us, +.bo, .cl, .co, .uy, diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js index 06df44179..5a4bf1ba1 100644 --- a/src/js/shield_defs.js +++ b/src/js/shield_defs.js @@ -670,6 +670,7 @@ export function loadShields() { shields["US:I:Business:Spur"] = shields["US:I:Business:Loop"]; shields["US:I:Downtown:Loop"] = shields["US:I:Business:Loop"]; shields["US:I:Downtown:Spur"] = shields["US:I:Business:Spur"]; + shields["BO:fundamental"] = shields["US:I:Business:Loop"]; // US Highways shields["US:US"] = { From c2e0f8e94b0567b2b1710be710d2ed4446aad564 Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 30 Nov 2024 17:18:35 -0500 Subject: [PATCH 2/4] Switching to colored generic route shield for Bolivia routes --- src/js/shield_defs.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js index 5a4bf1ba1..e1876185a 100644 --- a/src/js/shield_defs.js +++ b/src/js/shield_defs.js @@ -670,7 +670,6 @@ export function loadShields() { shields["US:I:Business:Spur"] = shields["US:I:Business:Loop"]; shields["US:I:Downtown:Loop"] = shields["US:I:Business:Loop"]; shields["US:I:Downtown:Spur"] = shields["US:I:Business:Spur"]; - shields["BO:fundamental"] = shields["US:I:Business:Loop"]; // US Highways shields["US:US"] = { @@ -3143,6 +3142,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, From a819327a4fb615599cff11e9ba45da4c5df5c5cb Mon Sep 17 00:00:00 2001 From: Zeke Farwell Date: Sat, 30 Nov 2024 22:09:12 -0500 Subject: [PATCH 3/4] add support for place=province equivalent to place=state --- src/layer/place.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer/place.js b/src/layer/place.js index 0abda0ef0..db25eef24 100644 --- 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": { From e1cb59cb100b549bd4d1f639c8e707e2b3bbd333 Mon Sep 17 00:00:00 2001 From: Clay Smalley Date: Mon, 2 Dec 2024 18:00:57 -0500 Subject: [PATCH 4/4] Add shields for Arapahoe and Jefferson Counties, Colorado Fixes #1175. [Arapahoe County](https://www.bing.com/maps?cp=39.594441%7E-104.796679&lvl=19.3&mo=om.1&pi=1.9&style=x&dir=31.7) and [Jefferson County](https://www.bing.com/maps?cp=39.655983%7E-105.191436&lvl=22.0&pi=-1.6&style=x&dir=34.6) both have at least one route signed with a blue pentagon shield. --- src/js/shield_defs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js index e1876185a..5b2612dc1 100644 --- a/src/js/shield_defs.js +++ b/src/js/shield_defs.js @@ -1055,12 +1055,14 @@ export function loadShields() { }, }; [ + "Arapahoe", "Archuleta", "Chaffee", "Conejos", "Grand", "Gunnison", "Jackson", + "Jefferson", "Lake", "La_Plata", "Larimer",