@diagrammo/dgmo 0.20.3 → 0.21.1

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,20 @@ function parseMap(content) {
           );
         d.projection = value;
         break;
-      case "metric":
-        dup(d.metric);
-        d.metric = value;
+      case "region-metric": {
+        dup(d.regionMetric);
+        const { label: rmLabel, colorName: rmColor } = peelTrailingColorName(value);
+        d.regionMetric = rmLabel;
+        if (rmColor) d.regionMetricColor = rmColor;
+        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 +15995,21 @@ function parseMap(content) {
       case "no-legend":
         d.noLegend = true;
         break;
+      case "no-insets":
+        d.noInsets = true;
+        break;
+      case "relief":
+        d.relief = 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 +16087,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 +16112,8 @@ 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;
+    if (split.color) region.color = split.color;
     regions.push(region);
   }
   function handlePoi(rest, line12, indent) {
@@ -16114,28 +16138,81 @@ function parseMap(content) {
     const poi = { pos, tags, meta, lineNumber: line12 };
     if (split.alias) poi.alias = split.alias;
     if (label !== void 0) poi.label = label;
+    if (split.color) poi.color = split.color;
     pois.push(poi);
     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 +16314,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 +16328,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",
@@ -16264,6 +16343,8 @@ var init_parser12 = __esm({
       "default-state",
       "active-tag",
       "no-legend",
+      "no-insets",
+      "relief",
       "subtitle",
       "caption"
     ]);
@@ -45775,7 +45856,7 @@ var init_renderer15 = __esm({
 
 // src/map/geo.ts
 import { feature } from "topojson-client";
-import { geoBounds } from "d3-geo";
+import { geoBounds, geoArea } from "d3-geo";
 function geomObject(topo) {
   const key = Object.keys(topo.objects)[0];
   return topo.objects[key];
@@ -45792,6 +45873,84 @@ function featureIndex(topo) {
   }
   return idx;
 }
+function decodeFeatures(topo) {
+  return geomObject(topo).geometries.map((g) => {
+    const f = feature(topo, g);
+    return {
+      type: "Feature",
+      id: g.id,
+      properties: g.properties,
+      geometry: f.geometry
+    };
+  });
+}
+function pointInRing(lon, lat, ring) {
+  let inside = false;
+  for (let i = 0, j = ring.length - 1; i < ring.length; j = i++) {
+    const xi = ring[i][0];
+    const yi = ring[i][1];
+    const xj = ring[j][0];
+    const yj = ring[j][1];
+    const intersect = yi > lat !== yj > lat && lon < (xj - xi) * (lat - yi) / (yj - yi) + xi;
+    if (intersect) inside = !inside;
+  }
+  return inside;
+}
+function pointOnRingEdge(lon, lat, ring) {
+  for (let i = 0, j = ring.length - 1; i < ring.length; j = i++) {
+    const xi = ring[i][0];
+    const yi = ring[i][1];
+    const xj = ring[j][0];
+    const yj = ring[j][1];
+    if (lon < Math.min(xi, xj) - EDGE_EPS || lon > Math.max(xi, xj) + EDGE_EPS)
+      continue;
+    if (lat < Math.min(yi, yj) - EDGE_EPS || lat > Math.max(yi, yj) + EDGE_EPS)
+      continue;
+    const cross = (xj - xi) * (lat - yi) - (yj - yi) * (lon - xi);
+    if (Math.abs(cross) <= EDGE_EPS) return true;
+  }
+  return false;
+}
+function pointInGeometry(geometry, lon, lat) {
+  const g = geometry;
+  if (!g) return false;
+  const polys = g.type === "Polygon" ? [g.coordinates] : g.type === "MultiPolygon" ? g.coordinates : [];
+  for (const rings of polys) {
+    if (!rings.length) continue;
+    if (pointOnRingEdge(lon, lat, rings[0])) return true;
+    if (!pointInRing(lon, lat, rings[0])) continue;
+    let inHole = false;
+    for (let h = 1; h < rings.length; h++) {
+      if (pointInRing(lon, lat, rings[h]) && !pointOnRingEdge(lon, lat, rings[h])) {
+        inHole = true;
+        break;
+      }
+    }
+    if (!inHole) return true;
+  }
+  return false;
+}
+function regionAt(lonLat, countries, states) {
+  const lon = lonLat[0];
+  const lat = lonLat[1];
+  let country = null;
+  for (const f of countries) {
+    if (pointInGeometry(f.geometry, lon, lat)) {
+      country = { iso: f.id, name: f.properties.name };
+      break;
+    }
+  }
+  let state = null;
+  if (country?.iso === "US" && states) {
+    for (const f of states) {
+      if (pointInGeometry(f.geometry, lon, lat)) {
+        state = { iso: f.id, name: f.properties.name };
+        break;
+      }
+    }
+  }
+  return { country, state };
+}
 function featureBbox(topo, geomId) {
   const geom = geomObject(topo).geometries.find((g) => g.id === geomId);
   if (!geom) return null;
@@ -45803,6 +45962,74 @@ function featureBbox(topo, geomId) {
     [b[1][0], b[1][1]]
   ];
 }
+function explodePolygons(gj) {
+  const g = gj.geometry ?? gj;
+  const t = g.type;
+  const coords = g.coordinates;
+  if (t === "Polygon") {
+    return [
+      { type: "Feature", geometry: { type: "Polygon", coordinates: coords } }
+    ];
+  }
+  if (t === "MultiPolygon") {
+    return coords.map((rings) => ({
+      type: "Feature",
+      geometry: { type: "Polygon", coordinates: rings }
+    }));
+  }
+  return [];
+}
+function bboxGap(a, b) {
+  const lonGap = Math.max(0, a[0][0] - b[1][0], b[0][0] - a[1][0]);
+  const latGap = Math.max(0, a[0][1] - b[1][1], b[0][1] - a[1][1]);
+  return Math.max(lonGap, latGap);
+}
+function featureBboxPrimary(topo, geomId) {
+  const geom = geomObject(topo).geometries.find((g) => g.id === geomId);
+  if (!geom) return null;
+  const gj = feature(topo, geom);
+  const parts = explodePolygons(gj);
+  if (parts.length <= 1) return featureBbox(topo, geomId);
+  const polys = parts.map((p) => {
+    const b = geoBounds(p);
+    if (!b || !Number.isFinite(b[0][0])) return null;
+    const wraps = b[1][0] < b[0][0];
+    const bbox = [
+      [b[0][0], b[0][1]],
+      [b[1][0], b[1][1]]
+    ];
+    return { bbox, area: geoArea(p), wraps };
+  }).filter(
+    (p) => p !== null
+  );
+  if (polys.length <= 1 || polys.some((p) => p.wraps))
+    return featureBbox(topo, geomId);
+  const maxArea = Math.max(...polys.map((p) => p.area));
+  const anchor = polys.find((p) => p.area === maxArea);
+  const cluster = [
+    [anchor.bbox[0][0], anchor.bbox[0][1]],
+    [anchor.bbox[1][0], anchor.bbox[1][1]]
+  ];
+  const remaining = polys.filter((p) => p !== anchor);
+  let added = true;
+  while (added) {
+    added = false;
+    for (let i = remaining.length - 1; i >= 0; i--) {
+      const p = remaining[i];
+      const near = bboxGap(p.bbox, cluster) <= DETACH_GAP_DEG;
+      const large = p.area >= DETACH_AREA_FRAC * maxArea;
+      if (near || large) {
+        cluster[0][0] = Math.min(cluster[0][0], p.bbox[0][0]);
+        cluster[0][1] = Math.min(cluster[0][1], p.bbox[0][1]);
+        cluster[1][0] = Math.max(cluster[1][0], p.bbox[1][0]);
+        cluster[1][1] = Math.max(cluster[1][1], p.bbox[1][1]);
+        remaining.splice(i, 1);
+        added = true;
+      }
+    }
+  }
+  return cluster;
+}
 function unionExtent(boxes, points) {
   const lats = [];
   const lons = [];
@@ -45841,11 +46068,14 @@ function unionLongitudes(lons) {
   }
   return { west: pts[gapIdx], east: pts[gapIdx - 1] + 360 };
 }
-var fold;
+var fold, EDGE_EPS, DETACH_GAP_DEG, DETACH_AREA_FRAC;
 var init_geo = __esm({
   "src/map/geo.ts"() {
     "use strict";
     fold = (s) => s.normalize("NFD").replace(/\p{Diacritic}/gu, "").toLowerCase().trim();
+    EDGE_EPS = 1e-9;
+    DETACH_GAP_DEG = 10;
+    DETACH_AREA_FRAC = 0.25;
   }
 });
 
@@ -45854,6 +46084,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 +46138,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();
@@ -45944,12 +46179,12 @@ function resolveMap(parsed, data) {
         chosen = { ...inState, layer: "us-state" };
       } else {
         chosen = { ...inCountry, layer: "country" };
+        warn(
+          r.lineNumber,
+          `"${r.name}" is both a country and a US state \u2014 resolved as ${chosen.layer} (${chosen.id}). Pin it with an ISO code (${inState.id} / ${inCountry.id}) or name + scope ("${r.name} US" / "${r.name} ${inCountry.id}").`,
+          "W_MAP_REGION_AMBIGUOUS"
+        );
       }
-      warn(
-        r.lineNumber,
-        `"${r.name}" is both a country and a US state \u2014 resolved as ${chosen.layer} (${chosen.id}). Pin it with an ISO code (${inState.id} / ${inCountry.id}) or name + scope ("${r.name} US" / "${r.name} ${inCountry.id}").`,
-        "W_MAP_REGION_AMBIGUOUS"
-      );
     } else if (inState) {
       chosen = { ...inState, layer: "us-state" };
     } else if (inCountry) {
@@ -45972,7 +46207,8 @@ 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 },
+      ...r.color !== void 0 && { color: r.color },
       tags: r.tags,
       meta: r.meta,
       lineNumber: r.lineNumber
@@ -46030,9 +46266,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) {
@@ -46113,6 +46350,7 @@ function resolveMap(parsed, data) {
       lat,
       lon,
       ...p.label !== void 0 && { label: p.label },
+      ...p.color !== void 0 && { color: p.color },
       tags: p.tags,
       meta: p.meta,
       lineNumber: p.lineNumber
@@ -46161,33 +46399,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")
@@ -46199,7 +46493,7 @@ function resolveMap(parsed, data) {
   }
   for (const r of regions) {
     if (r.layer === "country") {
-      const bb = featureBbox(data.worldCoarse, r.iso);
+      const bb = featureBboxPrimary(data.worldCoarse, r.iso);
       if (bb) regionBoxes.push(bb);
     }
   }
@@ -46213,6 +46507,7 @@ function resolveMap(parsed, data) {
   const lonSpan = extent2[1][0] - extent2[0][0];
   const latSpan = extent2[1][1] - extent2[0][1];
   const span = Math.max(lonSpan, latSpan);
+  const maxAbsLat = Math.max(Math.abs(extent2[0][1]), Math.abs(extent2[1][1]));
   const usDominant = (subdivisions.includes("us-states") || regions.some((r) => r.layer === "us-state")) && !regions.some((r) => r.layer === "country" && r.iso !== "US") && !anyNonUsPoi;
   let projection;
   const override = parsed.directives.projection;
@@ -46220,12 +46515,10 @@ function resolveMap(parsed, data) {
     projection = override;
   } else if (usDominant) {
     projection = "albers-usa";
-  } else if (span > WORLD_SPAN) {
+  } else if (span > WORLD_SPAN || maxAbsLat > MERCATOR_MAX_LAT) {
     projection = "equirectangular";
-  } else if (span < MERCATOR_MAX_SPAN) {
-    projection = "mercator";
   } else {
-    projection = "equirectangular";
+    projection = "mercator";
   }
   if (lonSpan >= 180) {
     extent2 = [
@@ -46279,14 +46572,14 @@ 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_LAT, PAD_FRACTION, WORLD_LAT_SOUTH, WORLD_LAT_NORTH, REGION_ALIASES, US_STATE_POSTAL;
 var init_resolver2 = __esm({
   "src/map/resolver.ts"() {
     "use strict";
     init_diagnostics();
     init_geo();
     WORLD_SPAN = 90;
-    MERCATOR_MAX_SPAN = 25;
+    MERCATOR_MAX_LAT = 80;
     PAD_FRACTION = 0.05;
     WORLD_LAT_SOUTH = -58;
     WORLD_LAT_NORTH = 78;
@@ -46311,114 +46604,59 @@ var init_resolver2 = __esm({
       "north macedonia": "macedonia",
       "czech republic": "czechia"
     };
-  }
-});
-
-// src/map/load-data.ts
-var load_data_exports = {};
-__export(load_data_exports, {
-  loadMapData: () => loadMapData
-});
-async function loadNodeBuiltins() {
-  const [{ readFile }, { fileURLToPath }, { dirname: dirname2, resolve }] = await Promise.all([
-    import("fs/promises"),
-    import("url"),
-    import("path")
-  ]);
-  return { readFile, fileURLToPath, dirname: dirname2, resolve };
-}
-async function readJson(nb, dir, name) {
-  return JSON.parse(await nb.readFile(nb.resolve(dir, name), "utf8"));
-}
-async function firstExistingDir(nb, baseDir) {
-  for (const rel of CANDIDATE_DIRS) {
-    const dir = nb.resolve(baseDir, rel);
-    try {
-      await nb.readFile(nb.resolve(dir, FILES.gazetteer), "utf8");
-      return dir;
-    } catch {
-    }
-  }
-  throw new Error(
-    `map data assets not found near ${baseDir} (looked in ${CANDIDATE_DIRS.join(", ")}). Run \`pnpm build:map-data\` and \`pnpm build\`.`
-  );
-}
-function validate(data) {
-  const topoOk = (t) => !!t && t.type === "Topology" && !!t.objects;
-  if (!topoOk(data.worldCoarse) || !topoOk(data.worldDetail) || !topoOk(data.usStates) || !data.gazetteer || !Array.isArray(data.gazetteer.cities) || !data.gazetteer.byName) {
-    throw new Error("map data assets are malformed (failed shape validation)");
-  }
-  return data;
-}
-function moduleBaseDir(nb) {
-  try {
-    const url = import.meta.url;
-    if (url) return nb.dirname(nb.fileURLToPath(url));
-  } catch {
-  }
-  if (typeof __dirname !== "undefined") return __dirname;
-  return process.cwd();
-}
-function loadMapData() {
-  cache ??= (async () => {
-    const nb = await loadNodeBuiltins();
-    const dir = await firstExistingDir(nb, moduleBaseDir(nb));
-    const [
-      worldCoarse,
-      worldDetail,
-      usStates,
-      lakes,
-      rivers,
-      naLand,
-      naLakes,
-      gazetteer
-    ] = await Promise.all([
-      readJson(nb, dir, FILES.worldCoarse),
-      readJson(nb, dir, FILES.worldDetail),
-      readJson(nb, dir, FILES.usStates),
-      // Lakes/rivers/NA assets are optional — older bundles may predate them.
-      readJson(nb, dir, FILES.lakes).catch(() => void 0),
-      readJson(nb, dir, FILES.rivers).catch(() => void 0),
-      readJson(nb, dir, FILES.naLand).catch(() => void 0),
-      readJson(nb, dir, FILES.naLakes).catch(() => void 0),
-      readJson(nb, dir, FILES.gazetteer)
+    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"
     ]);
-    return validate({
-      worldCoarse,
-      worldDetail,
-      usStates,
-      gazetteer,
-      ...lakes && { lakes },
-      ...rivers && { rivers },
-      ...naLand && { naLand },
-      ...naLakes && { naLakes }
-    });
-  })().catch((e) => {
-    cache = void 0;
-    throw e;
-  });
-  return cache;
-}
-var FILES, CANDIDATE_DIRS, cache;
-var init_load_data = __esm({
-  "src/map/load-data.ts"() {
-    "use strict";
-    FILES = {
-      worldCoarse: "world-coarse.json",
-      worldDetail: "world-detail.json",
-      usStates: "us-states.json",
-      lakes: "lakes.json",
-      rivers: "rivers.json",
-      naLand: "na-land.json",
-      naLakes: "na-lakes.json",
-      gazetteer: "gazetteer.json"
-    };
-    CANDIDATE_DIRS = [
-      "./data",
-      "./map-data",
-      "../map-data",
-      "../src/map/data"
-    ];
   }
 });
 
@@ -46458,10 +46696,14 @@ function projectionFor(family) {
       return geoEquirectangular();
   }
 }
-function mapBackgroundColor(palette) {
-  return mix(palette.colors.blue, palette.bg, WATER_TINT);
+function mapBackgroundColor(palette, isDark = false, _dataActive = false) {
+  return mix(
+    palette.colors.blue,
+    palette.bg,
+    isDark ? WATER_TINT_DARK : WATER_TINT_LIGHT
+  );
 }
-function mapNeutralLandColor(palette, isDark) {
+function mapNeutralLandColor(palette, isDark, _dataActive = false) {
   return mix(
     palette.colors.green,
     palette.bg,
@@ -46487,28 +46729,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 rampHue = palette.colors.red;
-  const hasRamp = scores.length > 0;
-  const SCORE_NAME = hasRamp ? resolved.directives.metric?.trim() || "Score" : null;
+  const rampMin = scaleOverride ? scaleOverride.min : Math.min(...values);
+  const rampMax = scaleOverride ? scaleOverride.max : Math.max(...values);
+  const rampHue = resolveColor(resolved.directives.regionMetricColor ?? "", palette) ?? palette.colors.red;
+  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 +46752,20 @@ 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 lakeStroke = mix(regionStroke, water, 45);
+  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);
@@ -46546,9 +46788,16 @@ function layoutMap(resolved, data, size, opts) {
       isDark ? TAG_TINT_DARK : TAG_TINT_LIGHT
     );
   };
+  const directFill = (name) => {
+    const hex = name ? resolveColor(name, palette) : null;
+    if (!hex) return null;
+    return mix(hex, palette.bg, isDark ? TAG_TINT_DARK : TAG_TINT_LIGHT);
+  };
   const regionFill = (r) => {
+    const direct = directFill(r.color);
+    if (direct) return direct;
     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;
   };
@@ -46600,6 +46849,7 @@ function layoutMap(resolved, data, size, opts) {
   const fitIsGlobal = fitGB[1][0] - fitGB[0][0] >= 270 || fitGB[1][1] - fitGB[0][1] >= 130;
   let path;
   let project;
+  let stretchParams = null;
   if (fitIsGlobal) {
     const cb = geoPath(projection).bounds(fitTarget);
     const bx0 = cb[0][0];
@@ -46610,6 +46860,7 @@ function layoutMap(resolved, data, size, opts) {
     const oy = fitBox[0][1];
     const sx = cw > 0 ? (fitBox[1][0] - ox) / cw : 1;
     const sy = ch > 0 ? (fitBox[1][1] - oy) / ch : 1;
+    stretchParams = { sx, sy, ox, oy, bx0, by0 };
     const stretch = (x, y) => [
       ox + (x - bx0) * sx,
       oy + (y - by0) * sy
@@ -46641,7 +46892,7 @@ function layoutMap(resolved, data, size, opts) {
   const insets = [];
   const insetRegions = [];
   const insetLabelSeeds = [];
-  if (resolved.projection === "albers-usa" && usLayer) {
+  if (resolved.projection === "albers-usa" && usLayer && !resolved.directives.noInsets) {
     const PAD = 8;
     const GAP = 12;
     const yB = height - FIT_PAD;
@@ -46672,38 +46923,14 @@ function layoutMap(resolved, data, size, opts) {
       }
       return y;
     };
-    const coastTop = (x0, xr) => {
+    const coastFloor = (x0, xr) => {
       const n = 24;
-      const pts = [];
       let maxY = -Infinity;
       for (let i = 0; i <= n; i++) {
-        const x = x0 + (xr - x0) * i / n;
-        const y = at(x);
-        if (y > -Infinity) {
-          pts.push([x, y]);
-          if (y > maxY) maxY = y;
-        }
-      }
-      if (pts.length === 0) return () => yB - height * 0.42;
-      let m = 0;
-      if (pts.length >= 2) {
-        let sx = 0, sy = 0, sxx = 0, sxy = 0;
-        for (const [x, y] of pts) {
-          sx += x;
-          sy += y;
-          sxx += x * x;
-          sxy += x * y;
-        }
-        const den = pts.length * sxx - sx * sx;
-        if (den !== 0) m = (pts.length * sxy - sx * sy) / den;
-      }
-      m = Math.max(-0.35, Math.min(0.35, m));
-      let c = -Infinity;
-      for (const [x, y] of pts) {
-        const need = y - m * x + GAP;
-        if (need > c) c = need;
-      }
-      return (x) => m * x + c;
+        const y = at(x0 + (xr - x0) * i / n);
+        if (y > maxY) maxY = y;
+      }
+      return maxY;
     };
     const placeInset = (iso, proj, boxX, iwReq) => {
       const f = usLayer.get(iso);
@@ -46712,19 +46939,15 @@ function layoutMap(resolved, data, size, opts) {
       const iw = Math.min(iwReq, width - FIT_PAD - x0 - 2 * PAD);
       if (iw < 24) return boxX;
       const xr = x0 + iw + 2 * PAD;
-      const top = coastTop(x0, xr);
-      const yL = top(x0);
-      const yR = top(xr);
+      const floor = coastFloor(x0, xr);
+      const topGuess = floor > -Infinity ? floor + GAP : yB - height * 0.42;
       proj.fitWidth(iw, f);
       const bb = geoPath(proj).bounds(f);
       const sh = Number.isFinite(bb[0][0]) ? bb[1][1] - bb[0][1] : iw;
       const needH = sh + 2 * PAD;
-      let topFit = Math.max(yL, yR);
+      let topFit = topGuess;
       const bottom = Math.min(topFit + needH, yB);
       if (bottom - topFit < needH) topFit = bottom - needH;
-      const lift = topFit - Math.max(yL, yR);
-      const topL = yL + lift;
-      const topR = yR + lift;
       proj.fitExtent(
         [
           [x0 + PAD, topFit + PAD],
@@ -46743,15 +46966,18 @@ function layoutMap(resolved, data, size, opts) {
       }
       insets.push({
         x: x0,
-        y: Math.min(topL, topR),
+        y: topFit,
         w: xr - x0,
-        h: bottom - Math.min(topL, topR),
+        h: bottom - topFit,
         points: [
-          [x0, topL],
-          [xr, topR],
+          [x0, topFit],
+          [xr, topFit],
           [xr, bottom],
           [x0, bottom]
-        ]
+        ],
+        // The FITTED inset projection (just fit to this box) — captured so the
+        // geo-query can invert pixels inside the frame back to AK/HI coords.
+        projection: proj
       });
       insetRegions.push({
         id: iso,
@@ -46760,7 +46986,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);
@@ -46903,7 +47129,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 }
       });
     }
@@ -46921,13 +47147,40 @@ function layoutMap(resolved, data, size, opts) {
         id: "lake",
         d,
         fill: water,
-        stroke: "none",
+        stroke: lakeStroke,
         lineNumber: -1,
         layer: "base"
       });
     }
   }
-  const riverColor = water;
+  const relief = [];
+  let reliefHatch = null;
+  if (resolved.directives.relief === true && data.mountainRanges) {
+    for (const [, f] of decodeLayer(data.mountainRanges)) {
+      const viewF = isGlobalView ? dropFrameFillers(f) : cullFeatureToView(f);
+      if (!viewF) continue;
+      const area2 = path.area(viewF);
+      if (!Number.isFinite(area2) || area2 < RELIEF_MIN_AREA) continue;
+      const box = path.bounds(viewF);
+      if (box[1][0] - box[0][0] < RELIEF_MIN_DIM || box[1][1] - box[0][1] < RELIEF_MIN_DIM)
+        continue;
+      const d = path(viewF) ?? "";
+      if (!d) continue;
+      relief.push({ d });
+    }
+    if (relief.length) {
+      const darkTone = isDark ? palette.bg : palette.text;
+      const lightTone = isDark ? palette.text : palette.bg;
+      const landLum = relativeLuminance(neutralFill);
+      const tone = Math.abs(landLum - relativeLuminance(darkTone)) > 0.04 ? darkTone : lightTone;
+      reliefHatch = {
+        color: mix(tone, neutralFill, RELIEF_HATCH_STRENGTH),
+        spacing: RELIEF_HATCH_SPACING,
+        width: RELIEF_HATCH_WIDTH
+      };
+    }
+  }
+  const riverColor = mix(water, regionStroke, 16);
   const rivers = [];
   if (data.rivers) {
     for (const [, f] of decodeLayer(data.rivers)) {
@@ -46938,16 +47191,19 @@ 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);
   };
   const poiFill = (p) => {
+    const directHex = p.color ? resolveColor(p.color, palette) : null;
+    if (directHex)
+      return { fill: directHex, stroke: mix(directHex, palette.text, 18) };
     for (const group of resolved.tagGroups) {
       const val = p.tags[group.name.toLowerCase()];
       if (!val) continue;
@@ -47009,7 +47265,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 }
       });
     });
   }
@@ -47045,26 +47302,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);
@@ -47327,8 +47598,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,
@@ -47348,19 +47619,24 @@ function layoutMap(resolved, data, size, opts) {
     ...resolved.caption !== void 0 && { caption: resolved.caption },
     regions,
     rivers,
+    relief,
+    reliefHatch,
     legs,
     pois,
     labels,
     legend,
     insets,
-    insetRegions
+    insetRegions,
+    projection,
+    stretch: stretchParams
   };
 }
-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_LIGHT, WATER_TINT_DARK, RIVER_WIDTH, RELIEF_MIN_AREA, RELIEF_MIN_DIM, RELIEF_HATCH_SPACING, RELIEF_HATCH_WIDTH, RELIEF_HATCH_STRENGTH, FOREIGN_TINT_LIGHT, FOREIGN_TINT_DARK, MUTED_FOREIGN_LIGHT, MUTED_FOREIGN_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";
     init_color_utils();
+    init_colors();
     init_label_layout();
     init_legend_constants();
     init_title_constants();
@@ -47373,14 +47649,22 @@ var init_layout15 = __esm({
     W_MAX = 8;
     FONT = 11;
     COLO_EPS = 1.5;
-    LAND_TINT_LIGHT = 58;
-    LAND_TINT_DARK = 75;
+    LAND_TINT_LIGHT = 12;
+    LAND_TINT_DARK = 24;
     TAG_TINT_LIGHT = 60;
     TAG_TINT_DARK = 68;
-    WATER_TINT = 55;
+    WATER_TINT_LIGHT = 13;
+    WATER_TINT_DARK = 14;
     RIVER_WIDTH = 1.3;
+    RELIEF_MIN_AREA = 12;
+    RELIEF_MIN_DIM = 2;
+    RELIEF_HATCH_SPACING = 3;
+    RELIEF_HATCH_WIDTH = 0.25;
+    RELIEF_HATCH_STRENGTH = 32;
     FOREIGN_TINT_LIGHT = 30;
     FOREIGN_TINT_DARK = 62;
+    MUTED_FOREIGN_LIGHT = 28;
+    MUTED_FOREIGN_DARK = 16;
     COLO_R = 9;
     GOLDEN_ANGLE = 2.399963229728653;
     FAN_STEP = 16;
@@ -47435,7 +47719,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());
@@ -47453,6 +47737,20 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
     }
   };
   for (const r of layout.regions) drawRegion(gRegions, r, 0.5);
+  if (layout.relief.length && layout.reliefHatch) {
+    const h = layout.reliefHatch;
+    const rangeClipId = "dgmo-relief-clip";
+    const landClipId = "dgmo-relief-land";
+    const rangeClip = defs.append("clipPath").attr("id", rangeClipId);
+    for (const s of layout.relief) rangeClip.append("path").attr("d", s.d);
+    const landClip = defs.append("clipPath").attr("id", landClipId);
+    for (const r of layout.regions)
+      if (r.id !== "lake") landClip.append("path").attr("d", r.d);
+    const gRelief = svg.append("g").attr("clip-path", `url(#${landClipId})`).append("g").attr("class", "dgmo-map-relief").attr("clip-path", `url(#${rangeClipId})`).attr("stroke", h.color).attr("stroke-width", h.width).attr("vector-effect", "non-scaling-stroke");
+    for (let y = h.spacing; y < height; y += h.spacing) {
+      gRelief.append("line").attr("x1", 0).attr("y1", y).attr("x2", width).attr("y2", y);
+    }
+  }
   if (layout.rivers.length) {
     const gRivers = svg.append("g").attr("class", "dgmo-map-rivers").attr("fill", "none");
     for (const r of layout.rivers) {
@@ -47496,6 +47794,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",
@@ -47545,7 +47848,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,
@@ -47572,7 +47875,7 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
     }
   }
   if (layout.title) {
-    svg.append("text").attr("x", width / 2).attr("y", TITLE_Y).attr("text-anchor", "middle").attr("font-size", TITLE_FONT_SIZE).attr("font-weight", TITLE_FONT_WEIGHT).attr("fill", palette.text).attr("paint-order", "stroke fill").attr("stroke", palette.bg).attr("stroke-width", 4).attr("stroke-linejoin", "round").attr("stroke-opacity", 0.7).text(layout.title);
+    svg.append("text").attr("class", "dgmo-map-title").attr("x", width / 2).attr("y", TITLE_Y).attr("text-anchor", "middle").attr("font-size", TITLE_FONT_SIZE).attr("font-weight", TITLE_FONT_WEIGHT).attr("fill", palette.text).attr("paint-order", "stroke fill").attr("stroke", palette.bg).attr("stroke-width", 4).attr("stroke-linejoin", "round").attr("stroke-opacity", 0.7).text(layout.title);
   }
   if (layout.subtitle) {
     svg.append("text").attr("x", width / 2).attr("y", TITLE_Y + TITLE_FONT_SIZE).attr("text-anchor", "middle").attr("font-size", LABEL_FONT + 1).attr("fill", palette.textMuted).attr("paint-order", "stroke fill").attr("stroke", palette.bg).attr("stroke-width", 3).attr("stroke-linejoin", "round").attr("stroke-opacity", 0.7).text(layout.subtitle);
@@ -47604,6 +47907,120 @@ var init_renderer16 = __esm({
   }
 });
 
+// src/map/load-data.ts
+var load_data_exports = {};
+__export(load_data_exports, {
+  loadMapData: () => loadMapData
+});
+async function loadNodeBuiltins() {
+  const [{ readFile }, { fileURLToPath }, { dirname: dirname2, resolve }] = await Promise.all([
+    import("fs/promises"),
+    import("url"),
+    import("path")
+  ]);
+  return { readFile, fileURLToPath, dirname: dirname2, resolve };
+}
+async function readJson(nb, dir, name) {
+  return JSON.parse(await nb.readFile(nb.resolve(dir, name), "utf8"));
+}
+async function firstExistingDir(nb, baseDir) {
+  for (const rel of CANDIDATE_DIRS) {
+    const dir = nb.resolve(baseDir, rel);
+    try {
+      await nb.readFile(nb.resolve(dir, FILES.gazetteer), "utf8");
+      return dir;
+    } catch {
+    }
+  }
+  throw new Error(
+    `map data assets not found near ${baseDir} (looked in ${CANDIDATE_DIRS.join(", ")}). Run \`pnpm build:map-data\` and \`pnpm build\`.`
+  );
+}
+function validate(data) {
+  const topoOk = (t) => !!t && t.type === "Topology" && !!t.objects;
+  if (!topoOk(data.worldCoarse) || !topoOk(data.worldDetail) || !topoOk(data.usStates) || !data.gazetteer || !Array.isArray(data.gazetteer.cities) || !data.gazetteer.byName) {
+    throw new Error("map data assets are malformed (failed shape validation)");
+  }
+  return data;
+}
+function moduleBaseDir(nb) {
+  try {
+    const url = import.meta.url;
+    if (url) return nb.dirname(nb.fileURLToPath(url));
+  } catch {
+  }
+  if (typeof __dirname !== "undefined") return __dirname;
+  return process.cwd();
+}
+function loadMapData() {
+  cache ??= (async () => {
+    const nb = await loadNodeBuiltins();
+    const dir = await firstExistingDir(nb, moduleBaseDir(nb));
+    const [
+      worldCoarse,
+      worldDetail,
+      usStates,
+      lakes,
+      rivers,
+      mountainRanges,
+      naLand,
+      naLakes,
+      gazetteer
+    ] = await Promise.all([
+      readJson(nb, dir, FILES.worldCoarse),
+      readJson(nb, dir, FILES.worldDetail),
+      readJson(nb, dir, FILES.usStates),
+      // Lakes/rivers/mountain/NA assets are optional — older bundles may predate them.
+      readJson(nb, dir, FILES.lakes).catch(() => void 0),
+      readJson(nb, dir, FILES.rivers).catch(() => void 0),
+      readJson(nb, dir, FILES.mountainRanges).catch(
+        () => void 0
+      ),
+      readJson(nb, dir, FILES.naLand).catch(() => void 0),
+      readJson(nb, dir, FILES.naLakes).catch(() => void 0),
+      readJson(nb, dir, FILES.gazetteer)
+    ]);
+    return validate({
+      worldCoarse,
+      worldDetail,
+      usStates,
+      gazetteer,
+      ...lakes && { lakes },
+      ...rivers && { rivers },
+      ...mountainRanges && { mountainRanges },
+      ...naLand && { naLand },
+      ...naLakes && { naLakes }
+    });
+  })().catch((e) => {
+    cache = void 0;
+    throw e;
+  });
+  return cache;
+}
+var FILES, CANDIDATE_DIRS, cache;
+var init_load_data = __esm({
+  "src/map/load-data.ts"() {
+    "use strict";
+    FILES = {
+      worldCoarse: "world-coarse.json",
+      worldDetail: "world-detail.json",
+      usStates: "us-states.json",
+      lakes: "lakes.json",
+      rivers: "rivers.json",
+      mountainRanges: "mountain-ranges.json",
+      naLand: "na-land.json",
+      naLakes: "na-lakes.json",
+      gazetteer: "gazetteer.json"
+    };
+    CANDIDATE_DIRS = [
+      "./data",
+      "./map-data",
+      "../map-data",
+      "../src/map/data"
+    ];
+  }
+});
+
 // src/pyramid/renderer.ts
 var renderer_exports17 = {};
 __export(renderer_exports17, {
@@ -55788,15 +56205,17 @@ async function renderForExport(content, theme, palette, viewState, options) {
   if (detectedType === "map") {
     const { parseMap: parseMap2 } = await Promise.resolve().then(() => (init_parser12(), parser_exports11));
     const { resolveMap: resolveMap2 } = await Promise.resolve().then(() => (init_resolver2(), resolver_exports));
-    const { loadMapData: loadMapData2 } = await Promise.resolve().then(() => (init_load_data(), load_data_exports));
     const { renderMapForExport: renderMapForExport2 } = await Promise.resolve().then(() => (init_renderer16(), renderer_exports16));
     const effectivePalette2 = await resolveExportPalette(theme, palette);
     const mapParsed = parseMap2(content);
-    let mapData;
-    try {
-      mapData = await loadMapData2();
-    } catch {
-      return "";
+    let mapData = options?.mapData;
+    if (!mapData) {
+      const { loadMapData: loadMapData2 } = await Promise.resolve().then(() => (init_load_data(), load_data_exports));
+      try {
+        mapData = await loadMapData2();
+      } catch {
+        return "";
+      }
     }
     const mapResolved = resolveMap2(mapParsed, mapData);
     const container2 = createExportContainer(EXPORT_WIDTH, EXPORT_HEIGHT);
@@ -57090,6 +57509,160 @@ init_load_data();
 init_layout15();
 init_renderer16();
 
+// src/map/geo-query.ts
+init_parser12();
+init_resolver2();
+init_layout15();
+init_geo();
+
+// src/map/invert.ts
+function inInsetFrame(inset, px, py) {
+  return px >= inset.x && px <= inset.x + inset.w && py >= inset.y && py <= inset.y + inset.h;
+}
+function unstretch(layout, px, py) {
+  const s = layout.stretch;
+  return [
+    s.bx0 + (s.sx !== 0 ? (px - s.ox) / s.sx : 0),
+    s.by0 + (s.sy !== 0 ? (py - s.oy) / s.sy : 0)
+  ];
+}
+function applyStretch(layout, x, y) {
+  const s = layout.stretch;
+  return [s.ox + (x - s.bx0) * s.sx, s.oy + (y - s.by0) * s.sy];
+}
+function pixelToLonLat(layout, px, py) {
+  for (const inset of layout.insets) {
+    if (inInsetFrame(inset, px, py)) {
+      const ll2 = inset.projection.invert?.([px, py]);
+      return ll2 && Number.isFinite(ll2[0]) && Number.isFinite(ll2[1]) ? [ll2[0], ll2[1]] : null;
+    }
+  }
+  const [x, y] = layout.stretch ? unstretch(layout, px, py) : [px, py];
+  const ll = layout.projection.invert?.([x, y]);
+  return ll && Number.isFinite(ll[0]) && Number.isFinite(ll[1]) ? [ll[0], ll[1]] : null;
+}
+function lonLatToPixel(layout, lonLat) {
+  const pt = [lonLat[0], lonLat[1]];
+  const main = layout.projection(pt);
+  const mainPx = main && Number.isFinite(main[0]) && Number.isFinite(main[1]) ? layout.stretch ? applyStretch(layout, main[0], main[1]) : [main[0], main[1]] : null;
+  const onCanvas = !!mainPx && mainPx[0] >= 0 && mainPx[0] <= layout.width && mainPx[1] >= 0 && mainPx[1] <= layout.height;
+  if (onCanvas) return mainPx;
+  for (const inset of layout.insets) {
+    const p = inset.projection(pt);
+    if (p && Number.isFinite(p[0]) && Number.isFinite(p[1]) && inInsetFrame(inset, p[0], p[1]))
+      return [p[0], p[1]];
+  }
+  return mainPx;
+}
+
+// src/map/geo-query.ts
+var EARTH_R_KM = 6371;
+var DEG = Math.PI / 180;
+function haversineKm(lat1, lon1, lat2, lon2) {
+  const dLat = (lat2 - lat1) * DEG;
+  const dLon = (lon2 - lon1) * DEG;
+  const a = Math.sin(dLat / 2) ** 2 + Math.cos(lat1 * DEG) * Math.cos(lat2 * DEG) * Math.sin(dLon / 2) ** 2;
+  return 2 * EARTH_R_KM * Math.asin(Math.min(1, Math.sqrt(a)));
+}
+var POP_PULL_KM = 12;
+function nearestCity(lonLat, gazetteer) {
+  const [lon, lat] = lonLat;
+  let best = null;
+  const cities = gazetteer.cities;
+  for (let i = 0; i < cities.length; i++) {
+    const c2 = cities[i];
+    const dist = haversineKm(lat, lon, c2[0], c2[1]);
+    const score = dist - POP_PULL_KM * Math.log10((c2[3] || 0) + 1);
+    if (!best || score < best.score) best = { score, idx: i, dist };
+  }
+  if (!best) return null;
+  const c = cities[best.idx];
+  return {
+    name: c[4],
+    iso: c[2],
+    ...c[5] !== void 0 && { sub: c[5] },
+    distanceKm: best.dist
+  };
+}
+function roundCoord(n) {
+  return Number(n.toFixed(2));
+}
+function buildTokens(lonLat, region, city) {
+  const coordPoiLine = `poi ${roundCoord(lonLat[1])} ${roundCoord(lonLat[0])}`;
+  let stateTok = null;
+  if (region.state) {
+    const { iso, name } = region.state;
+    stateTok = { primary: `${name} ${iso}`, alternates: [iso, name] };
+  }
+  let countryTok = null;
+  if (region.country) {
+    const { iso, name } = region.country;
+    countryTok = { primary: name, alternates: [iso] };
+  }
+  let cityTok = null;
+  if (city) {
+    const scope = city.sub ?? (city.iso || "");
+    cityTok = scope ? { token: `poi ${city.name} ${scope}`, ambiguous: false } : { token: `poi ${city.name}`, ambiguous: true };
+  }
+  return { coordPoiLine, state: stateTok, country: countryTok, city: cityTok };
+}
+var MAX_CITY_DOTS = 250;
+function createMapGeoQuery(opts) {
+  const { content, width, height, data, palette, isDark } = opts;
+  const resolved = resolveMap(parseMap(content), data);
+  const layout = layoutMap(
+    resolved,
+    data,
+    { width, height },
+    { palette, isDark }
+  );
+  const countries = decodeFeatures(data.worldDetail);
+  const states = decodeFeatures(data.usStates);
+  const gazetteer = data.gazetteer;
+  const invert = (px, py) => pixelToLonLat(layout, px, py);
+  const project = (lonLat) => lonLatToPixel(layout, lonLat);
+  const locate = (px, py) => {
+    const lonLat = invert(px, py);
+    if (!lonLat) return null;
+    const region = regionAt(lonLat, countries, states);
+    const city = nearestCity(lonLat, gazetteer);
+    return {
+      lonLat,
+      country: region.country,
+      state: region.state,
+      nearestCity: city,
+      tokens: buildTokens(lonLat, region, city)
+    };
+  };
+  const cities = (extent2) => {
+    const sorted = [...gazetteer.cities].sort((a, b) => b[3] - a[3]);
+    const out = [];
+    for (const c of sorted) {
+      const [lat, lon, iso, pop, name, sub] = c;
+      if (extent2) {
+        const [[w, s], [e, n]] = extent2;
+        if (lon < w || lon > e || lat < s || lat > n) continue;
+      }
+      const p = project([lon, lat]);
+      if (!p) continue;
+      if (p[0] < 0 || p[0] > width || p[1] < 0 || p[1] > height) continue;
+      out.push({
+        name,
+        iso,
+        ...sub !== void 0 && { sub },
+        lon,
+        lat,
+        px: p[0],
+        py: p[1],
+        pop
+      });
+      if (out.length >= MAX_CITY_DOTS) break;
+    }
+    return out;
+  };
+  return { invert, project, locate, cities };
+}
+
 // src/map/completion.ts
 var fold2 = (s) => s.normalize("NFD").replace(/\p{Diacritic}/gu, "").toLowerCase().trim();
 var groupThousands = (n) => String(n).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
@@ -58212,7 +58785,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: {
@@ -58223,9 +58796,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"]
@@ -58237,6 +58815,7 @@ var COMPLETION_REGISTRY = /* @__PURE__ */ new Map([
       "default-country": { description: "ISO scope for bare city resolution" },
       "default-state": { description: "ISO subdivision scope" },
       "no-legend": { description: "Suppress the legend" },
+      relief: { description: "Subtle mountain-range relief shading" },
       subtitle: { description: "Subtitle line" },
       caption: { description: "Caption line" }
     })
@@ -59747,6 +60326,7 @@ export {
   computeTimeTicks,
   contrastText,
   controlsGroupCapsuleWidth,
+  createMapGeoQuery,
   decodeDiagramUrl,
   decodeViewState,
   displayName,