@diagrammo/dgmo 0.20.2 → 0.21.0

package/dist/internal.js

@@ -855,13 +855,9 @@ var init_reserved_key_registry = __esm({
       "icon"
     ]);
     MAP_REGISTRY = staticRegistry([
-      "score",
+      "value",
       "label",
-      "size",
-      "description",
-      "weight",
-      "style",
-      "date"
+      "style"
     ]);
     ORG_REGISTRY = staticRegistry([
       "color",
@@ -15844,7 +15840,8 @@ function parseMap(content) {
       continue;
     }
     if (open.route && indent > open.route.indent) {
-      open.route.route.stops.push(parseStop(trimmed, lineNumber));
+      const leg = parseLeg(trimmed, lineNumber, open.route.route.style);
+      open.route.route.legs.push(leg);
       continue;
     }
     if (open.poi && indent > open.poi.indent) {
@@ -15875,6 +15872,10 @@ function parseMap(content) {
       handleTag(trimmed, lineNumber);
       continue;
     }
+    if ((firstWord === "muted" || firstWord === "natural") && trimmed === firstWord) {
+      handleDirective(firstWord, "", lineNumber);
+      continue;
+    }
     if (DIRECTIVE_SET.has(firstWord) && !trimmed.slice(firstWord.length).trimStart().startsWith(":")) {
       handleDirective(
         firstWord,
@@ -15939,13 +15940,17 @@ function parseMap(content) {
           );
         d.projection = value;
         break;
-      case "metric":
-        dup(d.metric);
-        d.metric = value;
+      case "region-metric":
+        dup(d.regionMetric);
+        d.regionMetric = value;
+        break;
+      case "poi-metric":
+        dup(d.poiMetric);
+        d.poiMetric = value;
         break;
-      case "size-metric":
-        dup(d.sizeMetric);
-        d.sizeMetric = value;
+      case "flow-metric":
+        dup(d.flowMetric);
+        d.flowMetric = value;
         break;
       case "scale":
         dup(d.scale);
@@ -15987,6 +15992,15 @@ function parseMap(content) {
       case "no-legend":
         d.noLegend = true;
         break;
+      case "muted":
+      case "natural":
+        if (d.basemapStyle !== void 0 && d.basemapStyle !== key)
+          pushWarning(
+            line12,
+            `Conflicting basemap dress \u2014 "${d.basemapStyle}" then "${key}"; last wins.`
+          );
+        d.basemapStyle = key;
+        break;
       case "subtitle":
         dup(d.subtitle);
         d.subtitle = value;
@@ -16064,14 +16078,14 @@ function parseMap(content) {
       line12
     );
     const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
-    let scoreNum;
-    const score = meta["score"];
-    if (score !== void 0) {
-      delete meta["score"];
-      scoreNum = Number(score);
-      if (!Number.isFinite(scoreNum)) {
-        pushError(line12, `score must be a number (got "${score}").`);
-        scoreNum = void 0;
+    let valueNum;
+    const value = meta["value"];
+    if (value !== void 0) {
+      delete meta["value"];
+      valueNum = Number(value);
+      if (!Number.isFinite(valueNum)) {
+        pushError(line12, `value must be a number (got "${value}").`);
+        valueNum = void 0;
       }
     }
     let regionName = split.name;
@@ -16089,7 +16103,7 @@ function parseMap(content) {
       lineNumber: line12
     };
     if (regionScope !== void 0) region.scope = regionScope;
-    if (scoreNum !== void 0) region.score = scoreNum;
+    if (valueNum !== void 0) region.value = valueNum;
     regions.push(region);
   }
   function handlePoi(rest, line12, indent) {
@@ -16118,24 +16132,76 @@ function parseMap(content) {
     open.poi = { poi, indent };
   }
   function handleRoute(rest, line12, indent) {
-    const meta = rest ? splitNameAndMeta(rest, registry(), aliasMap).meta : {};
-    const route = { stops: [], meta, lineNumber: line12 };
+    const split = rest ? splitNameAndMeta(
+      rest,
+      registry(),
+      aliasMap,
+      void 0,
+      diagnostics,
+      line12
+    ) : { name: "", meta: {}, alias: void 0 };
+    const pos = parsePos(split.name, line12);
+    if (!pos || pos.kind === "name" && !pos.name) {
+      pushError(
+        line12,
+        "route requires an origin: `route <origin> [style: arc]`."
+      );
+      return;
+    }
+    const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
+    const originLabel = meta["label"];
+    const originValue = meta["value"];
+    const style = meta["style"] === "arc" ? "arc" : "straight";
+    const route = {
+      origin: pos,
+      ...split.alias !== void 0 && { originAlias: split.alias },
+      ...originLabel !== void 0 && { originLabel },
+      ...originValue !== void 0 && { originValue },
+      originTags: tags,
+      style,
+      legs: [],
+      lineNumber: line12
+    };
     routes.push(route);
     open.route = { route, indent };
   }
-  function parseStop(trimmed, line12) {
-    const split = splitNameAndMeta(trimmed, registry(), aliasMap);
-    const ref = parsePos(split.name, line12) ?? {
+  function parseLeg(trimmed, line12, headerStyle) {
+    let arrowStyle = "straight";
+    let label;
+    let rest = trimmed;
+    const m = trimmed.match(LEG_ARROW_RE);
+    if (m) {
+      const arr = classifyArrow(m[1], line12);
+      arrowStyle = arr.style;
+      label = arr.label;
+      rest = m[2];
+    }
+    const split = splitNameAndMeta(
+      rest,
+      registry(),
+      aliasMap,
+      void 0,
+      diagnostics,
+      line12
+    );
+    const pos = parsePos(split.name, line12) ?? {
       kind: "name",
       name: split.name
     };
-    const stop = {
-      ref,
-      meta: split.meta,
+    const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
+    const value = meta["value"];
+    const destLabel = meta["label"];
+    const style = arrowStyle === "arc" || headerStyle === "arc" ? "arc" : "straight";
+    return {
+      ...label !== void 0 && { label },
+      style,
+      ...value !== void 0 && { value },
+      dest: pos,
+      ...split.alias !== void 0 && { destAlias: split.alias },
+      ...destLabel !== void 0 && { destLabel },
+      destTags: tags,
       lineNumber: line12
     };
-    if (split.alias) stop.alias = split.alias;
-    return stop;
   }
   function handleEdges(trimmed, line12) {
     const parts = trimmed.split(ARROW_SPLIT);
@@ -16237,7 +16303,7 @@ function partitionMeta(meta, tagGroupNames) {
 function poiName(pos) {
   return pos.kind === "name" ? pos.name : void 0;
 }
-var COORD_RE, NUMERIC_LEAD_RE, SCOPE_RE, ARROW_SPLIT, HUB_RE, AT_RE, DIRECTIVE_SET;
+var COORD_RE, NUMERIC_LEAD_RE, SCOPE_RE, ARROW_SPLIT, HUB_RE, LEG_ARROW_RE, AT_RE, DIRECTIVE_SET;
 var init_parser12 = __esm({
   "src/map/parser.ts"() {
     "use strict";
@@ -16251,12 +16317,14 @@ var init_parser12 = __esm({
     SCOPE_RE = /^[A-Z]{2}(?:-[A-Z0-9]{1,3})?$/;
     ARROW_SPLIT = /\s+(-[^>]*?->|->|~[^>]*?~>|~>|--)\s+/;
     HUB_RE = /^(->|~>)\s+(.+)$/;
+    LEG_ARROW_RE = /^(-[^>]*?->|->|~[^>]*?~>|~>|--)\s+(.+)$/;
     AT_RE = /(^|[\s,])at\s*:/i;
     DIRECTIVE_SET = /* @__PURE__ */ new Set([
       "region",
       "projection",
-      "metric",
-      "size-metric",
+      "region-metric",
+      "poi-metric",
+      "flow-metric",
       "scale",
       "region-labels",
       "poi-labels",
@@ -45854,6 +45922,11 @@ var resolver_exports = {};
 __export(resolver_exports, {
   resolveMap: () => resolveMap
 });
+function usStateFromBareScope(scope) {
+  if (!scope) return null;
+  const up = scope.toUpperCase();
+  return US_STATE_POSTAL.has(up) ? `US-${up}` : null;
+}
 function looksUS(lat, lon) {
   if (lat < 15 || lat > 72) return false;
   return lon >= -180 && lon <= -64 || lon >= 172;
@@ -45903,9 +45976,9 @@ function resolveMap(parsed, data) {
     const f = fold(r.name);
     return usStateIndex.has(f) && !countryIndex.has(f);
   }) || parsed.regions.some(
-    (r) => r.scope === "US" || r.scope?.startsWith("US-")
+    (r) => r.scope === "US" || r.scope?.startsWith("US-") || usStateFromBareScope(r.scope) !== null
   ) || parsed.pois.some(
-    (p) => p.pos.kind === "name" && p.pos.scope?.startsWith("US-")
+    (p) => p.pos.kind === "name" && (p.pos.scope?.startsWith("US-") || usStateFromBareScope(p.pos.scope) !== null)
   );
   const regions = [];
   const seenRegion = /* @__PURE__ */ new Map();
@@ -45972,7 +46045,7 @@ function resolveMap(parsed, data) {
       iso: chosen.id,
       name: chosen.name,
       layer: chosen.layer,
-      ...r.score !== void 0 && { score: r.score },
+      ...r.value !== void 0 && { value: r.value },
       tags: r.tags,
       meta: r.meta,
       lineNumber: r.lineNumber
@@ -46030,9 +46103,10 @@ function resolveMap(parsed, data) {
     let cands = idxs.map((i) => data.gazetteer.cities[i]);
     const scopeUse = scope ?? scopeHint;
     if (scopeUse) {
-      const isSub = /^[A-Za-z]{2}-/.test(scopeUse);
+      const bareState = usStateFromBareScope(scopeUse);
+      const subScope = /^[A-Za-z]{2}-/.test(scopeUse) ? scopeUse : bareState;
       const filtered = cands.filter(
-        (c2) => isSub ? c2[5] === scopeUse : c2[2] === scopeUse
+        (c2) => subScope ? c2[5] === subScope : c2[2] === scopeUse
       );
       if (filtered.length) cands = filtered;
       else if (scope) {
@@ -46161,33 +46235,89 @@ function resolveMap(parsed, data) {
       lineNumber: e.lineNumber
     });
   }
-  const routes = [];
-  for (const rt of parsed.routes) {
-    const stopIds = [];
-    for (const stop of rt.stops) {
-      let id;
-      if (stop.ref.kind === "coords") {
-        id = stop.alias ? fold(stop.alias) : `@${stop.ref.lat},${stop.ref.lon}`;
-        if (!looksUS(stop.ref.lat, stop.ref.lon)) anyNonUsPoi = true;
-        if (!registry.has(id)) {
-          const poi = {
+  const resolveStop = (pos, alias, label, tags, sizeValue, line12) => {
+    const meta = sizeValue !== void 0 ? { value: sizeValue } : {};
+    if (pos.kind === "coords") {
+      const id = alias ? fold(alias) : `@${pos.lat},${pos.lon}`;
+      if (!looksUS(pos.lat, pos.lon)) anyNonUsPoi = true;
+      if (!registry.has(id)) {
+        registerPoi(
+          id,
+          {
             id,
-            ...stop.alias !== void 0 && { name: stop.alias },
-            lat: stop.ref.lat,
-            lon: stop.ref.lon,
-            tags: {},
-            meta: stop.meta,
-            lineNumber: stop.lineNumber,
-            implicit: true
-          };
-          registerPoi(id, poi, stop.lineNumber);
-        }
-      } else {
-        id = stop.alias && registry.has(fold(stop.alias)) ? fold(stop.alias) : resolveEndpoint2(stop.ref.name, stop.lineNumber);
+            ...alias !== void 0 && { name: alias },
+            lat: pos.lat,
+            lon: pos.lon,
+            ...label !== void 0 && { label },
+            tags,
+            meta,
+            lineNumber: line12
+          },
+          line12
+        );
       }
-      if (id) stopIds.push(id);
+      return id;
+    }
+    const f = fold(pos.name);
+    if (registry.has(f)) return f;
+    const aliased = declaredByName.get(f);
+    if (aliased) return aliased;
+    const got = lookupName(pos.name, pos.scope, line12, inferredCountry, true);
+    if (got.kind !== "ok") return null;
+    noteCountry(got.iso);
+    registerPoi(
+      f,
+      {
+        id: f,
+        name: pos.name,
+        lat: got.lat,
+        lon: got.lon,
+        ...label !== void 0 && { label },
+        tags,
+        meta,
+        lineNumber: line12
+      },
+      line12
+    );
+    return f;
+  };
+  const routes = [];
+  for (const rt of parsed.routes) {
+    const originId = resolveStop(
+      rt.origin,
+      rt.originAlias,
+      rt.originLabel,
+      rt.originTags,
+      rt.originValue,
+      rt.lineNumber
+    );
+    if (!originId) continue;
+    const stopIds = [originId];
+    const legs = [];
+    let prevId = originId;
+    for (const leg of rt.legs) {
+      const destId = resolveStop(
+        leg.dest,
+        leg.destAlias,
+        leg.destLabel,
+        leg.destTags,
+        void 0,
+        // a leg's `value:` is leg thickness, not the dest's size
+        leg.lineNumber
+      );
+      if (!destId) continue;
+      legs.push({
+        fromId: prevId,
+        toId: destId,
+        ...leg.label !== void 0 && { label: leg.label },
+        style: leg.style,
+        ...leg.value !== void 0 && { value: leg.value },
+        lineNumber: leg.lineNumber
+      });
+      if (!stopIds.includes(destId)) stopIds.push(destId);
+      prevId = destId;
     }
-    routes.push({ stopIds, meta: rt.meta, lineNumber: rt.lineNumber });
+    routes.push({ stopIds, legs, lineNumber: rt.lineNumber });
   }
   const subdivisions = [];
   if (usSubdivisionReferenced || parsed.directives.region === "us-states")
@@ -46279,7 +46409,7 @@ function firstError(diags) {
   const e = diags.find((d) => d.severity === "error");
   return e ? formatDgmoError(e) : null;
 }
-var WORLD_SPAN, MERCATOR_MAX_SPAN, PAD_FRACTION, WORLD_LAT_SOUTH, WORLD_LAT_NORTH, REGION_ALIASES;
+var WORLD_SPAN, MERCATOR_MAX_SPAN, PAD_FRACTION, WORLD_LAT_SOUTH, WORLD_LAT_NORTH, REGION_ALIASES, US_STATE_POSTAL;
 var init_resolver2 = __esm({
   "src/map/resolver.ts"() {
     "use strict";
@@ -46311,6 +46441,59 @@ var init_resolver2 = __esm({
       "north macedonia": "macedonia",
       "czech republic": "czechia"
     };
+    US_STATE_POSTAL = /* @__PURE__ */ new Set([
+      "AL",
+      "AK",
+      "AZ",
+      "AR",
+      "CA",
+      "CO",
+      "CT",
+      "DE",
+      "FL",
+      "GA",
+      "HI",
+      "ID",
+      "IL",
+      "IN",
+      "IA",
+      "KS",
+      "KY",
+      "LA",
+      "ME",
+      "MD",
+      "MA",
+      "MI",
+      "MN",
+      "MS",
+      "MO",
+      "MT",
+      "NE",
+      "NV",
+      "NH",
+      "NJ",
+      "NM",
+      "NY",
+      "NC",
+      "ND",
+      "OH",
+      "OK",
+      "OR",
+      "PA",
+      "RI",
+      "SC",
+      "SD",
+      "TN",
+      "TX",
+      "UT",
+      "VT",
+      "VA",
+      "WA",
+      "WV",
+      "WI",
+      "WY",
+      "DC"
+    ]);
   }
 });
 
@@ -46458,10 +46641,18 @@ function projectionFor(family) {
       return geoEquirectangular();
   }
 }
-function mapBackgroundColor(palette) {
+function mapBackgroundColor(palette, isDark = false, dataActive = false) {
+  if (dataActive)
+    return mix(
+      palette.colors.gray,
+      palette.bg,
+      isDark ? MUTED_WATER_DARK : MUTED_WATER_LIGHT
+    );
   return mix(palette.colors.blue, palette.bg, WATER_TINT);
 }
-function mapNeutralLandColor(palette, isDark) {
+function mapNeutralLandColor(palette, isDark, dataActive = false) {
+  if (dataActive)
+    return isDark ? mix(palette.colors.gray, palette.bg, MUTED_LAND_DARK) : palette.bg;
   return mix(
     palette.colors.green,
     palette.bg,
@@ -46487,28 +46678,19 @@ function layoutMap(resolved, data, size, opts) {
     }
   }
   const usLayer = wantsUsStates ? decodeLayer(data.usStates) : null;
-  const landTint = isDark ? LAND_TINT_DARK : LAND_TINT_LIGHT;
-  const neutralFill = mix(palette.colors.green, palette.bg, landTint);
-  const water = mapBackgroundColor(palette);
   const usContext = usLayer !== null;
-  const foreignFill = mix(
-    palette.colors.gray,
-    palette.bg,
-    isDark ? FOREIGN_TINT_DARK : FOREIGN_TINT_LIGHT
-  );
   const regionStroke = isDark ? mix(palette.bg, palette.text, 78) : mix(palette.text, palette.bg, 78);
-  const scores = resolved.regions.filter((r) => r.score !== void 0).map((r) => r.score);
+  const values = resolved.regions.filter((r) => r.value !== void 0).map((r) => r.value);
   const scaleOverride = resolved.directives.scale;
-  const rampMin = scaleOverride ? scaleOverride.min : Math.min(...scores);
-  const rampMax = scaleOverride ? scaleOverride.max : Math.max(...scores);
+  const rampMin = scaleOverride ? scaleOverride.min : Math.min(...values);
+  const rampMax = scaleOverride ? scaleOverride.max : Math.max(...values);
   const rampHue = palette.colors.red;
-  const hasRamp = scores.length > 0;
-  const SCORE_NAME = hasRamp ? resolved.directives.metric?.trim() || "Score" : null;
+  const hasRamp = values.length > 0;
+  const VALUE_NAME = hasRamp ? resolved.directives.regionMetric?.trim() || "Value" : null;
   const matchColorGroup = (v) => {
     const lv = v.trim().toLowerCase();
     if (lv === "none") return null;
-    if (SCORE_NAME && (lv === "score" || lv === SCORE_NAME.toLowerCase()))
-      return SCORE_NAME;
+    if (lv === VALUE_NAME?.toLowerCase()) return VALUE_NAME;
     const tg = resolved.tagGroups.find((g) => g.name.toLowerCase() === lv);
     return tg ? tg.name : v;
   };
@@ -46519,11 +46701,19 @@ function layoutMap(resolved, data, size, opts) {
   } else if (resolved.directives.activeTag !== void 0) {
     activeGroup = matchColorGroup(resolved.directives.activeTag);
   } else {
-    activeGroup = SCORE_NAME ?? (resolved.tagGroups.length > 0 ? resolved.tagGroups[0].name : null);
+    activeGroup = VALUE_NAME ?? (resolved.tagGroups.length > 0 ? resolved.tagGroups[0].name : null);
   }
-  const activeIsScore = SCORE_NAME !== null && activeGroup === SCORE_NAME;
+  const activeIsScore = VALUE_NAME !== null && activeGroup === VALUE_NAME;
+  const mutedBasemap = resolved.directives.basemapStyle === "muted" ? true : resolved.directives.basemapStyle === "natural" ? false : activeGroup !== null;
+  const neutralFill = mapNeutralLandColor(palette, isDark, mutedBasemap);
+  const water = mapBackgroundColor(palette, isDark, mutedBasemap);
+  const foreignFill = mix(
+    palette.colors.gray,
+    palette.bg,
+    mutedBasemap ? isDark ? MUTED_FOREIGN_DARK : MUTED_FOREIGN_LIGHT : isDark ? FOREIGN_TINT_DARK : FOREIGN_TINT_LIGHT
+  );
   const rampBase = isDark ? mix(palette.surface, palette.text, 28) : palette.bg;
-  const fillForScore = (s) => {
+  const fillForValue = (s) => {
     const t = rampMax > rampMin ? (s - rampMin) / (rampMax - rampMin) : 1;
     const pct = RAMP_FLOOR + Math.max(0, Math.min(1, t)) * (100 - RAMP_FLOOR);
     return mix(rampHue, rampBase, pct);
@@ -46548,7 +46738,7 @@ function layoutMap(resolved, data, size, opts) {
   };
   const regionFill = (r) => {
     if (activeIsScore) {
-      return r.score !== void 0 ? fillForScore(r.score) : neutralFill;
+      return r.value !== void 0 ? fillForValue(r.value) : neutralFill;
     }
     return tagFill(r.tags, activeGroup) ?? neutralFill;
   };
@@ -46760,7 +46950,7 @@ function layoutMap(resolved, data, size, opts) {
         stroke: regionStroke,
         lineNumber,
         layer: "us-state",
-        ...r?.score !== void 0 && { score: r.score },
+        ...r?.value !== void 0 && { value: r.value },
         ...r && Object.keys(r.tags).length > 0 && { tags: r.tags }
       });
       const ctr = geoPath(proj).centroid(f);
@@ -46876,6 +47066,8 @@ function layoutMap(resolved, data, size, opts) {
       if (layerKind === "us-state" && usContext && INSET_STATES.has(iso))
         continue;
       if (layerKind === "country" && usContext && iso === "US") continue;
+      if (layerKind === "country" && iso === "AQ" && !regionById.has("AQ"))
+        continue;
       const r = regionById.get(iso);
       const viewF = shouldCull ? cullFeatureToView(f) : dropFrameFillers(f);
       if (!viewF) continue;
@@ -46901,7 +47093,7 @@ function layoutMap(resolved, data, size, opts) {
         lineNumber,
         layer,
         ...label !== void 0 && { label },
-        ...isThisLayer && r.score !== void 0 && { score: r.score },
+        ...isThisLayer && r.value !== void 0 && { value: r.value },
         ...isThisLayer && Object.keys(r.tags).length > 0 && { tags: r.tags }
       });
     }
@@ -46936,11 +47128,11 @@ function layoutMap(resolved, data, size, opts) {
       rivers.push({ d, color: riverColor, width: RIVER_WIDTH });
     }
   }
-  const sizeVals = resolved.pois.map((p) => Number(p.meta["size"])).filter((n) => Number.isFinite(n) && n > 0);
+  const sizeVals = resolved.pois.map((p) => Number(p.meta["value"])).filter((n) => Number.isFinite(n) && n > 0);
   const sizeMin = sizeVals.length ? Math.min(...sizeVals) : 0;
   const sizeMax = sizeVals.length ? Math.max(...sizeVals) : 0;
   const radiusFor = (p) => {
-    const v = Number(p.meta["size"]);
+    const v = Number(p.meta["value"]);
     if (!Number.isFinite(v) || v <= 0 || sizeMax <= 0) return R_DEFAULT;
     const t = sizeMax > sizeMin ? (Math.sqrt(v) - Math.sqrt(sizeMin)) / (Math.sqrt(sizeMax) - Math.sqrt(sizeMin)) : 1;
     return R_MIN + Math.max(0, Math.min(1, t)) * (R_MAX - R_MIN);
@@ -47007,7 +47199,8 @@ function layoutMap(resolved, data, size, opts) {
         lineNumber: e.p.lineNumber,
         implicit: !!e.p.implicit,
         isOrigin: originIds.has(e.p.id),
-        ...num !== void 0 && { routeNumber: num }
+        ...num !== void 0 && { routeNumber: num },
+        ...Object.keys(e.p.tags).length > 0 && { tags: e.p.tags }
       });
     });
   }
@@ -47043,26 +47236,40 @@ function layoutMap(resolved, data, size, opts) {
     const by = b.cy - (b.cy - py) / tb * trimB;
     return `M${ax},${ay}Q${px},${py} ${bx},${by}`;
   };
+  const routeLegVals = resolved.routes.flatMap((rt) => rt.legs).map((l) => Number(l.value)).filter((n) => Number.isFinite(n) && n > 0);
+  const rlMin = routeLegVals.length ? Math.min(...routeLegVals) : 0;
+  const rlMax = routeLegVals.length ? Math.max(...routeLegVals) : 0;
+  const routeWidthFor = (v) => {
+    if (!Number.isFinite(v) || v <= 0 || rlMax <= 0) return W_MIN;
+    const t = rlMax > rlMin ? (v - rlMin) / (rlMax - rlMin) : 1;
+    return W_MIN + t * (W_MAX - W_MIN);
+  };
   for (const rt of resolved.routes) {
-    const curved = rt.meta["style"] === "arc";
-    for (let i = 1; i < rt.stopIds.length; i++) {
-      const a = poiScreen.get(rt.stopIds[i - 1]);
-      const b = poiScreen.get(rt.stopIds[i]);
+    for (const leg of rt.legs) {
+      const a = poiScreen.get(leg.fromId);
+      const b = poiScreen.get(leg.toId);
       if (!a || !b) continue;
+      const mx = (a.cx + b.cx) / 2;
+      const my = (a.cy + b.cy) / 2;
       legs.push({
-        d: legPath(a, b, curved, 0),
-        width: W_MIN,
+        d: legPath(a, b, leg.style === "arc", 0),
+        width: routeWidthFor(Number(leg.value)),
         color: mix(palette.text, palette.bg, 72),
         arrow: true,
-        lineNumber: rt.lineNumber
+        lineNumber: leg.lineNumber,
+        ...leg.label !== void 0 && {
+          label: leg.label,
+          labelX: mx,
+          labelY: my - 4
+        }
       });
     }
   }
-  const weightVals = resolved.edges.map((e) => Number(e.meta["weight"])).filter((n) => Number.isFinite(n) && n > 0);
+  const weightVals = resolved.edges.map((e) => Number(e.meta["value"])).filter((n) => Number.isFinite(n) && n > 0);
   const wMin = weightVals.length ? Math.min(...weightVals) : 0;
   const wMax = weightVals.length ? Math.max(...weightVals) : 0;
   const widthFor = (e) => {
-    const v = Number(e.meta["weight"]);
+    const v = Number(e.meta["value"]);
     if (!Number.isFinite(v) || v <= 0 || wMax <= 0) return W_MIN;
     const t = wMax > wMin ? (v - wMin) / (wMax - wMin) : 1;
     return W_MIN + t * (W_MAX - W_MIN);
@@ -47325,8 +47532,8 @@ function layoutMap(resolved, data, size, opts) {
         activeGroup,
         ...hasRamp && {
           ramp: {
-            ...resolved.directives.metric !== void 0 && {
-              metric: resolved.directives.metric
+            ...resolved.directives.regionMetric !== void 0 && {
+              metric: resolved.directives.regionMetric
             },
             min: rampMin,
             max: rampMax,
@@ -47354,7 +47561,7 @@ function layoutMap(resolved, data, size, opts) {
     insetRegions
   };
 }
-var FIT_PAD, RAMP_FLOOR, R_DEFAULT, R_MIN, R_MAX, W_MIN, W_MAX, FONT, COLO_EPS, LAND_TINT_LIGHT, LAND_TINT_DARK, TAG_TINT_LIGHT, TAG_TINT_DARK, WATER_TINT, RIVER_WIDTH, FOREIGN_TINT_LIGHT, FOREIGN_TINT_DARK, COLO_R, GOLDEN_ANGLE, FAN_STEP, ARC_CURVE_FRAC, usConusProjection, alaskaProjection, hawaiiProjection, INSET_STATES, US_NON_CONUS;
+var FIT_PAD, RAMP_FLOOR, R_DEFAULT, R_MIN, R_MAX, W_MIN, W_MAX, FONT, COLO_EPS, LAND_TINT_LIGHT, LAND_TINT_DARK, TAG_TINT_LIGHT, TAG_TINT_DARK, WATER_TINT, RIVER_WIDTH, FOREIGN_TINT_LIGHT, FOREIGN_TINT_DARK, MUTED_WATER_LIGHT, MUTED_WATER_DARK, MUTED_FOREIGN_LIGHT, MUTED_FOREIGN_DARK, MUTED_LAND_DARK, COLO_R, GOLDEN_ANGLE, FAN_STEP, ARC_CURVE_FRAC, usConusProjection, alaskaProjection, hawaiiProjection, INSET_STATES, US_NON_CONUS;
 var init_layout15 = __esm({
   "src/map/layout.ts"() {
     "use strict";
@@ -47379,6 +47586,11 @@ var init_layout15 = __esm({
     RIVER_WIDTH = 1.3;
     FOREIGN_TINT_LIGHT = 30;
     FOREIGN_TINT_DARK = 62;
+    MUTED_WATER_LIGHT = 14;
+    MUTED_WATER_DARK = 10;
+    MUTED_FOREIGN_LIGHT = 28;
+    MUTED_FOREIGN_DARK = 16;
+    MUTED_LAND_DARK = 24;
     COLO_R = 9;
     GOLDEN_ANGLE = 2.399963229728653;
     FAN_STEP = 16;
@@ -47433,7 +47645,7 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
     const p = g.append("path").attr("d", r.d).attr("fill", r.fill).attr("stroke", r.stroke).attr("stroke-width", strokeWidth);
     if (r.layer !== "base") {
       p.classed("dgmo-map-region", true).attr("data-region", r.id);
-      if (r.score !== void 0) p.attr("data-score", r.score);
+      if (r.value !== void 0) p.attr("data-value", r.value);
       if (r.tags) {
         for (const [group, value] of Object.entries(r.tags)) {
           p.attr(`data-tag-${group.toLowerCase()}`, value.toLowerCase());
@@ -47494,6 +47706,11 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
       gPois.append("circle").attr("cx", poi.cx).attr("cy", poi.cy).attr("r", poi.r + 3).attr("fill", "none").attr("stroke", poi.stroke).attr("stroke-width", 1.5);
     }
     const c = gPois.append("circle").attr("cx", poi.cx).attr("cy", poi.cy).attr("r", poi.r).attr("fill", poi.fill).attr("stroke", poi.stroke).attr("stroke-width", 1).attr("data-line-number", poi.lineNumber).attr("data-poi", poi.id);
+    if (poi.tags) {
+      for (const [group, value] of Object.entries(poi.tags)) {
+        c.attr(`data-tag-${group.toLowerCase()}`, value.toLowerCase());
+      }
+    }
     if (onClickItem) {
       c.style("cursor", "pointer").on(
         "click",
@@ -47543,7 +47760,7 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
     const legendG = svg.append("g").attr("class", "dgmo-map-legend").attr("transform", `translate(0, ${legendY})`);
     const ramp = layout.legend.ramp;
     const scoreGroup = ramp ? {
-      name: ramp.metric?.trim() || "Score",
+      name: ramp.metric?.trim() || "Value",
       entries: [],
       gradient: {
         min: ramp.min,
@@ -58210,7 +58427,7 @@ var COMPLETION_REGISTRY = /* @__PURE__ */ new Map([
   [
     "map",
     // Geographic map directives (§24B.2/.7). `poi`/`route` are content
-    // keywords, not directives; metadata keys (score/size/label) live in the
+    // keywords, not directives; metadata keys (value/label/style) live in the
     // reserved-key registry.
     withGlobals({
       region: {
@@ -58221,9 +58438,14 @@ var COMPLETION_REGISTRY = /* @__PURE__ */ new Map([
         description: "Override the auto projection",
         values: ["equirectangular", "natural-earth", "albers-usa", "mercator"]
       },
-      metric: { description: "Label for the region score ramp" },
-      "size-metric": { description: "Label for the POI size channel" },
-      scale: { description: "Override score ramp anchors: scale <min> <max>" },
+      "region-metric": { description: "Label for the region value ramp" },
+      "poi-metric": {
+        description: "Label for the POI value (marker size) channel"
+      },
+      "flow-metric": {
+        description: "Label for the edge/leg value (thickness) channel"
+      },
+      scale: { description: "Override value ramp anchors: scale <min> <max>" },
       "region-labels": {
         description: "Subdivision name labels",
         values: ["full", "abbrev", "off"]