Merge branch 'main' into clay-shields-us-mn-countyfix-2

osm-americana · May 4, 2024 · 363d98d · 363d98d
2 parents bece42f + 8b83f35
commit 363d98d
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 13 deletions.
diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
diff --git a/icons/shield40_us_nm_2.svg b/icons/shield40_us_nm_2.svg
diff --git a/icons/shield40_us_nm_3.svg b/icons/shield40_us_nm_3.svg
diff --git a/icons/shield_ca_ns_s_mdb.svg b/icons/shield_ca_ns_s_mdb.svg
diff --git a/icons/shield_ca_ns_s_mkb.svg b/icons/shield_ca_ns_s_mkb.svg
diff --git 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
@@ -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
@@ -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
@@ -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,