@diagrammo/dgmo 0.21.0 → 0.21.1

package/dist/advanced.cjs

@@ -15924,10 +15924,13 @@ function parseMap(content) {
           );
         d.projection = value;
         break;
-      case "region-metric":
+      case "region-metric": {
         dup(d.regionMetric);
-        d.regionMetric = value;
+        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;
@@ -15976,6 +15979,12 @@ 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)
@@ -16088,6 +16097,7 @@ function parseMap(content) {
     };
     if (regionScope !== void 0) region.scope = regionScope;
     if (valueNum !== void 0) region.value = valueNum;
+    if (split.color) region.color = split.color;
     regions.push(region);
   }
   function handlePoi(rest, line12, indent) {
@@ -16112,6 +16122,7 @@ 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 };
   }
@@ -16316,6 +16327,8 @@ var init_parser12 = __esm({
       "default-state",
       "active-tag",
       "no-legend",
+      "no-insets",
+      "relief",
       "subtitle",
       "caption"
     ]);
@@ -45842,6 +45855,84 @@ function featureIndex(topo) {
   }
   return idx;
 }
+function decodeFeatures(topo) {
+  return geomObject(topo).geometries.map((g) => {
+    const f = (0, import_topojson_client.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;
@@ -45853,6 +45944,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 = (0, import_topojson_client.feature)(topo, geom);
+  const parts = explodePolygons(gj);
+  if (parts.length <= 1) return featureBbox(topo, geomId);
+  const polys = parts.map((p) => {
+    const b = (0, import_d3_geo.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: (0, import_d3_geo.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 = [];
@@ -45891,13 +46050,16 @@ function unionLongitudes(lons) {
   }
   return { west: pts[gapIdx], east: pts[gapIdx - 1] + 360 };
 }
-var import_topojson_client, import_d3_geo, fold;
+var import_topojson_client, import_d3_geo, fold, EDGE_EPS, DETACH_GAP_DEG, DETACH_AREA_FRAC;
 var init_geo = __esm({
   "src/map/geo.ts"() {
     "use strict";
     import_topojson_client = require("topojson-client");
     import_d3_geo = require("d3-geo");
     fold = (s) => s.normalize("NFD").replace(/\p{Diacritic}/gu, "").toLowerCase().trim();
+    EDGE_EPS = 1e-9;
+    DETACH_GAP_DEG = 10;
+    DETACH_AREA_FRAC = 0.25;
   }
 });
 
@@ -46001,12 +46163,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) {
@@ -46030,6 +46192,7 @@ function resolveMap(parsed, data) {
       name: chosen.name,
       layer: chosen.layer,
       ...r.value !== void 0 && { value: r.value },
+      ...r.color !== void 0 && { color: r.color },
       tags: r.tags,
       meta: r.meta,
       lineNumber: r.lineNumber
@@ -46171,6 +46334,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
@@ -46313,7 +46477,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);
     }
   }
@@ -46327,6 +46491,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;
@@ -46334,12 +46499,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 = [
@@ -46393,14 +46556,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, US_STATE_POSTAL;
+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;
@@ -46481,115 +46644,6 @@ var init_resolver2 = __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,
-      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)
-    ]);
-    return validate({
-      worldCoarse,
-      worldDetail,
-      usStates,
-      gazetteer,
-      ...lakes && { lakes },
-      ...rivers && { rivers },
-      ...naLand && { naLand },
-      ...naLakes && { naLakes }
-    });
-  })().catch((e) => {
-    cache = void 0;
-    throw e;
-  });
-  return cache;
-}
-var import_meta, FILES, CANDIDATE_DIRS, cache;
-var init_load_data = __esm({
-  "src/map/load-data.ts"() {
-    "use strict";
-    import_meta = {};
-    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"
-    ];
-  }
-});
-
 // src/map/layout.ts
 function geomObject2(topo) {
   const key = Object.keys(topo.objects)[0];
@@ -46616,18 +46670,14 @@ function projectionFor(family) {
       return (0, import_d3_geo2.geoEquirectangular)();
   }
 }
-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 mapBackgroundColor(palette, isDark = false, _dataActive = false) {
+  return mix(
+    palette.colors.blue,
+    palette.bg,
+    isDark ? WATER_TINT_DARK : WATER_TINT_LIGHT
+  );
 }
-function mapNeutralLandColor(palette, isDark, dataActive = false) {
-  if (dataActive)
-    return isDark ? mix(palette.colors.gray, palette.bg, MUTED_LAND_DARK) : palette.bg;
+function mapNeutralLandColor(palette, isDark, _dataActive = false) {
   return mix(
     palette.colors.green,
     palette.bg,
@@ -46659,7 +46709,7 @@ function layoutMap(resolved, data, size, opts) {
   const scaleOverride = resolved.directives.scale;
   const rampMin = scaleOverride ? scaleOverride.min : Math.min(...values);
   const rampMax = scaleOverride ? scaleOverride.max : Math.max(...values);
-  const rampHue = palette.colors.red;
+  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) => {
@@ -46682,6 +46732,7 @@ function layoutMap(resolved, data, size, opts) {
   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,
@@ -46711,7 +46762,14 @@ 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.value !== void 0 ? fillForValue(r.value) : neutralFill;
     }
@@ -46765,6 +46823,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 = (0, import_d3_geo2.geoPath)(projection).bounds(fitTarget);
     const bx0 = cb[0][0];
@@ -46775,6 +46834,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
@@ -46806,7 +46866,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;
@@ -46837,38 +46897,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);
@@ -46877,19 +46913,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 = (0, import_d3_geo2.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],
@@ -46908,15 +46940,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,
@@ -47086,13 +47121,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)) {
@@ -47113,6 +47175,9 @@ function layoutMap(resolved, data, size, opts) {
     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;
@@ -47528,21 +47593,26 @@ 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 import_d3_geo2, import_topojson_client2, 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 import_d3_geo2, import_topojson_client2, 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";
     import_d3_geo2 = require("d3-geo");
     import_topojson_client2 = require("topojson-client");
     init_color_utils();
+    init_colors();
     init_label_layout();
     init_legend_constants();
     init_title_constants();
@@ -47555,19 +47625,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_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;
@@ -47639,6 +47712,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) {
@@ -47763,7 +47850,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);
@@ -47796,6 +47883,121 @@ 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 import_meta, FILES, CANDIDATE_DIRS, cache;
+var init_load_data = __esm({
+  "src/map/load-data.ts"() {
+    "use strict";
+    import_meta = {};
+    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, {
@@ -55975,15 +56177,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);
@@ -56834,6 +57038,7 @@ __export(advanced_exports, {
   computeTimeTicks: () => computeTimeTicks,
   contrastText: () => contrastText,
   controlsGroupCapsuleWidth: () => controlsGroupCapsuleWidth,
+  createMapGeoQuery: () => createMapGeoQuery,
   decodeDiagramUrl: () => decodeDiagramUrl,
   decodeViewState: () => decodeViewState,
   displayName: () => displayName,
@@ -57560,6 +57765,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, ",");
@@ -58712,6 +59071,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" }
     })
@@ -60217,6 +60577,7 @@ function formatLineDiff(path, original, migrated) {
   computeTimeTicks,
   contrastText,
   controlsGroupCapsuleWidth,
+  createMapGeoQuery,
   decodeDiagramUrl,
   decodeViewState,
   displayName,