From 1ed9377a0b3276b63b841993b859f16c4612fd55 Mon Sep 17 00:00:00 2001
From: Will <wahubsch@gmail.com>
Date: Tue, 7 Jan 2025 16:18:19 -0500
Subject: [PATCH] refactoring and renaming similar shields for Mexico and Peru

---
 ...2.svg => shield_escutcheon_crossbar_2.svg} |  0
 ...3.svg => shield_escutcheon_crossbar_3.svg} |  0
 src/js/shield_defs.js                         | 30 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename icons/{shield_mx_state_2.svg => shield_escutcheon_crossbar_2.svg} (100%)
 rename icons/{shield_mx_state_3.svg => shield_escutcheon_crossbar_3.svg} (100%)

diff --git a/icons/shield_mx_state_2.svg b/icons/shield_escutcheon_crossbar_2.svg
similarity index 100%
rename from icons/shield_mx_state_2.svg
rename to icons/shield_escutcheon_crossbar_2.svg
diff --git a/icons/shield_mx_state_3.svg b/icons/shield_escutcheon_crossbar_3.svg
similarity index 100%
rename from icons/shield_mx_state_3.svg
rename to icons/shield_escutcheon_crossbar_3.svg
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index ac4517941..d9c4e9020 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -96,6 +96,20 @@ export function loadShields() {
     textHaloColor: Color.backgroundFill,
   };
 
+  let escutcheonCrossbarShield = {
+    spriteBlank: [
+      "shield_escutcheon_crossbar_2",
+      "shield_escutcheon_crossbar_3",
+    ],
+    textColor: Color.shields.black,
+    padding: {
+      left: 2,
+      right: 2,
+      top: 5.5,
+      bottom: 4.5,
+    },
+  };
+
   // NORTH AMERICA
   shields["GLCT"] = {
     notext: true,
@@ -573,19 +587,7 @@ export function loadShields() {
     "VER",
     "YUC",
     "ZAC",
-  ].forEach(
-    (state) =>
-      (shields[`MX:${state}`] = {
-        spriteBlank: ["shield_mx_state_2", "shield_mx_state_3"],
-        textColor: Color.shields.black,
-        padding: {
-          left: 2,
-          right: 2,
-          top: 5.5,
-          bottom: 4.5,
-        },
-      })
-  );
+  ].forEach((state) => (shields[`MX:${state}`] = escutcheonCrossbarShield));
 
   // Ejes Viales (CDMX)
   shields["MX:CDMX:EJE:CENTRAL"] = {
@@ -3200,7 +3202,7 @@ export function loadShields() {
         shields[`PE:departmental:${department}`],
         shields[`PE:rural:${department}`],
       ] = [
-        escutcheonDownShield(12, Color.shields.white, Color.shields.black),
+        escutcheonCrossbarShield,
         pillShield(Color.shields.white, Color.shields.black),
       ])
   );