Merge branch 'main' into peru

osm-americana · Jan 1, 2025 · 49a8780 · 49a8780
2 parents eac568e + 563b8b1
commit 49a8780
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/shieldlib/src/shield_helper.ts b/shieldlib/src/shield_helper.ts
@@ -217,7 +217,7 @@ export function triangleDownShield(
   rectWidth: number
 ): Partial<ShieldDefinition> {
   textColor = textColor ?? strokeColor;
-  radius = radius ?? 2;
+  radius = radius ?? 3;
 
   return {
     shapeBlank: {
@@ -232,10 +232,10 @@ export function triangleDownShield(
     },
     textLayout: textConstraint("triangleDown"),
     padding: {
-      left: 1,
-      right: 1,
-      top: 2,
-      bottom: 1,
+      left: 0,
+      right: 0,
+      top: 3,
+      bottom: 0,
     },
     textColor,
   };

diff --git a/src/js/legend_control.js b/src/js/legend_control.js
@@ -466,7 +466,10 @@ export default class LegendControl {
     let unrecognizedNetworks = new Set();
     for (let image of images) {
       if (!(image.network in imagesByNetwork)) {
-        imagesByNetwork[image.network] = { overridesByRef: {} };
+        imagesByNetwork[image.network] = {
+          overridesByRef: {},
+          overridesByName: {},
+        };
       }
       let networkImages = imagesByNetwork[image.network];
 
@@ -476,6 +479,12 @@ export default class LegendControl {
         if (!networkImages.overridesByRef[image.ref]) {
           networkImages.overridesByRef[image.ref] = image.imageName;
         }
+      } else if (image.name && shieldDef?.overrideByName?.[image.name]) {
+        // Store a different image for each override in the shield definition.
+        if (!networkImages.overridesByName[image.name]) {
+          networkImages.overridesByName[image.name] =
+            shieldDef.overrideByName[image.name].spriteBlank;
+        }
       } else if (!networkImages.ref && image.ref) {
         // Store the numbered variant of a shield if required by the shield
         // definition.
@@ -498,9 +507,10 @@ export default class LegendControl {
       let images = imagesByNetwork[network];
       if (!images) return [];
       return [
-        images.noRef,
+        Object.values(images.overridesByName).length > 0 ? "" : images.noRef,
         images.ref,
         ...Object.values(images.overridesByRef),
+        ...Object.values(images.overridesByName),
       ].filter((i) => i);
     };
 

diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -94,12 +94,6 @@ export function loadShields() {
   shields["default"] = {
     textColor: Color.shields.black,
     textHaloColor: Color.backgroundFill,
-    padding: {
-      left: 3,
-      right: 3,
-      top: 3,
-      bottom: 3,
-    },
   };
 
   // NORTH AMERICA