Merge pull request osm-americana#323 from ZeLonewolf/shield-conflate-…

…circles Add Zia sun symbol for New Mexico shield
aaroads-wiki · Apr 30, 2024 · 5e76ca1 · 5e76ca1
2 parents 16352eb + dfc0977
commit 5e76ca1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
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/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/js/shield_defs.js b/src/js/shield_defs.js
@@ -1673,11 +1673,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,

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,