From 5277fce0022ec26676ed9e6a373c10c8826054b7 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Wed, 29 May 2024 18:02:20 -0400
Subject: [PATCH] Add shields for expressways in Ontario, Canada

---
 icons/shield_ca_on_hamilton_blue.svg  |  4 ++++
 icons/shield_ca_on_hamilton_green.svg |  4 ++++
 icons/shield_ca_on_toronto.svg        |  5 +++++
 src/js/shield_defs.js                 | 26 ++++++++++++++++++++++++++
 src/shieldtest.js                     |  8 ++++++++
 5 files changed, 47 insertions(+)
 create mode 100644 icons/shield_ca_on_hamilton_blue.svg
 create mode 100644 icons/shield_ca_on_hamilton_green.svg
 create mode 100644 icons/shield_ca_on_toronto.svg

diff --git a/icons/shield_ca_on_hamilton_blue.svg b/icons/shield_ca_on_hamilton_blue.svg
new file mode 100644
index 000000000..eb3c79ac6
--- /dev/null
+++ b/icons/shield_ca_on_hamilton_blue.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M18,0.5 C18.4142136,0.5 18.7892136,0.667893219 19.0606602,0.939339828 C19.3321068,1.21078644 19.5,1.58578644 19.5,2 L19.5,18 C19.5,18.4142136 19.3321068,18.7892136 19.0606602,19.0606602 C18.7892136,19.3321068 18.4142136,19.5 18,19.5 L2,19.5 C1.58578644,19.5 1.21078644,19.3321068 0.939339828,19.0606602 C0.667893219,18.7892136 0.5,18.4142136 0.5,18 L0.5,2 C0.5,1.58578644 0.667893219,1.21078644 0.939339828,0.939339828 C1.21078644,0.667893219 1.58578644,0.5 2,0.5 Z" stroke="#FFF" fill="#006747" style="fill:#003f87"/>
+ <path style="color:#000;fill:#ffcd00;fill-rule:evenodd;stroke-linecap:square;-inkscape-stroke:none" d="M 3,3 V 17 H 17 V 3 Z M 4,4 H 16 V 16 H 15 V 6 h -1 v 5.294922 c -0.320805,-0.09956 -0.654708,-0.186818 -1,-0.259766 V 6 h -1 c 0,0.9472656 0,1.8945313 0,2.8417969 -0.637471,-0.1478474 -1.318529,-0.2226563 -2,-0.2226563 -0.6814714,0 -1.362529,0.074809 -2,0.2226563 V 6 H 7 v 5.035156 C 6.6547082,11.108104 6.320805,11.195365 6,11.294922 6,9.529948 6,7.764974 6,6 H 5 V 16 H 4 Z m 6,5.6308594 c 0.6945,0 1.388711,0.08095 2,0.2421875 v 0.9921871 c -0.651962,-0.08642 -1.325865,-0.130859 -2,-0.130859 -0.6741351,0 -1.3480376,0.04444 -2,0.130859 V 9.8730469 C 8.6112889,9.7118093 9.3054997,9.6308594 10,9.6308594 Z m 0,2.1347656 c 0.677494,0 1.355167,0.04465 2,0.130859 V 16 H 8 v -4.103516 c 0.6448326,-0.08621 1.3225055,-0.130859 2,-0.130859 z M 7,12.070312 V 16 H 6 v -3.650391 c 0.3118158,-0.10754 0.6469152,-0.201548 1,-0.279297 z m 6,0 c 0.353085,0.07775 0.688184,0.171757 1,0.279297 V 16 h -1 z"/>
+</svg>
diff --git a/icons/shield_ca_on_hamilton_green.svg b/icons/shield_ca_on_hamilton_green.svg
new file mode 100644
index 000000000..43fe46665
--- /dev/null
+++ b/icons/shield_ca_on_hamilton_green.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M18,0.5 C18.4142136,0.5 18.7892136,0.667893219 19.0606602,0.939339828 C19.3321068,1.21078644 19.5,1.58578644 19.5,2 L19.5,18 C19.5,18.4142136 19.3321068,18.7892136 19.0606602,19.0606602 C18.7892136,19.3321068 18.4142136,19.5 18,19.5 L2,19.5 C1.58578644,19.5 1.21078644,19.3321068 0.939339828,19.0606602 C0.667893219,18.7892136 0.5,18.4142136 0.5,18 L0.5,2 C0.5,1.58578644 0.667893219,1.21078644 0.939339828,0.939339828 C1.21078644,0.667893219 1.58578644,0.5 2,0.5 Z" stroke="#FFF" fill="#006747"/>
+ <path style="color:#000;fill:#ffcd00;fill-rule:evenodd;stroke-linecap:square;-inkscape-stroke:none" d="M 3,3 V 17 H 17 V 3 Z M 4,4 H 16 V 16 H 15 V 6 h -1 v 5.294922 c -0.320805,-0.09956 -0.654708,-0.186818 -1,-0.259766 V 6 h -1 c 0,0.9472656 0,1.8945313 0,2.8417969 -0.637471,-0.1478474 -1.318529,-0.2226563 -2,-0.2226563 -0.6814714,0 -1.362529,0.074809 -2,0.2226563 V 6 H 7 v 5.035156 C 6.6547082,11.108104 6.320805,11.195365 6,11.294922 6,9.529948 6,7.764974 6,6 H 5 V 16 H 4 Z m 6,5.6308594 c 0.6945,0 1.388711,0.08095 2,0.2421875 v 0.9921871 c -0.651962,-0.08642 -1.325865,-0.130859 -2,-0.130859 -0.6741351,0 -1.3480376,0.04444 -2,0.130859 V 9.8730469 C 8.6112889,9.7118093 9.3054997,9.6308594 10,9.6308594 Z m 0,2.1347656 c 0.677494,0 1.355167,0.04465 2,0.130859 V 16 H 8 v -4.103516 c 0.6448326,-0.08621 1.3225055,-0.130859 2,-0.130859 z M 7,12.070312 V 16 H 6 v -3.650391 c 0.3118158,-0.10754 0.6469152,-0.201548 1,-0.279297 z m 6,0 c 0.353085,0.07775 0.688184,0.171757 1,0.279297 V 16 h -1 z"/>
+</svg>
diff --git a/icons/shield_ca_on_toronto.svg b/icons/shield_ca_on_toronto.svg
new file mode 100644
index 000000000..1a8f35a75
--- /dev/null
+++ b/icons/shield_ca_on_toronto.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="10" style="fill:#fff"/>
+ <circle cx="10" cy="10" style="fill:#006747" r="9"/>
+ <circle cx="10" cy="10" style="fill:#f38f00" r="6"/>
+</svg>
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index 24189b40a..322a8d340 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -361,6 +361,32 @@ export function loadShields() {
   shields["CA:ON:Muskoka:West"] = banneredShield(shields["CA:ON:Muskoka"], [
     "WEST",
   ]);
+  shields["CA:ON:Hamilton:Expressway"] = {
+    notext: true,
+    overrideByName: {
+      "Lincoln M. Alexander Parkway": {
+        spriteBlank: "shield_ca_on_hamilton_blue",
+      },
+      "Red Hill Valley Parkway": {
+        spriteBlank: "shield_ca_on_hamilton_green",
+      },
+    },
+  };
+  shields["CA:ON:Toronto:Expressway"] = {
+    spriteBlank: "shield_ca_on_toronto",
+    textColor: Color.shields.black,
+    textLayout: textConstraint("ellipse"),
+    padding: {
+      left: 5,
+      right: 5,
+      top: 5,
+      bottom: 5,
+    },
+    refsByName: {
+      "Don Valley Parkway": "DV",
+      "Gardiner Expressway": "G",
+    },
+  };
 
   // Prince Edward Island
   shields["CA:PE"] = {
diff --git a/src/shieldtest.js b/src/shieldtest.js
index 43ee5b361..f687008e6 100644
--- a/src/shieldtest.js
+++ b/src/shieldtest.js
@@ -303,6 +303,14 @@ const iterShields = function* () {
     network: "CA:ON:primary",
     refs: ["QEW"],
   };
+  yield {
+    network: "CA:ON:Hamilton:Expressway",
+    names: ["Lincoln M. Alexander Parkway", "Red Hill Valley Parkway"],
+  };
+  yield {
+    network: "CA:ON:Toronto:Expressway",
+    refs: ["DV", "G"],
+  };
   yield {
     network: "GLCT",
     refs: ["LECT", "LHCT", "LMCT", "LSCT"],