diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
index fbcd5073f..5de99353d 100644
--- a/doc-img/shield_map_world.svg
+++ b/doc-img/shield_map_world.svg
@@ -164,6 +164,7 @@ See the end of this file for a list of available jurisdictions and their codes.
.lv,
.me,
.nl,
+.aw,
.pl,
.pt,
.ro,
diff --git a/icons/shield40_us_nm_2.svg b/icons/shield40_us_nm_2.svg
new file mode 100644
index 000000000..13a23c708
--- /dev/null
+++ b/icons/shield40_us_nm_2.svg
@@ -0,0 +1,5 @@
+
diff --git a/icons/shield40_us_nm_3.svg b/icons/shield40_us_nm_3.svg
new file mode 100644
index 000000000..a15b60d6a
--- /dev/null
+++ b/icons/shield40_us_nm_3.svg
@@ -0,0 +1,5 @@
+
diff --git a/icons/shield_ca_ns_s_mdb.svg b/icons/shield_ca_ns_s_mdb.svg
new file mode 100644
index 000000000..d4a9bf364
--- /dev/null
+++ b/icons/shield_ca_ns_s_mdb.svg
@@ -0,0 +1,22 @@
+
diff --git a/icons/shield_ca_ns_s_mkb.svg b/icons/shield_ca_ns_s_mkb.svg
new file mode 100644
index 000000000..2a2f5d26e
--- /dev/null
+++ b/icons/shield_ca_ns_s_mkb.svg
@@ -0,0 +1,22 @@
+
diff --git a/scripts/stats_compare.js b/scripts/stats_compare.js
index 279171a60..bf999529a 100644
--- a/scripts/stats_compare.js
+++ b/scripts/stats_compare.js
@@ -49,7 +49,13 @@ const ss2xRow = mdCompareRow(
difference.spriteSheet2xSize
);
-printTable("Style size statistics", [layersRow, sizeRow, ss1xRow, ss2xRow, shieldRow]);
+printTable("Style size statistics", [
+ layersRow,
+ sizeRow,
+ ss1xRow,
+ ss2xRow,
+ shieldRow,
+]);
/**
* Show comparison of the number of layers in each group before and after
diff --git a/src/configs/config.aws.js b/src/configs/config.aws.js
index 51e032ebc..9727e7f64 100644
--- a/src/configs/config.aws.js
+++ b/src/configs/config.aws.js
@@ -3,7 +3,7 @@
/*
Planetiler tile server, hosted at AWS
*/
-const OPENMAPTILES_URL = "https://tile.ourmap.us/data/omt_3_15.json";
+const OPENMAPTILES_URL = "https://tile.ourmap.us/data/v3.json";
/*
The following two variables override the color of the bounding box and halo of
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index f00592876..fc77d95ee 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -1681,11 +1681,17 @@ export function loadShields() {
);
// New Mexico
- shields["US:NM"] = pillShield(
- Color.shields.white,
- Color.shields.pink,
- Color.shields.black
- );
+ shields["US:NM"] = {
+ spriteBlank: ["shield40_us_nm_2", "shield40_us_nm_3"],
+ textColor: Color.shields.black,
+ textLayout: textConstraint("ellipse"),
+ padding: {
+ left: 5,
+ right: 5,
+ top: 5,
+ bottom: 5,
+ },
+ };
shields["US:NM:Frontage"] = {
spriteBlank: "shield_us_nm_frontage",
textColor: Color.shields.black,
@@ -3673,6 +3679,12 @@ export function loadShields() {
// Ref-specific cases. Each entry should be documented in CONTRIBUTE.md
shields["CA:NS:S"].overrideByName = {
+ "A. Murray MacKay Bridge": {
+ spriteBlank: "shield_ca_ns_s_mkb",
+ },
+ "Angus L. MacDonald Bridge": {
+ spriteBlank: "shield_ca_ns_s_mdb",
+ },
"Bras d'Or Lakes Scenic Drive": {
spriteBlank: "shield_ca_ns_s_bdolsd",
},
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 1352e90d3..d9a5ddbcc 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -368,13 +368,9 @@ export const poi = {
[
"match",
["get", "subclass"],
- [
- ...getSubclasses(iconDefs.college),
- ],
+ [...getSubclasses(iconDefs.college)],
10,
- [
- "station",
- "halt"],
+ ["station", "halt"],
12,
["bus_station", "subway"],
14,