From 3bc73e6f5a8c51bc6be66f7ea98ce54ee3539290 Mon Sep 17 00:00:00 2001 From: Clay Smalley Date: Thu, 6 Jun 2024 16:57:12 -0400 Subject: [PATCH 1/3] Add shields for states of Mexico --- icons/shield_mx_jal_2.svg | 4 +++ icons/shield_mx_jal_3.svg | 4 +++ icons/shield_mx_state_2.svg | 4 +++ icons/shield_mx_state_3.svg | 4 +++ src/js/shield_defs.js | 54 +++++++++++++++++++++++++++++++++++++ src/shieldtest.js | 2 ++ 6 files changed, 72 insertions(+) create mode 100644 icons/shield_mx_jal_2.svg create mode 100644 icons/shield_mx_jal_3.svg create mode 100644 icons/shield_mx_state_2.svg create mode 100644 icons/shield_mx_state_3.svg diff --git a/icons/shield_mx_jal_2.svg b/icons/shield_mx_jal_2.svg new file mode 100644 index 000000000..089c84021 --- /dev/null +++ b/icons/shield_mx_jal_2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/shield_mx_jal_3.svg b/icons/shield_mx_jal_3.svg new file mode 100644 index 000000000..f79dc449f --- /dev/null +++ b/icons/shield_mx_jal_3.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/shield_mx_state_2.svg b/icons/shield_mx_state_2.svg new file mode 100644 index 000000000..52a0d58f5 --- /dev/null +++ b/icons/shield_mx_state_2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/shield_mx_state_3.svg b/icons/shield_mx_state_3.svg new file mode 100644 index 000000000..2923349a2 --- /dev/null +++ b/icons/shield_mx_state_3.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js index b2bfa3673..093146c33 100644 --- a/src/js/shield_defs.js +++ b/src/js/shield_defs.js @@ -546,6 +546,60 @@ export function loadShields() { bottom: 2, }, }; + [ + "AGS", + "BC", + "BCS", + "CAMP", + "COAH", + "COL", + "CHIS", + "CHIH", + "DGO", + "GTO", + "GRO", + "HGO", + // FIXME missing State of Mexico + "MICH", + "MOR", + "NAY", + "NL", + "OAX", + "PUE", + "QRO", + "Q.ROO", + "SLP", + "SIN", + "SON", + "TAB", + "TAM", + "TLAX", + "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, + }, + }) + ); + shields["MX:JAL"] = { + spriteBlank: ["shield_mx_jal_2", "shield_mx_jal_3"], + textColor: Color.shields.black, + padding: { + left: 2, + right: 2, + top: 5.5, + bottom: 4.5, + }, + }; // United States diff --git a/src/shieldtest.js b/src/shieldtest.js index 26b052058..5b11f7ffc 100644 --- a/src/shieldtest.js +++ b/src/shieldtest.js @@ -121,6 +121,8 @@ let networks = [ "US:VA", "US:PR:primary", "HK", + "MX:QRO", + "MX:JAL", "CA:QC:A", "NZ:SH", From 26f09bd198076183bde41c596315c8067da8e1bd Mon Sep 17 00:00:00 2001 From: Clay Smalley Date: Wed, 12 Jun 2024 20:43:48 -0400 Subject: [PATCH 2/3] Remove poorly-attested orange shield for Jalisco --- icons/shield_mx_jal_2.svg | 4 ---- icons/shield_mx_jal_3.svg | 4 ---- src/js/shield_defs.js | 11 +---------- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 icons/shield_mx_jal_2.svg delete mode 100644 icons/shield_mx_jal_3.svg diff --git a/icons/shield_mx_jal_2.svg b/icons/shield_mx_jal_2.svg deleted file mode 100644 index 089c84021..000000000 --- a/icons/shield_mx_jal_2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/icons/shield_mx_jal_3.svg b/icons/shield_mx_jal_3.svg deleted file mode 100644 index f79dc449f..000000000 --- a/icons/shield_mx_jal_3.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js index 093146c33..95c900f90 100644 --- a/src/js/shield_defs.js +++ b/src/js/shield_defs.js @@ -559,6 +559,7 @@ export function loadShields() { "GTO", "GRO", "HGO", + "JAL", // FIXME missing State of Mexico "MICH", "MOR", @@ -590,16 +591,6 @@ export function loadShields() { }, }) ); - shields["MX:JAL"] = { - spriteBlank: ["shield_mx_jal_2", "shield_mx_jal_3"], - textColor: Color.shields.black, - padding: { - left: 2, - right: 2, - top: 5.5, - bottom: 4.5, - }, - }; // United States From c330439f7e89e7bb94e18cdb291d884f71f53c13 Mon Sep 17 00:00:00 2001 From: Clay Smalley Date: Sat, 15 Jun 2024 12:48:35 -0400 Subject: [PATCH 3/3] remove Jalisco from shield test --- src/shieldtest.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/shieldtest.js b/src/shieldtest.js index 5b11f7ffc..f630a010f 100644 --- a/src/shieldtest.js +++ b/src/shieldtest.js @@ -122,7 +122,6 @@ let networks = [ "US:PR:primary", "HK", "MX:QRO", - "MX:JAL", "CA:QC:A", "NZ:SH",