Merge pull request #1080 from ZeLonewolf/clay-shields-ca-on-parkways

Add shields for expressways in Ontario, Canada
osm-americana · May 30, 2024 · ac6988a · ac6988a
2 parents 9d05510 + 5277fce
commit ac6988a
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 0 deletions.
diff --git a/icons/shield_ca_on_hamilton_blue.svg b/icons/shield_ca_on_hamilton_blue.svg
diff --git a/icons/shield_ca_on_hamilton_green.svg b/icons/shield_ca_on_hamilton_green.svg
diff --git a/icons/shield_ca_on_toronto.svg b/icons/shield_ca_on_toronto.svg
diff --git 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
@@ -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"],