@diagrammo/dgmo 0.26.0 → 0.27.0

package/src/map/legend-band.ts

@@ -38,8 +38,8 @@ export function mapLegendGroups(legend: MapLayoutLegend): LegendGroupData[] {
         gradient: {
           min: ramp.min,
           max: ramp.max,
-          hue: ramp.hue,
-          base: ramp.base,
+          low: ramp.low,
+          high: ramp.high,
         },
       }
     : null;

package/src/map/load-data.ts

@@ -18,7 +18,12 @@
 // `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, WaterBodies } from './data/types';
+import type {
+  BoundaryTopology,
+  Gazetteer,
+  WaterBodies,
+  AirportData,
+} from './data/types';
 
 type NodeBuiltins = {
   readFile: typeof import('node:fs/promises').readFile;
@@ -47,6 +52,7 @@ const FILES = {
   naLand: 'na-land.json',
   naLakes: 'na-lakes.json',
   waterBodies: 'water-bodies.json',
+  airports: 'airports.json',
   gazetteer: 'gazetteer.json',
 } as const;
 
@@ -137,6 +143,7 @@ export function loadMapData(): Promise<MapData> {
       naLand,
       naLakes,
       waterBodies,
+      airports,
       gazetteer,
     ] = await Promise.all([
       // worldCoarse (110m) is LOAD-BEARING but NOT a render source: the world
@@ -155,6 +162,7 @@ export function loadMapData(): Promise<MapData> {
       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<AirportData>(nb, dir, FILES.airports).catch(() => undefined),
       readJson<Gazetteer>(nb, dir, FILES.gazetteer),
     ]);
     return validate({
@@ -168,6 +176,7 @@ export function loadMapData(): Promise<MapData> {
       ...(naLand && { naLand }),
       ...(naLakes && { naLakes }),
       ...(waterBodies && { waterBodies }),
+      ...(airports && { airports }),
     });
   })().catch((e: unknown) => {
     cache = undefined; // don't poison future calls with a rejected promise

package/src/map/parser.ts

@@ -5,11 +5,12 @@
 import { makeDgmoError, formatDgmoError } from '../diagnostics';
 import type { DgmoError } from '../diagnostics';
 import type { Writable } from '../utils/brand';
+import type { PaletteColors } from '../palettes/types';
 import {
   measureIndent,
   splitNameAndMeta,
   extractColor,
-  peelTrailingColorName,
+  peelRampColors,
 } from '../utils/parsing';
 import {
   MAP_REGISTRY,
@@ -40,10 +41,14 @@ const NUMERIC_LEAD_RE = /^[+-]?\d/; // a name region that starts like a number
 const SCOPE_RE = /^[A-Z]{2}(?:-[A-Z0-9]{1,3})?$/;
 // Arrow tokens (longest-match first); only recognized with surrounding
 // whitespace, so hyphens inside names (`office-east`) and `foo-bar` are safe.
-const ARROW_SPLIT = /\s+(-[^>]*?->|->|~[^>]*?~>|~>|--)\s+/;
-const HUB_RE = /^(->|~>)\s+(.+)$/;
+// Drop the trailing `>` to drop the arrowhead: `--`/`-label-` are undirected
+// straight, `~~`/`~label~` undirected arc. `[^>]` excludes `>` so an undirected
+// branch can never swallow a directed token; directed branches are listed first.
+const ARROW_TOKENS = '-[^>]*?->|->|~[^>]*?~>|~>|-[^>]*?-|~[^>]*?~';
+const ARROW_SPLIT = new RegExp(`\\s+(${ARROW_TOKENS})\\s+`);
+const HUB_RE = new RegExp(`^(${ARROW_TOKENS})\\s+(.+)$`);
 // A route leg line: an optional leading arrow (with in-arrow label) + a destination.
-const LEG_ARROW_RE = /^(-[^>]*?->|->|~[^>]*?~>|~>|--)\s+(.+)$/;
+const LEG_ARROW_RE = new RegExp(`^(${ARROW_TOKENS})\\s+(.+)$`);
 const AT_RE = /(^|[\s,])at\s*:/i; // the removed `at:` coord form (§24B.9)
 
 // The 14 map-specific directives (§24B.2): 6 irreducible-intent + 8 `no-*`
@@ -63,8 +68,10 @@ const DIRECTIVE_SET: ReadonlySet<string> = new Set([
   'no-relief',
   'no-context-labels',
   'no-region-labels',
+  'no-region-value',
   'no-poi-labels',
   'no-colorize',
+  'no-cities',
   'no-cluster-pois',
 ]);
 
@@ -86,7 +93,7 @@ function stripInlineComment(line: string): string {
     .replace(/\s+$/, '');
 }
 
-export function parseMap(content: string): ParsedMap {
+export function parseMap(content: string, palette?: PaletteColors): ParsedMap {
   const result: Writable<ParsedMap> = {
     title: null,
     titleLineNumber: null,
@@ -197,12 +204,17 @@ export function parseMap(content: string): ParsedMap {
       if (hub) {
         const src = open.poi.poi.alias ?? poiName(open.poi.poi.pos);
         if (src) {
+          const arr = classifyArrow(hub[1]!, lineNumber);
+          const hubSplit = splitNameAndMeta(hub[2]!, registry(), aliasMap);
+          const { tags, meta } = partitionMeta(hubSplit.meta, tagGroupNames());
           edges.push({
             from: src,
-            to: hub[2]!.trim(),
-            directed: true,
-            style: hub[1] === '~>' ? 'arc' : 'straight',
-            meta: {},
+            to: hubSplit.name.trim(),
+            ...(arr.label !== undefined && { label: arr.label }),
+            directed: arr.directed,
+            style: arr.style,
+            meta,
+            tags,
             lineNumber,
           });
         }
@@ -287,12 +299,18 @@ export function parseMap(content: string): ParsedMap {
     switch (key) {
       case 'region-metric': {
         dup(d.regionMetric);
-        // 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);
+        // Up to two trailing colors name the choropleth ramp endpoints
+        // (§24B.3): one ⇒ high hue over a neutral low; two ⇒ `low high`. The
+        // label keeps the rest. `region-metric Sales ($M) green red` →
+        // green→red ramp.
+        const {
+          label: rmLabel,
+          low: rmLow,
+          high: rmHigh,
+        } = peelRampColors(value);
         d.regionMetric = rmLabel;
-        if (rmColor) d.regionMetricColor = rmColor;
+        if (rmHigh) d.regionMetricColor = rmHigh;
+        if (rmLow) d.regionMetricLowColor = rmLow;
         break;
       }
       case 'poi-metric':
@@ -335,12 +353,18 @@ export function parseMap(content: string): ParsedMap {
       case 'no-region-labels':
         d.noRegionLabels = true;
         break;
+      case 'no-region-value':
+        d.noRegionValue = true;
+        break;
       case 'no-poi-labels':
         d.noPoiLabels = true;
         break;
       case 'no-colorize':
         d.noColorize = true;
         break;
+      case 'no-cities':
+        d.noCities = true;
+        break;
       case 'no-cluster-pois':
         d.noClusterPois = true;
         break;
@@ -376,7 +400,7 @@ export function parseMap(content: string): ParsedMap {
     line: number
   ): void {
     const { text: clean, isDefault } = stripDefaultModifier(text);
-    const { label, color } = extractColor(clean, undefined, diagnostics, line);
+    const { label, color } = extractColor(clean, palette, diagnostics, line);
     if (!color) {
       pushError(line, `Expected 'Value color' in tag group '${group.name}'`);
       return;
@@ -507,7 +531,8 @@ export function parseMap(content: string): ParsedMap {
 
   /** Parse one route body line into a leg: `[-label->] <destination> [keys]`.
    *  The arrow (if any) gives the leg label + shape; `value:` is leg thickness;
-   *  a tag / `label:` decorate the destination stop. Bare `<dest>` = plain leg. */
+   *  a tag colours the LINE (§24B.6); `label:`/`as` name the destination stop.
+   *  Bare `<dest>` = plain leg. */
   function parseLeg(
     trimmed: string,
     line: number,
@@ -549,7 +574,7 @@ export function parseMap(content: string): ParsedMap {
       dest: pos,
       ...(split.alias !== undefined && { destAlias: split.alias }),
       ...(destLabel !== undefined && { destLabel }),
-      destTags: tags,
+      tags, // colour the LINE (§24B.6); stop tags go on the poi line
       lineNumber: line,
     };
   }
@@ -572,13 +597,18 @@ export function parseMap(content: string): ParsedMap {
       else links.push(classifyArrow(parts[k]!, line));
     }
     // Trailing metadata rides on the final endpoint only (R5), and attaches to
-    // the FINAL leg only — not broadcast to every leg of a chain (#7).
+    // the FINAL leg only — not broadcast to every leg of a chain (#7). A tag on
+    // the line colours the LINE (§24B.6), so peel tags out of the meta here.
     const lastSplit = splitNameAndMeta(
       endpoints[endpoints.length - 1]!,
       registry(),
       aliasMap
     );
     endpoints[endpoints.length - 1] = lastSplit.name;
+    const { tags: lastTags, meta: lastMeta } = partitionMeta(
+      lastSplit.meta,
+      tagGroupNames()
+    );
     for (let k = 0; k < links.length; k++) {
       const from = endpoints[k]!;
       const to = endpoints[k + 1]!;
@@ -587,7 +617,8 @@ export function parseMap(content: string): ParsedMap {
         continue;
       }
       const isLast = k === links.length - 1;
-      const meta = isLast ? lastSplit.meta : {};
+      const meta = isLast ? lastMeta : {};
+      const tags = isLast ? lastTags : {};
       // Edge shape comes only from the arrow token (surface parsing removed).
       const style: 'straight' | 'arc' =
         links[k]!.style === 'arc' ? 'arc' : 'straight';
@@ -598,6 +629,7 @@ export function parseMap(content: string): ParsedMap {
         directed: links[k]!.directed,
         style,
         meta,
+        tags,
         lineNumber: line,
       });
     }
@@ -608,24 +640,21 @@ export function parseMap(content: string): ParsedMap {
     line: number
   ): { label?: string; directed: boolean; style: 'straight' | 'arc' } {
     if (tok === '--') return { directed: false, style: 'straight' };
+    if (tok === '~~') return { directed: false, style: 'arc' };
     if (tok === '->') return { directed: true, style: 'straight' };
     if (tok === '~>') return { directed: true, style: 'arc' };
-    if (tok.startsWith('~')) {
-      const lbl = parseInArrowLabel(tok.slice(1, -2), line);
-      lbl.diagnostics.forEach((d) => diagnostics.push(d));
-      return {
-        ...(lbl.label !== undefined && { label: lbl.label }),
-        directed: true,
-        style: 'arc',
-      };
-    }
-    // directed labeled `-…->`
-    const lbl = parseInArrowLabel(tok.slice(1, -2), line);
+    // Labeled form: arrowhead iff it ends in `>`, arc iff it starts with `~`.
+    // The label sits between the delimiters — drop 2 trailing chars for the
+    // directed `…->`/`…~>`, 1 for the undirected `…-`/`…~`.
+    const directed = tok.endsWith('>');
+    const style: 'straight' | 'arc' = tok.startsWith('~') ? 'arc' : 'straight';
+    const inner = directed ? tok.slice(1, -2) : tok.slice(1, -1);
+    const lbl = parseInArrowLabel(inner, line);
     lbl.diagnostics.forEach((d) => diagnostics.push(d));
     return {
       ...(lbl.label !== undefined && { label: lbl.label }),
-      directed: true,
-      style: 'straight',
+      directed,
+      style,
     };
   }