Added Asian Highway Network shields

Added shields for the Asian Highway Network that depend on the country. Added GeoJSON files for line-in-polygon tests.

scripts/build.js

@@ -1,4 +1,4 @@
-import { stat, copyFile, mkdir } from "node:fs/promises";
+import { stat, copyFile, cp, mkdir } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 
 import esbuild from "esbuild";
@@ -20,12 +20,13 @@ const maybeLocalConfig = async (name = "local.config.js") => {
 };
 
 const buildWith = async (key, buildOptions) => {
-  await mkdir("dist", { recursive: true });
+  await mkdir("dist/features", { recursive: true });
   await Promise.all(
     ["index.html", "shieldtest.html", "favicon.ico"].map((f) =>
       copyFile(`src/${f}`, `dist/${f}`)
     )
   );
+  await cp("features", "dist/features", {recursive: true});
 
   const localConfig = await maybeLocalConfig();
 

scripts/status_map.js

@@ -13,6 +13,10 @@ function fillPaths(svg, codes) {
     // Routes in United States insular areas use US prefix with the U.S.
     selectors.add(".ust");
   }
+  // The Asian Highway Network isn't a real country.
+  if (selectors.has(".ah")) {
+    selectors.delete(".ah");
+  }
   return svg.replace(".supported", new Array(...selectors).join(",\n"));
 }
 

src/js/shield.js

@@ -301,6 +301,12 @@ function getShieldDef(routeDef) {
       ...shieldDef.overrideByRef[routeDef.ref],
     };
   }
+  if (shieldDef.overrideByName) {
+    shieldDef = {
+      ...shieldDef,
+      ...shieldDef.overrideByName[routeDef.wayName],
+    };
+  }
 
   //Determine whether a route without a ref gets drawn
   if (

src/js/shield_defs.js

@@ -3238,6 +3238,32 @@ export function loadShields() {
 
   // ASIA
 
+  // Asian Highway Network
+  shields["AsianHighway"] = roundedRectShield(
+    Color.shields.blue,
+    Color.shields.white
+  );
+  shields["AsianHighway"].overrideByName = {
+    green: roundedRectShield(Color.shields.green, Color.shields.white),
+    green_in: {
+      spriteBlank: ["shield_in_ah_2", "shield_in_ah_3", "shield_in_ah_4"],
+      textColor: Color.shields.white,
+      padding: {
+        left: 2,
+        right: 2,
+        top: 2,
+        bottom: 7,
+      },
+    },
+    white: roundedRectShield(Color.shields.white, Color.shields.black),
+    white_id: roundedRectShield(
+      Color.shields.white,
+      Color.shields.green,
+      Color.shields.black
+    ),
+  };
+  shields["AH"] = shields["AsianHighway"];
+
   // Armenia
   shields["am:national"] = roundedRectShield(
     Color.shields.blue,

src/layer/highway_shield.js

@@ -7,17 +7,71 @@ export const namedRouteNetworks = [
   "US:TX:Harris:HCTRA",
 ];
 
+let AsianHighwayBorders = {};
+
+export async function fetchFeatures(baseURL) {
+  if (Object.keys(AsianHighwayBorders).length !== 0) {
+    return;
+  }
+
+  let fetchFile = async function (name) {
+    let response = await fetch(`features/${name}.geojson`);
+    if (response.ok) {
+      AsianHighwayBorders[name] = await response.json();
+    } else {
+      throw response;
+    }
+  };
+  await Promise.all([
+    "az-cn-ir", "id", "in", "jp-kr",
+  ].map(f => fetchFile(f)));
+}
+
 export function getImageNameExpression(routeIndex) {
+  const nullIsland = {type: "Polygon", coordinates: [[[0, 0], [0, 0], [0, 0]]]};
+
   return [
-    "concat",
-    "shield\n",
+    "let",
+    "route",
     ["get", "route_" + routeIndex],
     [
-      "match",
-      ["get", "route_" + routeIndex],
-      namedRouteNetworks.map((n) => n + "="),
-      ["concat", "\n", ["get", "name"]],
-      "",
+      "concat",
+      "shield\n",
+      ["var", "route"],
+      [
+        "match",
+        ["var", "route"],
+        namedRouteNetworks.map((n) => n + "="),
+        ["concat", "\n", ["get", "name"]],
+        "",
+      ],
+      [
+        "match",
+        ["slice", ["var", "route"], 0, ["index-of", "=", ["var", "route"]]],
+        ["AsianHighway", "AH"],
+        [
+          "concat",
+          "\n",
+          [
+            "case",
+            // Azerbaijan, China, Iran
+            ["within", AsianHighwayBorders["az-cn-ir"] || nullIsland],
+            "green",
+            // Japan, South Korea
+            ["within", AsianHighwayBorders["jp-kr"] || nullIsland],
+            "white",
+            // Indonesia
+            ["within", AsianHighwayBorders.id || nullIsland],
+            "white_id",
+            // India
+            ["within", AsianHighwayBorders.in || nullIsland],
+            "green_in",
+            // Armenia, Cambodia, Malaysia, Myanmar, Philippines, Russia, Thailand, Vietnam
+            "blue",
+          ],
+        ],
+        "",
+      ],
     ],
   ];
 }
@@ -43,6 +97,7 @@ export function parseImageName(imageName) {
   return { imageName, network, ref, name };
 }
 
+await fetchFeatures();
 let shieldTextField = ["format"];
 for (var i = 1; i <= 6; i++) {
   shieldTextField.push(routeConcurrency(i));