Merge branch 'main' into clay-shields-mx-mx-widen

osm-americana · Jun 20, 2024 · a7f5d0e · a7f5d0e
2 parents 2e9a9ea + 43d5784
commit a7f5d0e
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 27 deletions.
diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/status_map.js b/scripts/status_map.js
@@ -5,6 +5,15 @@ import * as ShieldDef from "../src/js/shield_defs.js";
 
 function fillPaths(svg, codes) {
   let selectors = new Set(codes.map((code) => `.${code.toLowerCase()}`));
+  if (selectors.has(".fr")) {
+    // French overseas territories use the FR prefix.
+    selectors.add(".bl");
+    selectors.add(".mf");
+    selectors.add(".nc");
+    selectors.add(".pf");
+    selectors.add(".pm");
+    selectors.add(".wf");
+  }
   if (selectors.has(".nl")) {
     // Curaçao routes use NL prefix with the Netherlands.
     selectors.add(".cw");

diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -3614,6 +3614,14 @@ export function loadShields() {
     Color.shields.white
   );
 
+  // Faroe Islands
+  shields["FO"] = roundedRectShield(
+    Color.shields.white,
+    Color.shields.black,
+    Color.shields.black,
+    34
+  );
+
   // Finland
   // Valtatie/riksväg
   shields["fi:national"] = roundedRectShield(
@@ -3637,10 +3645,56 @@ export function loadShields() {
   );
 
   // France
-  shields["FR:A-road"] = shields["FR:N-road"] = roundedRectShield(
-    Color.shields.red,
-    Color.shields.white
+  // Autoroutes/national routes
+  shields["FR:A-road"] =
+    shields["FR:N-road"] =
+    shields["FR:971:N-road"] =
+    shields["FR:972:A-road"] =
+    shields["FR:972:N-road"] =
+    shields["FR:973:N-road"] =
+    shields["FR:974:N-road"] =
+    shields["FR:975:N-road"] =
+    shields["FR:976:N-road"] =
+    shields["FR:978:N-road"] =
+    shields["FR:986:RT-road"] =
+    shields["FR:987:RT-road"] =
+    shields["FR:988:VE-road"] =
+    shields["FR:988:RT-road"] =
+      roundedRectShield(Color.shields.red, Color.shields.white);
+  // Departmental routes
+  // compute list of French department INSEE codes, 01 through 95, inclusive
+  let departments = Array.from({ length: 95 }, (_, i) =>
+    (i + 1).toString().padStart(2, "0")
+  );
+  [...departments, "971", "972", "973", "974", "976", "977", "978"].forEach(
+    (department) => {
+      shields[`FR:${department}:D-road`] = roundedRectShield(
+        Color.shields.yellow,
+        Color.shields.black
+      );
+    }
   );
+  // Metropolitan routes
+  [
+    "06",
+    "21",
+    "31",
+    "34",
+    "37",
+    "42",
+    "44",
+    "54",
+    "57",
+    "59",
+    "63",
+    "67",
+    "69",
+  ].forEach((department) => {
+    shields[`FR:${department}:M-road`] = roundedRectShield(
+      Color.shields.blue,
+      Color.shields.white
+    );
+  });
 
   // Germany
   shields["DE:national"] = roundedRectShield(