From 51816c0f9306ccc59f72ebccc8271cf3629ad687 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Thu, 6 Jun 2024 13:18:53 -0400
Subject: [PATCH 1/2] Add shields for Ejes Viales of Mexico City

---
 icons/shield_mx_cdmx_eje_central.svg |  5 ++++
 icons/shield_mx_cdmx_eje_nte.svg     |  4 +++
 icons/shield_mx_cdmx_eje_ote.svg     |  4 +++
 icons/shield_mx_cdmx_eje_pte.svg     |  4 +++
 icons/shield_mx_cdmx_eje_sur.svg     |  4 +++
 src/js/shield_defs.js                | 43 ++++++++++++++++++++++++++++
 6 files changed, 64 insertions(+)
 create mode 100644 icons/shield_mx_cdmx_eje_central.svg
 create mode 100644 icons/shield_mx_cdmx_eje_nte.svg
 create mode 100644 icons/shield_mx_cdmx_eje_ote.svg
 create mode 100644 icons/shield_mx_cdmx_eje_pte.svg
 create mode 100644 icons/shield_mx_cdmx_eje_sur.svg

diff --git a/icons/shield_mx_cdmx_eje_central.svg b/icons/shield_mx_cdmx_eje_central.svg
new file mode 100644
index 000000000..7f4f42529
--- /dev/null
+++ b/icons/shield_mx_cdmx_eje_central.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <rect style="fill:#fff;fill-rule:evenodd;stroke:#000" width="19" height="19" x=".5" y=".5" rx="1.5" ry="1.5"/>
+ <circle style="fill:#000;fill-rule:evenodd;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill" cx="10" cy="10" r="6.5"/>
+ <path style="fill:#ffcd00;fill-rule:evenodd;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill" d="m 10,16 a 6,6 0 0 1 -5.1961524,-3 6,6 0 0 1 0,-6 A 6,6 0 0 1 10,4 v 6 z"/>
+</svg>
diff --git a/icons/shield_mx_cdmx_eje_nte.svg b/icons/shield_mx_cdmx_eje_nte.svg
new file mode 100644
index 000000000..d4be2297f
--- /dev/null
+++ b/icons/shield_mx_cdmx_eje_nte.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="26" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000" d="M 2,0 C 0.90065,0 0,0.9006497 0,2 v 22 c 0,1.09935 0.90065,2 2,2 h 16 c 1.09935,0 2,-0.90065 2,-2 V 2 C 20,0.9006497 19.09935,0 18,0 Z"/>
+ <path style="fill:#fff" d="m 16.8185,6 h -2.877 V 1.002 h 2.877 V 1.87 h -1.82 v 1.099 h 1.694 v 0.868 h -1.694 v 1.288 h 1.82 z m -5.704494,0 h -1.057 V 1.884 H 8.6990056 V 1.002 h 3.7730004 v 0.882 h -1.358 z M 7.2295,6 H 5.8855 L 3.7085,2.22 h -0.028 l 0.028,0.714 c 0.014,0.238 0.025667,0.476 0.035,0.714 V 6 H 2.7985 V 1.002 h 1.337 l 2.17,3.745 h 0.021 C 6.32183,4.5136667 6.3149972,4.2826599 6.3055,4.054 L 6.2775,3.368 V 1.002 h 0.952 z M 19,7 v 17 c 0,0.562648 -0.437352,1 -1,1 H 2 C 1.4373519,25 1,24.562648 1,24 V 7 Z"/>
+</svg>
diff --git a/icons/shield_mx_cdmx_eje_ote.svg b/icons/shield_mx_cdmx_eje_ote.svg
new file mode 100644
index 000000000..d11aa9d33
--- /dev/null
+++ b/icons/shield_mx_cdmx_eje_ote.svg
@@ -0,0 +1,4 @@
+<svg width="26" height="20" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000" d="M 26,2 C 26,0.90065 25.09935,0 24,0 H 2 C 0.90065,0 0,0.90065 0,2 v 16 c 0,1.09935 0.90065,2 2,2 h 22 c 1.09935,0 2,-0.90065 2,-2 z"/>
+ <path style="fill:#fff" d="M 24.047,18.9 H 21.17 v -4.998 h 2.877 v 0.868 h -1.82 v 1.099 h 1.694 v 0.868 h -1.694 v 1.288 h 1.82 z m -1.018497,-5.95 h -1.057 V 8.834 h -1.358 V 7.952 h 3.773 v 0.882 h -1.358 z M 24.88,4.494 c 0,0.518 -0.08633,0.970667 -0.259,1.358 C 24.453,6.234667 24.194,6.533333 23.844,6.748 23.494,6.962667 23.046,7.07 22.5,7.07 21.958667,7.07 21.510667,6.962667 21.156,6.748 20.806,6.533333 20.544667,6.232333 20.372,5.845 20.204,5.457667 20.12,5.005 20.12,4.487 c 0,-0.518 0.084,-0.968333 0.252,-1.351 0.172667,-0.3826667 0.434,-0.679 0.784,-0.889 0.354667,-0.2146667 0.805,-0.322 1.351,-0.322 0.541333,0 0.987,0.1073333 1.337,0.322 0.35,0.21 0.609,0.5086667 0.777,0.896 0.172667,0.382667 0.259,0.833 0.259,1.351 z m -3.647,0 c 0,0.522667 0.100333,0.935667 0.301,1.239 0.200667,0.298667 0.522667,0.448 0.966,0.448 0.452667,0 0.777,-0.149333 0.973,-0.448 0.196,-0.303333 0.294,-0.716333 0.294,-1.239 0,-0.527333 -0.098,-0.940333 -0.294,-1.239 -0.196,-0.2986667 -0.518,-0.448 -0.966,-0.448 -0.448,0 -0.772333,0.1493333 -0.973,0.448 -0.200667,0.298667 -0.301,0.711667 -0.301,1.239 z M 19,19 H 2 C 1.437352,19 1,18.562648 1,18 V 2 C 1,1.4373519 1.437352,1 2,1 h 17 z"/>
+</svg>
diff --git a/icons/shield_mx_cdmx_eje_pte.svg b/icons/shield_mx_cdmx_eje_pte.svg
new file mode 100644
index 000000000..8eb70b599
--- /dev/null
+++ b/icons/shield_mx_cdmx_eje_pte.svg
@@ -0,0 +1,4 @@
+<svg width="26" height="20" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000" d="m 0,18 c 0,1.09935 0.90065,2 2,2 h 22 c 1.09935,0 2,-0.90065 2,-2 V 2 C 26,0.90065 25.09935,0 24,0 H 2 C 0.90065,0 0,0.90065 0,2 Z"/>
+ <path style="fill:#fff" d="m 5.0470019,18.9 h -2.877 v -4.998 h 2.877 v 0.868 h -1.82 v 1.099 h 1.694 v 0.868 h -1.694 v 1.288 h 1.82 z M 4.028505,12.95 h -1.057 V 8.834 h -1.358 V 7.952 h 3.773 v 0.882 h -1.358 z M 3.5280058,2.002 c 0.644,0 1.113,0.14 1.407,0.42 0.2986667,0.2753333 0.448,0.6556667 0.448,1.141 0,0.2893333 -0.060667,0.562333 -0.182,0.819 -0.1213333,0.252 -0.3243333,0.455 -0.609,0.609 -0.28,0.154 -0.6626667,0.231 -1.148,0.231 h -0.455 V 7 h -1.057 V 2.002 Z m -0.056,0.868 h -0.483 v 1.484 h 0.35 c 0.2986667,0 0.5343333,-0.05833 0.707,-0.175 0.1773333,-0.121333 0.266,-0.315 0.266,-0.581 0,-0.4853333 -0.28,-0.728 -0.84,-0.728 z M 7,1 h 17 c 0.562648,0 1,0.437352 1,1 v 16 c 0,0.562648 -0.437352,1 -1,1 H 7 Z"/>
+</svg>
diff --git a/icons/shield_mx_cdmx_eje_sur.svg b/icons/shield_mx_cdmx_eje_sur.svg
new file mode 100644
index 000000000..617869491
--- /dev/null
+++ b/icons/shield_mx_cdmx_eje_sur.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="26" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000" d="M 2,0 C 0.90065,0 0,0.9006497 0,2 v 22 c 0,1.09935 0.90065,2 2,2 h 16 c 1.09935,0 2,-0.90065 2,-2 V 2 C 20,0.9006497 19.09935,0 18,0 Z"/>
+ <path style="fill:#fff" d="m 15.45,20.002 c 0.681333,0 1.183,0.123667 1.505,0.371 0.326667,0.247333 0.49,0.623 0.49,1.127 0,0.228667 -0.04433,0.429333 -0.133,0.602 -0.084,0.168 -0.198333,0.312667 -0.343,0.434 -0.14,0.116667 -0.291667,0.212333 -0.455,0.287 L 17.984,25 h -1.176 l -1.19,-1.918 H 15.051 V 25 h -1.057 v -4.998 z m -0.077,0.868 h -0.322 v 1.351 h 0.343 c 0.35,0 0.599667,-0.05833 0.749,-0.175 0.154,-0.116667 0.231,-0.289333 0.231,-0.518 0,-0.238 -0.08167,-0.406 -0.245,-0.504 -0.158667,-0.102667 -0.410667,-0.154 -0.756,-0.154 z m -3.303496,2.366 c 0,0.345333 -0.077,0.658 -0.231,0.938 -0.149333,0.275333 -0.378,0.494667 -0.686,0.658 -0.303333,0.158667 -0.688333,0.238 -1.1549993,0.238 -0.6626667,0 -1.1666667,-0.168 -1.512,-0.504 -0.3453333,-0.340667 -0.518,-0.788667 -0.518,-1.344 v -3.22 h 1.057 v 3.059 c 0,0.410667 0.084,0.7 0.252,0.868 0.168,0.168 0.4176667,0.252 0.7490003,0.252 0.345333,0 0.595,-0.091 0.748999,-0.273 0.158667,-0.182 0.238001,-0.466667 0.238,-0.854 v -3.052 h 1.057 z M 5.9925,23.614 c 0,0.443333 -0.161,0.798 -0.483,1.064 -0.3173333,0.261333 -0.77,0.392 -1.358,0.392 -0.5273333,0 -0.9986667,-0.100333 -1.414,-0.301 v -0.987 c 0.238,0.102667 0.483,0.198333 0.735,0.287 0.2566667,0.084 0.511,0.126 0.763,0.126 0.2613333,0 0.4456667,-0.049 0.553,-0.147 0.112,-0.102667 0.168,-0.231 0.168,-0.385 0,-0.126 -0.044333,-0.233333 -0.133,-0.322 C 4.7395,23.25233 4.6251667,23.170667 4.4805,23.096 4.3358333,23.01667 4.1701667,22.932667 3.9835,22.844 3.8668333,22.788 3.7408333,22.722667 3.6055,22.648 3.4701667,22.56867 3.3395,22.473 3.2135,22.361 3.0921667,22.244333 2.9918333,22.104333 2.9125,21.941 2.833167,21.777667 2.7935,21.581667 2.7935,21.353 c 0,-0.448 0.1516667,-0.795667 0.455,-1.043 0.3033333,-0.252 0.7163333,-0.378 1.239,-0.378 0.2613333,0 0.5086667,0.03033 0.742,0.091 0.238,0.06067 0.4853333,0.147 0.742,0.259 l -0.343,0.826 c -0.2286667,-0.09333 -0.434,-0.165667 -0.616,-0.217 -0.182,-0.05133 -0.3686667,-0.077 -0.56,-0.077 -0.2006667,0 -0.3546667,0.04667 -0.462,0.14 -0.1073333,0.09333 -0.161,0.214667 -0.161,0.364 0,0.177333 0.079333,0.317333 0.238,0.42 0.1586667,0.102667 0.3943333,0.228667 0.707,0.378 0.2566667,0.121333 0.4736667,0.247333 0.651,0.378 0.182,0.130667 0.322,0.284667 0.42,0.462 0.098,0.177333 0.147,0.396667 0.147,0.658 z M 1,19 V 2 C 1,1.437352 1.437352,1 2,1 h 16 c 0.562648,0 1,0.437352 1,1 v 17 z"/>
+</svg>
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index b2bfa3673..f39219f0f 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -547,6 +547,49 @@ export function loadShields() {
     },
   };
 
+  // Ejes Viales (CDMX)
+  shields["MX:CDMX:EJE:CENTRAL"] = {
+    noref: {
+      spriteBlank: "shield_mx_cdmx_eje_central",
+    },
+  };
+  shields["MX:CDMX:EJE:NTE"] = {
+    spriteBlank: "shield_mx_cdmx_eje_nte",
+    padding: {
+      left: 2,
+      right: 2,
+      top: 8,
+      bottom: 2,
+    },
+  };
+  shields["MX:CDMX:EJE:OTE"] = {
+    spriteBlank: "shield_mx_cdmx_eje_ote",
+    padding: {
+      left: 2,
+      right: 8,
+      top: 2,
+      bottom: 2,
+    },
+  };
+  shields["MX:CDMX:EJE:PTE"] = {
+    spriteBlank: "shield_mx_cdmx_eje_pte",
+    padding: {
+      left: 8,
+      right: 2,
+      top: 2,
+      bottom: 2,
+    },
+  };
+  shields["MX:CDMX:EJE:SUR"] = {
+    spriteBlank: "shield_mx_cdmx_eje_sur",
+    padding: {
+      left: 2,
+      right: 2,
+      top: 2,
+      bottom: 8,
+    },
+  };
+
   // United States
 
   // Interstate Highways

From 316aebccdd5aaef0ffb558c25b47578a6ceb7634 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Wed, 12 Jun 2024 20:54:52 -0400
Subject: [PATCH 2/2] put yellow on correct side of Eje Central shield

---
 icons/shield_mx_cdmx_eje_central.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icons/shield_mx_cdmx_eje_central.svg b/icons/shield_mx_cdmx_eje_central.svg
index 7f4f42529..092346388 100644
--- a/icons/shield_mx_cdmx_eje_central.svg
+++ b/icons/shield_mx_cdmx_eje_central.svg
@@ -1,5 +1,5 @@
 <svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
  <rect style="fill:#fff;fill-rule:evenodd;stroke:#000" width="19" height="19" x=".5" y=".5" rx="1.5" ry="1.5"/>
  <circle style="fill:#000;fill-rule:evenodd;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill" cx="10" cy="10" r="6.5"/>
- <path style="fill:#ffcd00;fill-rule:evenodd;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill" d="m 10,16 a 6,6 0 0 1 -5.1961524,-3 6,6 0 0 1 0,-6 A 6,6 0 0 1 10,4 v 6 z"/>
+ <path style="fill:#ffcd00;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill" d="m 10,4 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 v -6 z"/>
 </svg>