@diagrammo/dgmo 0.21.0 → 0.22.0

package/src/map/load-data.ts

@@ -18,7 +18,7 @@
 // `await import('jsdom')` seam in render.ts. The web build injects `MapData` via
 // DI and never calls `loadMapData`, so the dynamic import only runs in Node.
 import type { MapData } from './resolved-types';
-import type { BoundaryTopology, Gazetteer } from './data/types';
+import type { BoundaryTopology, Gazetteer, WaterBodies } from './data/types';
 
 type NodeBuiltins = {
   readFile: typeof import('node:fs/promises').readFile;
@@ -43,8 +43,10 @@ const FILES = {
   usStates: 'us-states.json',
   lakes: 'lakes.json',
   rivers: 'rivers.json',
+  mountainRanges: 'mountain-ranges.json',
   naLand: 'na-land.json',
   naLakes: 'na-lakes.json',
+  waterBodies: 'water-bodies.json',
   gazetteer: 'gazetteer.json',
 } as const;
 
@@ -131,18 +133,28 @@ export function loadMapData(): Promise<MapData> {
       usStates,
       lakes,
       rivers,
+      mountainRanges,
       naLand,
       naLakes,
+      waterBodies,
       gazetteer,
     ] = await Promise.all([
+      // worldCoarse (110m) is LOAD-BEARING but NOT a render source: the world
+      // basemap renders from worldDetail (50m) at all scales (resolver pins
+      // basemaps.world = 'detail'). Coarse stays as the authoritative region
+      // name index + dominant-landmass bbox source in resolver.ts. Do not drop it.
       readJson<BoundaryTopology>(nb, dir, FILES.worldCoarse),
       readJson<BoundaryTopology>(nb, dir, FILES.worldDetail),
       readJson<BoundaryTopology>(nb, dir, FILES.usStates),
-      // Lakes/rivers/NA assets are optional — older bundles may predate them.
+      // Lakes/rivers/mountain/NA/water assets are optional — older bundles may predate them.
       readJson<BoundaryTopology>(nb, dir, FILES.lakes).catch(() => undefined),
       readJson<BoundaryTopology>(nb, dir, FILES.rivers).catch(() => undefined),
+      readJson<BoundaryTopology>(nb, dir, FILES.mountainRanges).catch(
+        () => undefined
+      ),
       readJson<BoundaryTopology>(nb, dir, FILES.naLand).catch(() => undefined),
       readJson<BoundaryTopology>(nb, dir, FILES.naLakes).catch(() => undefined),
+      readJson<WaterBodies>(nb, dir, FILES.waterBodies).catch(() => undefined),
       readJson<Gazetteer>(nb, dir, FILES.gazetteer),
     ]);
     return validate({
@@ -152,8 +164,10 @@ export function loadMapData(): Promise<MapData> {
       gazetteer,
       ...(lakes && { lakes }),
       ...(rivers && { rivers }),
+      ...(mountainRanges && { mountainRanges }),
       ...(naLand && { naLand }),
       ...(naLakes && { naLakes }),
+      ...(waterBodies && { waterBodies }),
     });
   })().catch((e: unknown) => {
     cache = undefined; // don't poison future calls with a rejected promise

package/src/map/parser.ts

@@ -9,6 +9,7 @@ import {
   measureIndent,
   splitNameAndMeta,
   extractColor,
+  peelTrailingColorName,
 } from '../utils/parsing';
 import {
   MAP_REGISTRY,
@@ -31,7 +32,6 @@ import type {
   MapRouteLeg,
   MapEdge,
   PoiPos,
-  MapScale,
 } from './types';
 import type { TagGroup, TagEntry } from '../utils/tag-groups';
 
@@ -46,21 +46,22 @@ const HUB_RE = /^(->|~>)\s+(.+)$/;
 const LEG_ARROW_RE = /^(-[^>]*?->|->|~[^>]*?~>|~>|--)\s+(.+)$/;
 const AT_RE = /(^|[\s,])at\s*:/i; // the removed `at:` coord form (§24B.9)
 
+// Final 13 (§24B.2): 6 irreducible-intent directives + 7 `no-*` cosmetic
+// opt-outs. Every cosmetic is on by default; its `no-*` flag is the only switch.
 const DIRECTIVE_SET: ReadonlySet<string> = new Set([
-  'region',
-  'projection',
   'region-metric',
   'poi-metric',
   'flow-metric',
-  'scale',
-  'region-labels',
-  'poi-labels',
-  'default-country',
-  'default-state',
+  'locale',
   'active-tag',
-  'no-legend',
-  'subtitle',
   'caption',
+  'no-legend',
+  'no-coastline',
+  'no-relief',
+  'no-context-labels',
+  'no-region-labels',
+  'no-poi-labels',
+  'no-colorize',
 ]);
 
 /** True when the first non-blank/non-comment line declares `map`. */
@@ -221,15 +222,6 @@ export function parseMap(content: string): ParsedMap {
       handleTag(trimmed, lineNumber);
       continue;
     }
-    // Bare-flag directives (no value) — only when the line is exactly the flag,
-    // so a region named e.g. "Natural Bridge" still parses as a region.
-    if (
-      (firstWord === 'muted' || firstWord === 'natural') &&
-      trimmed === firstWord
-    ) {
-      handleDirective(firstWord, '', lineNumber);
-      continue;
-    }
     if (
       DIRECTIVE_SET.has(firstWord) &&
       !trimmed.slice(firstWord.length).trimStart().startsWith(':')
@@ -289,31 +281,16 @@ export function parseMap(content: string): ParsedMap {
         pushWarning(line, `Duplicate directive "${key}" — last value wins.`);
     };
     switch (key) {
-      case 'region':
-        dup(d.region);
-        d.region = value;
-        break;
-      case 'projection':
-        dup(d.projection);
-        if (
-          value &&
-          ![
-            'equirectangular',
-            'natural-earth',
-            'albers-usa',
-            'mercator',
-          ].includes(value)
-        )
-          pushWarning(
-            line,
-            `Unknown projection "${value}" (expected equirectangular | natural-earth | albers-usa | mercator).`
-          );
-        d.projection = value;
-        break;
-      case 'region-metric':
+      case 'region-metric': {
         dup(d.regionMetric);
-        d.regionMetric = value;
+        // A trailing color names the choropleth ramp hue (§24B.3): the
+        // label keeps the rest. `region-metric Sales ($M) blue` → blue ramp.
+        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;
@@ -322,87 +299,44 @@ export function parseMap(content: string): ParsedMap {
         dup(d.flowMetric);
         d.flowMetric = value;
         break;
-      case 'scale':
-        dup(d.scale);
-        {
-          const s = parseScale(value, line);
-          if (s) d.scale = s;
-        }
-        break;
-      case 'region-labels':
-        dup(d.regionLabels);
-        if (value && !['full', 'abbrev', 'off'].includes(value))
-          pushWarning(
-            line,
-            `Unknown region-labels "${value}" (expected full | abbrev | off).`
-          );
-        d.regionLabels = value;
-        break;
-      case 'poi-labels':
-        dup(d.poiLabels);
-        if (value && !['off', 'auto', 'all'].includes(value))
-          pushWarning(
-            line,
-            `Unknown poi-labels "${value}" (expected off | auto | all).`
-          );
-        d.poiLabels = value;
-        break;
-      case 'default-country':
-        dup(d.defaultCountry);
-        d.defaultCountry = value;
-        break;
-      case 'default-state':
-        dup(d.defaultState);
-        d.defaultState = value;
+      case 'locale':
+        dup(d.locale);
+        d.locale = value;
         break;
       case 'active-tag':
         dup(d.activeTag);
         d.activeTag = value;
         break;
+      case 'caption':
+        dup(d.caption);
+        d.caption = value;
+        break;
+      // ── Cosmetic `no-*` opt-outs: bare flags, idempotent (mirror `no-legend`,
+      //    no dup warning); each defaults the feature ON when absent. ──
       case 'no-legend':
         d.noLegend = true;
         break;
-      case 'muted':
-      case 'natural':
-        if (d.basemapStyle !== undefined && d.basemapStyle !== key)
-          pushWarning(
-            line,
-            `Conflicting basemap dress — "${d.basemapStyle}" then "${key}"; last wins.`
-          );
-        d.basemapStyle = key;
+      case 'no-coastline':
+        d.noCoastline = true;
         break;
-      case 'subtitle':
-        dup(d.subtitle);
-        d.subtitle = value;
+      case 'no-relief':
+        d.noRelief = true;
         break;
-      case 'caption':
-        dup(d.caption);
-        d.caption = value;
+      case 'no-context-labels':
+        d.noContextLabels = true;
+        break;
+      case 'no-region-labels':
+        d.noRegionLabels = true;
+        break;
+      case 'no-poi-labels':
+        d.noPoiLabels = true;
+        break;
+      case 'no-colorize':
+        d.noColorize = true;
         break;
     }
   }
 
-  function parseScale(value: string, line: number): MapScale | null {
-    const toks = value.split(/\s+/).filter(Boolean);
-    const min = Number(toks[0]);
-    const max = Number(toks[1]);
-    if (!Number.isFinite(min) || !Number.isFinite(max)) {
-      pushError(line, `scale requires numeric <min> <max> (got "${value}").`);
-      return null;
-    }
-    const scale: Writable<MapScale> = { min, max };
-    if (toks[2] === 'center') {
-      const c = Number(toks[3]);
-      if (Number.isFinite(c)) scale.center = c;
-      else
-        pushError(
-          line,
-          `scale center requires a number (got "${toks[3] ?? ''}").`
-        );
-    }
-    return scale;
-  }
-
   function handleTag(trimmed: string, line: number): void {
     const m = matchTagBlockHeading(trimmed);
     if (!m) {
@@ -488,6 +422,8 @@ export function parseMap(content: string): ParsedMap {
     };
     if (regionScope !== undefined) region.scope = regionScope;
     if (valueNum !== undefined) region.value = valueNum;
+    // §1.5 trailing color → flat categorical override fill (§24B.4).
+    if (split.color) region.color = split.color;
     regions.push(region);
   }
 
@@ -513,6 +449,8 @@ export function parseMap(content: string): ParsedMap {
     const poi: Writable<MapPoi> = { pos, tags, meta, lineNumber: line };
     if (split.alias) poi.alias = split.alias;
     if (label !== undefined) poi.label = label;
+    // §1.5 trailing color → flat marker fill (§24B.5); wins over a tag color.
+    if (split.color) poi.color = split.color;
     pois.push(poi);
     open.poi = { poi, indent };
   }
@@ -539,6 +477,8 @@ export function parseMap(content: string): ParsedMap {
     const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
     const originLabel = meta['label'];
     const originValue = meta['value'];
+    // Leg shape comes only from `style: arc` / arrow style (surface parsing
+    // removed — a leg no longer bows just because it crosses water).
     const style: 'straight' | 'arc' =
       meta['style'] === 'arc' ? 'arc' : 'straight';
     const route: Writable<MapRoute> = {
@@ -588,6 +528,8 @@ export function parseMap(content: string): ParsedMap {
     const { tags, meta } = partitionMeta(split.meta, tagGroupNames());
     const value = meta['value'];
     const destLabel = meta['label'];
+    // Leg shape comes only from the arrow style or the route header `style: arc`
+    // (surface parsing removed — no implied bow).
     const style: 'straight' | 'arc' =
       arrowStyle === 'arc' || headerStyle === 'arc' ? 'arc' : 'straight';
     return {
@@ -634,13 +576,17 @@ export function parseMap(content: string): ParsedMap {
         pushError(line, `Edge has an empty endpoint: "${trimmed}".`);
         continue;
       }
-      const meta = k === links.length - 1 ? lastSplit.meta : {};
+      const isLast = k === links.length - 1;
+      const meta = isLast ? lastSplit.meta : {};
+      // Edge shape comes only from the arrow token (surface parsing removed).
+      const style: 'straight' | 'arc' =
+        links[k]!.style === 'arc' ? 'arc' : 'straight';
       edges.push({
         from,
         to,
         ...(links[k]!.label !== undefined && { label: links[k]!.label }),
         directed: links[k]!.directed,
-        style: links[k]!.style,
+        style,
         meta,
         lineNumber: line,
       });