Merge pull request #415 from bgo-eiu/hexagon_blue_PK-NH

Blue hexagon shields for Pakistan National Highways
osm-americana · Jul 13, 2022 · abbcaef · abbcaef
2 parents af03369 + 3e22990
commit abbcaef
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
diff --git a/icons/shield_hex_horz_blue.svg → icons/shield_hex_horz_blue_2.svg b/icons/shield_hex_horz_blue.svg → icons/shield_hex_horz_blue_2.svg
diff --git a/icons/shield_hex_horz_blue_3.svg b/icons/shield_hex_horz_blue_3.svg
diff --git a/icons/shield_pk_motorway.svg b/icons/shield_pk_motorway.svg
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -326,7 +326,10 @@ export function loadShields(shieldImages) {
   };
 
   let hexagonHorizontalShieldBlue = {
-    backgroundImage: shieldImages.shield_hex_horz_blue,
+    backgroundImage: [
+      shieldImages.shield_hex_horz_blue_2,
+      shieldImages.shield_hex_horz_blue_3,
+    ],
     textLayoutConstraint: ShieldText.ellipseTextConstraint,
     textColor: Color.shields.white,
     padding: {
@@ -2619,7 +2622,10 @@ export function loadShields(shieldImages) {
   // Japan
   shields["JP:E"] = roundedRectShield(Color.shields.green, Color.shields.white);
   shields["JP:national"] = triangleConvexDownShieldBlue;
-  shields["JP:prefectural"] = hexagonHorizontalShieldBlue;
+  shields["JP:prefectural"] = {
+    ...hexagonHorizontalShieldBlue,
+    backgroundImage: shieldImages.shield_hex_horz_blue_2,
+  };
   [
     "aichi",
     "akita",
@@ -2689,6 +2695,20 @@ export function loadShields(shieldImages) {
   shields["PH:N"] = homeDownShield;
   shields["PH:E"] = homeDownShieldYellow;
 
+  // Pakistan
+  shields["PK:national"] = hexagonHorizontalShieldBlue;
+  shields["PK:motorway"] = {
+    backgroundImage: shieldImages.shield_pk_motorway,
+    textLayoutConstraint: ShieldText.southHalfellipseTextConstraint,
+    textColor: Color.shields.white,
+    padding: {
+      left: 2,
+      right: 2,
+      top: 2,
+      bottom: 7,
+    },
+  };
+
   // South Korea
   shields["KR:expressway"] = {
     backgroundImage: [