@diagrammo/dgmo 0.26.0 → 0.28.0

package/src/journey-map/renderer.ts

@@ -7,6 +7,7 @@ import { parseJourneyMap } from './parser';
 import {
   layoutJourneyMap,
   scoreToColor,
+  scoreToCurveY,
   TAG_STRIP_HEIGHT,
   type CurvePoint,
   type StepLayout,
@@ -21,6 +22,11 @@ import { renderLegendD3 } from '../utils/legend-d3';
 import type { LegendConfig, LegendState } from '../utils/legend-types';
 import { resolveActiveTagGroup } from '../utils/tag-groups';
 import { ScaleContext } from '../utils/scaling';
+import {
+  measureText,
+  wrapTextToWidth,
+  truncateText as truncateToWidth,
+} from '../utils/text-measure';
 
 // ============================================================
 // Interactive Options
@@ -66,7 +72,6 @@ const CURVE_STROKE_WIDTH = 2.5;
 const FACE_RADIUS = 14;
 const DIM_HOVER = 0.25;
 const TITLE_LINE_HEIGHT = 16;
-const TITLE_CHAR_WIDTH = 6.5;
 
 // ============================================================
 // Renderer
@@ -415,10 +420,7 @@ export function renderJourneyMap(
 
   // Grid lines at score levels 1-5
   for (let score = 1; score <= 5; score++) {
-    const y =
-      layout.curveAreaBottom -
-      ((score - 1) / 4) * (layout.curveAreaBottom - layout.curveAreaTop - 120) -
-      10;
+    const y = scoreToCurveY(score, layout.curveAreaBottom);
 
     curveG
       .append('line')
@@ -621,7 +623,11 @@ export function renderJourneyMap(
         .attr('fill', onHeaderText)
         .text(
           isCollapsed
-            ? truncateText(pl.phase.name, pl.width - COLUMN_PADDING * 2)
+            ? truncateText(
+                pl.phase.name,
+                pl.width - COLUMN_PADDING * 2,
+                FONT_SIZE_PHASE
+              )
             : pl.phase.name
         );
 
@@ -728,7 +734,7 @@ export function renderJourneyMap(
             .attr('y', itemY + COLLAPSED_CARD_H / 2 + FONT_SIZE_META / 2 - 1)
             .attr('font-size', FONT_SIZE_META)
             .attr('fill', palette.text)
-            .text(truncateText(step.title, maxTextW));
+            .text(truncateText(step.title, maxTextW, FONT_SIZE_META));
 
           if (onNavigateToLine) {
             itemG.style('cursor', 'pointer').on('click', (event: Event) => {
@@ -893,7 +899,7 @@ export function renderJourneyMap(
       const lines = wrapText(thoughtText, THOUGHT_MAX_W, THOUGHT_FONT);
       const textW = Math.min(
         THOUGHT_MAX_W,
-        Math.max(...lines.map((l) => l.length * THOUGHT_FONT * 0.6))
+        Math.max(...lines.map((l) => measureText(l, THOUGHT_FONT)))
       );
       const bw = textW + THOUGHT_PAD_X * 2;
       const bh = lines.length * THOUGHT_LINE_H + THOUGHT_PAD_Y * 2;
@@ -1170,20 +1176,7 @@ function renderStepCard(
 
   // Title (wrapped)
   const titleMaxW = sl.width - CARD_PADDING_X * 2;
-  const titleMaxChars = Math.max(1, Math.floor(titleMaxW / TITLE_CHAR_WIDTH));
-  const titleWords = sl.step.title.split(/\s+/);
-  const titleLines: string[] = [];
-  let titleCur = '';
-  for (const w of titleWords) {
-    const candidate = titleCur ? `${titleCur} ${w}` : w;
-    if (candidate.length > titleMaxChars && titleCur) {
-      titleLines.push(titleCur);
-      titleCur = w;
-    } else {
-      titleCur = candidate;
-    }
-  }
-  if (titleCur) titleLines.push(titleCur);
+  const titleLines = wrapTextToWidth(sl.step.title, FONT_SIZE_STEP, titleMaxW);
 
   for (let i = 0; i < titleLines.length; i++) {
     stepG
@@ -1459,31 +1452,15 @@ function renderScoreFace(
 }
 
 function wrapText(text: string, maxWidth: number, fontSize: number): string[] {
-  const charWidth = fontSize * 0.6;
-  const maxChars = Math.floor(maxWidth / charWidth);
-  if (maxChars <= 0) return [text];
-
-  const words = text.split(/\s+/);
-  const lines: string[] = [];
-  let current = '';
-
-  for (const word of words) {
-    const candidate = current ? `${current} ${word}` : word;
-    if (candidate.length > maxChars && current) {
-      lines.push(current);
-      current = word;
-    } else {
-      current = candidate;
-    }
-  }
-  if (current) lines.push(current);
-  return lines;
+  return wrapTextToWidth(text, fontSize, maxWidth);
 }
 
-function truncateText(text: string, maxWidth: number): string {
-  const maxChars = Math.floor(maxWidth / 6.6);
-  if (text.length <= maxChars) return text;
-  return text.substring(0, maxChars - 1) + '\u2026';
+function truncateText(
+  text: string,
+  maxWidth: number,
+  fontSize: number
+): string {
+  return truncateToWidth(text, fontSize, maxWidth);
 }
 
 function annotationColor(

package/src/kanban/renderer.ts

@@ -25,6 +25,7 @@ import type {
   D3Sel,
 } from '../utils/legend-types';
 import { ScaleContext } from '../utils/scaling';
+import { measureText } from '../utils/text-measure';
 
 // ============================================================
 // Public options object
@@ -163,7 +164,6 @@ function computeLayout(
   const headerHeight = showTitle ? sTitleHeight + 8 : 0;
   const startY = sDiagramPadding + headerHeight;
 
-  const charWidth = sCardTitleFontSize * 0.6;
   const columnLayouts: ColumnLayout[] = [];
 
   let maxColumnHeight = 0;
@@ -185,13 +185,13 @@ function computeLayout(
       continue;
     }
 
-    let maxCardTextWidth = col.name.length * (sColumnHeaderFontSize * 0.65);
+    let maxCardTextWidth = measureText(col.name, sColumnHeaderFontSize);
 
     const cardLayouts: CardLayout[] = [];
     let cardY = sColumnHeaderHeight + sColumnPadding;
 
     for (const card of col.cards) {
-      const titleWidth = card.title.length * charWidth;
+      const titleWidth = measureText(card.title, sCardTitleFontSize);
       maxCardTextWidth = Math.max(
         maxCardTextWidth,
         titleWidth + sCardPaddingX * 2
@@ -214,7 +214,7 @@ function computeLayout(
 
       for (const m of tagMeta) {
         const metaW =
-          (m.label.length + 2 + m.value.length) * sCardMetaFontSize * 0.6 +
+          measureText(`${m.label}: ${m.value}`, sCardMetaFontSize) +
           sCardPaddingX * 2;
         maxCardTextWidth = Math.max(maxCardTextWidth, metaW);
       }
@@ -697,7 +697,7 @@ export function renderKanban(
             .attr('fill', onCardText)
             .text(`${meta.label}: `);
 
-          const labelWidth = (meta.label.length + 2) * sCardMetaFontSize * 0.6;
+          const labelWidth = measureText(`${meta.label}: `, sCardMetaFontSize);
           cg.append('text')
             .attr('x', cx + sCardPaddingX + labelWidth)
             .attr('y', metaY)
@@ -768,6 +768,15 @@ function drawSwimlaneIcon(
     .attr('class', 'kanban-swimlane-icon')
     .attr('transform', `translate(${x}, ${y})`);
 
+  // Transparent hit area so the whole icon (not just the 2px bars) is clickable
+  iconG
+    .append('rect')
+    .attr('x', -5)
+    .attr('y', -5)
+    .attr('width', 22)
+    .attr('height', 18)
+    .attr('fill', 'transparent');
+
   const color = isActive ? palette.primary : palette.textMuted;
   const opacity = isActive ? 1 : 0.35;
   const barWidths = [8, 12, 6];
@@ -1413,7 +1422,7 @@ function renderSwimlaneCard(
         .attr('font-size', sCardMetaFontSize)
         .attr('fill', palette.textMuted)
         .text(`${meta.label}: `);
-      const labelWidth = (meta.label.length + 2) * sCardMetaFontSize * 0.6;
+      const labelWidth = measureText(`${meta.label}: `, sCardMetaFontSize);
       cg.append('text')
         .attr('x', cx + sCardPaddingX + labelWidth)
         .attr('y', metaY)

package/src/label-layout.ts

@@ -2,6 +2,8 @@
 // Shared label collision detection and placement utilities
 // ---------------------------------------------------------------------------
 
+import { measureText } from './utils/text-measure';
+
 export interface LabelRect {
   x: number;
   y: number;
@@ -74,8 +76,6 @@ export function segmentRectOverlap(
 // Quadrant chart point label placement
 // ---------------------------------------------------------------------------
 
-const CHAR_WIDTH_RATIO = 0.6;
-
 export interface QuadrantLabelPoint {
   label: string;
   cx: number; // pixel x
@@ -120,7 +120,7 @@ export function computeQuadrantPointLabels(
 
   for (let i = 0; i < points.length; i++) {
     const pt = points[i]!; // In-bounds by loop guard.
-    const labelWidth = pt.label.length * fontSize * CHAR_WIDTH_RATIO + 8;
+    const labelWidth = measureText(pt.label, fontSize) + 8;
 
     // Try 4 directions: above, below, left, right
     // Each direction generates candidate (labelX, labelY, anchor)

package/src/map/completion.ts

@@ -8,7 +8,7 @@
 // ./geo) so this module — exported from the main index — stays free of the
 // d3-geo / topojson imports that geo.ts pulls in. Keep it byte-identical to the
 // resolver/geo folding so matches agree.
-import type { Gazetteer, RegionName } from './data/types';
+import type { Gazetteer, RegionName, AirportData } from './data/types';
 
 const fold = (s: string): string =>
   s
@@ -34,11 +34,24 @@ export interface MapPlaceCompletion {
   readonly iso: string;
   readonly sub?: string;
   readonly pop: number;
+  /** `'airport'` for IATA-code entries (icon/grouping affordance); absent or
+   *  `'city'` for gazetteer cities. Cities rank above airports for a shared
+   *  prefix so ~1500 codes never bury city names (ADR-5). */
+  readonly kind?: 'city' | 'airport';
 }
 
 export interface MapCompletionOptions {
   /** Max results (default 12). */
   readonly limit?: number;
+  /** IATA-coded airports (`airports.json`). When supplied, airport codes
+   *  matching the prefix are offered as a second (post-city) group. Optional —
+   *  absent (old DI bundles / no asset) just yields city-only completions. */
+  readonly airports?: AirportData;
+  /** Resolver-inferred map scope (country `US` or subdivision `US-CA`). Biases
+   *  airport ranking so in-region airports sort above out-of-region same-prefix
+   *  ones (ADR-6). Pure rank, never a filter — cross-region airports still
+   *  appear. App passes the document's inferred scope in (Slice 2). */
+  readonly scopeISO?: string;
 }
 
 /**
@@ -65,35 +78,77 @@ export function completeMapPlaces(
   for (const [key, idx] of Object.entries(gazetteer.alt)) {
     if (key.startsWith(q)) matched.add(idx);
   }
-  if (matched.size === 0) return [];
 
-  const ranked = [...matched]
+  // Airport prefix matches (optional asset; guarded for absent bundles, F5/#8).
+  // Folded IATA code → index into `airports`. Scope-match (current map's country)
+  // then code-alpha — NOT pop (always 0) and NOT type (the tuple has no type).
+  const airports = opts?.airports;
+  const scopeCountry = opts?.scopeISO ? opts.scopeISO.slice(0, 2) : undefined;
+  const airportHits: Array<{ code: string; name: string; iso: string }> = [];
+  if (airports?.airportIata) {
+    for (const [key, idx] of Object.entries(airports.airportIata)) {
+      if (!key.startsWith(q)) continue;
+      const a = airports.airports[idx];
+      if (a) airportHits.push({ code: key, name: a[4], iso: a[2] });
+    }
+  }
+
+  // Relaxed early-return: only when BOTH groups are empty (an airport-only prefix
+  // must still complete — the old city-only `matched.size === 0` blocked it).
+  if (matched.size === 0 && airportHits.length === 0) return [];
+
+  // Cities first (pop desc), then airports — cities fill the limit slots first.
+  // Slice the sorted index list to `limit` BEFORE building items (a short prefix
+  // matches thousands of cities; mapping them all per keystroke is wasted work —
+  // airports are appended after, so they never starve cities).
+  const cityItems: MapPlaceCompletion[] = [...matched]
     .filter((i) => gazetteer.cities[i] !== undefined)
     .sort((a, b) => {
       const pa = gazetteer.cities[a]![3];
       const pb = gazetteer.cities[b]![3];
       return pb - pa || a - b; // pop desc, then deterministic index
     })
-    .slice(0, limit);
+    .slice(0, limit)
+    .map((i) => {
+      const c = gazetteer.cities[i]!;
+      const [, , iso, pop, name, sub] = c;
+      const ambiguous = (gazetteer.byName[fold(name)]?.length ?? 0) > 1;
+      const qualifier = sub ?? iso;
+      const insert = ambiguous ? `${name} ${qualifier}` : name;
+      const label = ambiguous ? `${name} — ${qualifier}` : name;
+      const detail = `${qualifier} · ${groupThousands(pop)}`;
+      return {
+        name,
+        insert,
+        label,
+        detail,
+        iso,
+        pop,
+        kind: 'city' as const,
+        ...(sub !== undefined && { sub }),
+      };
+    });
+
+  const airportItems: MapPlaceCompletion[] = airportHits
+    .sort((a, b) => {
+      const sa = scopeCountry && a.iso === scopeCountry ? 0 : 1;
+      const sb = scopeCountry && b.iso === scopeCountry ? 0 : 1;
+      return sa - sb || (a.code < b.code ? -1 : a.code > b.code ? 1 : 0);
+    })
+    .map(({ code, name, iso }) => {
+      const upper = code.toUpperCase();
+      return {
+        name,
+        insert: upper,
+        label: upper,
+        detail: `Airport · ${name}`,
+        iso,
+        pop: 0,
+        kind: 'airport' as const,
+      };
+    });
 
-  return ranked.map((i) => {
-    const c = gazetteer.cities[i]!;
-    const [, , iso, pop, name, sub] = c;
-    const ambiguous = (gazetteer.byName[fold(name)]?.length ?? 0) > 1;
-    const qualifier = sub ?? iso;
-    const insert = ambiguous ? `${name} ${qualifier}` : name;
-    const label = ambiguous ? `${name} — ${qualifier}` : name;
-    const detail = `${qualifier} · ${groupThousands(pop)}`;
-    return {
-      name,
-      insert,
-      label,
-      detail,
-      iso,
-      pop,
-      ...(sub !== undefined && { sub }),
-    };
-  });
+  return [...cityItems, ...airportItems].slice(0, limit);
 }
 
 export interface MapRegionCompletion {

package/src/map/context-labels.ts

@@ -29,6 +29,11 @@ export interface CountryCandidate {
   /** Projected screen anchor `[x, y]` (mainland anchor or `path.centroid`), or
    *  null when the feature doesn't project to a finite point. */
   readonly anchor: readonly [number, number] | null;
+  /** True when `anchor` came from a curated WORLD_LABEL_ANCHORS entry (a trusted
+   *  mainland point) rather than the area-weighted centroid. Such a country
+   *  bypasses the both-axes smear gate (its full-canvas bbox is an antimeridian
+   *  artifact, not a real footprint, so the unreliable-centroid concern is moot). */
+  readonly curatedAnchor?: boolean;
 }
 
 export interface ContextLabelArgs {
@@ -60,6 +65,17 @@ const CONTEXT_PAD = 4; // extra gap enforced between two context labels
 const EDGE_CLAMP_MARGIN = 8; // px inset for edge-clamped ocean labels
 const EDGE_CLAMP_OVERSHOOT = 0.35; // max off-frame overshoot (× dim) to still clamp
 
+// Country labels scale with their projected footprint: a big landmass (Canada,
+// Mexico on a US view) reads as a large, FADED backdrop name; a small one stays
+// at the base font, fully muted. Size metric is the footprint's linear extent
+// (√bbox-area) as a fraction of the canvas's linear extent (√canvas-area), so
+// the ramp is resolution-independent. Below MIN ⇒ base font / no extra fade;
+// at/above MAX ⇒ max font / max fade; linear between.
+const COUNTRY_FONT_MAX = 22; // px ceiling for the largest footprint
+const COUNTRY_SIZE_FRAC_MIN = 0.06; // footprint linear-frac at base font
+const COUNTRY_SIZE_FRAC_MAX = 0.32; // footprint linear-frac at max font
+const COUNTRY_FADE_MAX = 45; // % blend toward bg at max font (subdue big names)
+
 // Water-kind priority within a tier (oceans first, then seas, then the rest) so
 // a thin budget always spends on the highest-orientation-value names.
 const KIND_ORDER: Record<WaterKind, number> = {
@@ -91,10 +107,10 @@ export function labelBudget(
   band: TierBand
 ): number {
   const bandCap: Record<TierBand, number> = {
-    world: 6,
-    continental: 5,
-    regional: 4,
-    local: 3,
+    world: 7,
+    continental: 6,
+    regional: 5,
+    local: 4,
   };
   const area = Math.floor(Math.sqrt(Math.max(0, width * height)) / 150);
   return Math.max(0, Math.min(area, bandCap[band]));
@@ -136,10 +152,14 @@ function insideViewport(
  *  the per-gap `letter-spacing` the renderer applies to water names, so without
  *  this the fit/clamp math under-measures by ~`(len-1)*spacing` and the label
  *  clips at the canvas edge. */
-export function labelWidth(text: string, letterSpacing: number): number {
+export function labelWidth(
+  text: string,
+  letterSpacing: number,
+  font: number = FONT
+): number {
   const spacing =
     letterSpacing > 0 ? Math.max(0, text.length - 1) * letterSpacing : 0;
-  return measureLegendText(text, FONT) + spacing + 2 * PADX;
+  return measureLegendText(text, font) + spacing + 2 * PADX;
 }
 
 /** Wrap a multi-word name into balanced lines, biased to wrap READILY — water
@@ -188,10 +208,12 @@ function rectAround(
   cx: number,
   cy: number,
   lines: readonly string[],
-  letterSpacing: number
+  letterSpacing: number,
+  font: number = FONT
 ): LabelRect {
-  const w = Math.max(...lines.map((l) => labelWidth(l, letterSpacing)));
-  const h = (lines.length - 1) * LINE_HEIGHT + FONT + 2 * PADY;
+  const lineHeight = font + 2; // MUST match the renderer's per-line stride
+  const w = Math.max(...lines.map((l) => labelWidth(l, letterSpacing, font)));
+  const h = (lines.length - 1) * lineHeight + font + 2 * PADY;
   return { x: cx - w / 2, y: cy - h / 2, w, h };
 }
 
@@ -252,6 +274,7 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
     italic: boolean;
     letterSpacing: number;
     color: string;
+    fontSize: number;
     sort: number; // priority key (lower first)
   };
   const candidates: Candidate[] = [];
@@ -328,8 +351,12 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
       italic: true,
       letterSpacing: WATER_LETTER_SPACING,
       color: waterColor,
-      // Water before any country (×1000), then by tier, then kind, then name.
-      sort: tier * 10 + KIND_ORDER[kind],
+      fontSize: FONT, // water names keep the base font (no footprint to scale on)
+      // Orientation-value bands (lower = earlier): MAJOR water (oceans + major
+      // seas, tier ≤ 1) leads at `tier*10+kind` (0..~16); MINOR water (tier ≥ 2:
+      // smaller seas, bays, gulfs, straits) drops to band 2 (2000+) — BELOW the
+      // country band (1000+), so a big country outranks a minor basin.
+      sort: (tier <= 1 ? 0 : 2000) + tier * 10 + KIND_ORDER[kind],
     });
   }
 
@@ -345,22 +372,49 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
     })
     .filter((r) => Number.isFinite(r.area) && r.area > 0)
     .sort((a, b) => b.area - a.area);
+  // Canvas linear extent — the denominator for the footprint size ramp below.
+  const canvasLinear = Math.sqrt(Math.max(1, width * height));
   let ci = 0;
   for (const r of ranked) {
-    const { c, w, h } = r;
-    // F2: an antimeridian-crossing / global-smear country yields a near-full-
-    // canvas bbox while its real landmass is split — the `path.centroid` anchor
-    // is then unreliable (mid-map, wrong basin). Drop such over-wide candidates
-    // rather than spend a top-priority slot on a mispositioned name.
-    if (w > width * 0.66 || h > height * 0.66) continue;
+    const { c, w, h, area } = r;
+    // F2: an antimeridian-crossing / global-smear country fills the canvas in
+    // BOTH dimensions while its real landmass is split — the `path.centroid`
+    // anchor is then unreliable (mid-map, wrong basin). Reject only that
+    // both-axes canvas-smear: a country that is merely wide-but-short (Canada
+    // hugging the top of a US frame) or tall-but-narrow (Chile) is a legitimate
+    // landmass whose clipExtent-clipped centroid still lands over its own ground,
+    // so it must NOT be dropped for footprint shape alone. A `curatedAnchor`
+    // (WORLD_LABEL_ANCHORS, e.g. Russia → European Russia) is trustworthy by
+    // construction — the smear concern is moot, so it bypasses this gate (the
+    // `insideViewport` check below still drops an anchor that projects off-frame).
+    if (!c.curatedAnchor && w > width * 0.66 && h > height * 0.66) continue;
     if (!insideViewport(c.anchor, width, height)) continue;
+    // Footprint-driven scale (Decision: big landmass = large, faded backdrop
+    // name). t∈[0,1] over the [MIN,MAX] linear-fraction band; font ramps up and
+    // ink rises in lockstep, so a bigger name reads as a large, softly-inked
+    // backdrop. A curated-anchor giant (Russia) keeps the standard big-country
+    // styling — its full-canvas bbox lands at the top of the ramp (font/ink like
+    // any large in-frame country), which is the intended subdued-backdrop look.
+    const sizeFrac = Math.sqrt(area) / canvasLinear;
+    const t = Math.min(
+      1,
+      Math.max(
+        0,
+        (sizeFrac - COUNTRY_SIZE_FRAC_MIN) /
+          (COUNTRY_SIZE_FRAC_MAX - COUNTRY_SIZE_FRAC_MIN)
+      )
+    );
+    const fontSize = Math.round(FONT + t * (COUNTRY_FONT_MAX - FONT));
+    const fade = Math.round(t * COUNTRY_FADE_MAX);
+    const color = fade > 0 ? mix(countryColor, palette.bg, fade) : countryColor;
     // Always the full country name — never an ISO abbreviation. If the name
     // doesn't fit the footprint, drop the label rather than abbreviate.
     const text = c.name;
-    const tw = labelWidth(text, 0);
-    // Approximate fit (Decision 4): name fits inside the footprint bbox. NOT
-    // true point-in-polygon — cartographic labels routinely overrun coastlines.
-    if (tw > w || FONT + 2 * PADY > h) continue;
+    const tw = labelWidth(text, 0, fontSize);
+    // Approximate fit (Decision 4): the (scaled) name fits inside the footprint
+    // bbox. NOT true point-in-polygon — cartographic labels routinely overrun
+    // coastlines. The bigger the font, the bigger the box it must clear.
+    if (tw > w || fontSize + 2 * PADY > h) continue;
     candidates.push({
       text,
       lines: [text],
@@ -368,9 +422,14 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
       cy: c.anchor[1],
       italic: false,
       letterSpacing: 0,
-      color: countryColor,
-      // Always after every water body (+1e6); larger area = earlier.
-      sort: 1_000_000 + ci++,
+      color,
+      fontSize,
+      // Band 1 (orientation-value ranking): above MINOR water (band 2, 2000+) but
+      // below MAJOR water — oceans + major seas (band 0, ≤~16). So a big country
+      // (US, Canada, Russia) outranks a minor sea/bay (Sargasso, Bahía de
+      // Campeche) yet never displaces an ocean. Larger area = earlier within the
+      // band (`ci` is the area-desc rank index).
+      sort: 1000 + ci++,
     });
   }
 
@@ -378,9 +437,24 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
   candidates.sort((a, b) => a.sort - b.sort);
   const placed: PlacedLabel[] = [];
   const placedRects: LabelRect[] = [];
+  // Guarantee country/state room: water can otherwise monopolise a small budget
+  // (a coastal view borders many oceans/seas), so reserve up to 2 slots for
+  // countries whenever any country candidate exists. No effect on pure-water
+  // views (`countryCount` 0 ⇒ cap = budget). Major water still leads by sort, so
+  // this only trims the LAST water bodies that would have crowded out a country.
+  const countryCount = candidates.reduce((n, c) => n + (c.italic ? 0 : 1), 0);
+  const waterCap = budget - Math.min(2, countryCount);
+  let waterPlaced = 0;
   for (const cand of candidates) {
     if (placed.length >= budget) break;
-    const rect = rectAround(cand.cx, cand.cy, cand.lines, cand.letterSpacing);
+    if (cand.italic && waterPlaced >= waterCap) continue;
+    const rect = rectAround(
+      cand.cx,
+      cand.cy,
+      cand.lines,
+      cand.letterSpacing,
+      cand.fontSize
+    );
     if (!rectFits(rect, width, height)) continue;
     // Water labels must sit over OPEN WATER and NEVER touch land — sample a grid
     // over every wrapped line (each line's own horizontal extent at five points);
@@ -408,6 +482,7 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
     if (collides(rect)) continue;
     if (placedRects.some((r) => overlapsPadded(rect, r, CONTEXT_PAD))) continue;
     placedRects.push(rect);
+    if (cand.italic) waterPlaced++;
     placed.push({
       x: cand.cx,
       y: cand.cy,
@@ -419,6 +494,7 @@ export function placeContextLabels(args: ContextLabelArgs): PlacedLabel[] {
       // cleanly on the basemap without one.
       halo: false,
       haloColor,
+      fontSize: cand.fontSize,
       italic: cand.italic,
       letterSpacing: cand.letterSpacing,
       ...(cand.lines.length > 1 ? { lines: cand.lines } : {}),

package/src/map/data/PROVENANCE.json

@@ -1 +1 @@
-{"assets":{"gazetteer.json":{"bytes":130767,"gzBytes":56261,"sha256":"5ad56e5ba0b3a4f9a6dc8bd3bf8b0fda0e7b86cbe4d85d231114f5dd967d65f7"},"lakes.json":{"bytes":6315,"gzBytes":1487,"sha256":"5840ffd49b8dbf30183a9534a72adf80b6e77ceec224665393fa94e956220323"},"mountain-ranges.json":{"bytes":90845,"gzBytes":26493,"sha256":"a698b3f296e61712fb39b3d8d42ec7c4699f8aadecb549367feb7d09f7785580"},"na-lakes.json":{"bytes":39387,"gzBytes":11281,"sha256":"2a41c04969209380d544a09efe354277e12d704458af95955201eb4f698d16c6"},"na-land.json":{"bytes":114082,"gzBytes":32375,"sha256":"7b94c9bb4e809c22813da5ae939e1ff6a781fd77a04d9c1585a9a82d2a195388"},"region-names.json":{"bytes":11667,"gzBytes":2235,"sha256":"059662d30b6ee8572c5943096905e05218e5f337e6973a9d43d6b41b7313a9ac"},"rivers.json":{"bytes":6707,"gzBytes":2158,"sha256":"3912508469099b1c37360c5505ea033c4ffa30ce95f7428e668e9d824cb81407"},"us-states.json":{"bytes":23313,"gzBytes":7413,"sha256":"0fe3a8937bc7566192662439f29a7866e8823d687290bcb003433ad5edd86567"},"water-bodies.json":{"bytes":4854,"gzBytes":2123,"sha256":"6d1a407a376c63518329c52189e2887053c4b61062af0597e060050ae8469635"},"world-coarse.json":{"bytes":55436,"gzBytes":18397,"sha256":"5cb42e3c8975dde56504ca5c68ece0a1e71d0929680b5fc8cdab758c8666dbf8"},"world-detail.json":{"bytes":163562,"gzBytes":46767,"sha256":"39f1736eaabe9e21190972be3157822be22ee84fdc41751237f2b516f09a7586"}},"counts":{"countries":175,"gazetteerAliases":8,"gazetteerCities":2119,"mountainRanges":205,"usStates":56,"waterBodies":113},"generatedBy":"scripts/build-map-data.mjs","sourceHashes":{"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/10m/physical/ne_10m_lakes.json":{"bytes":6648697,"sha256":"93c8fdf0e591e113f449d0d466e15c7a9841b9b6571c7afe41f95ba51b322452"},"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_lakes.json":{"bytes":27711,"sha256":"6f315b60488e0cf5da9c360e3ce593babf64c2f44cc21e2820c536f7a2aff606"},"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_rivers_lake_centerlines.json":{"bytes":54146,"sha256":"959e13128e4eb5a6ee530b8270c5017bcee9149ce48a97f6fe7fee1fce600b5d"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_admin_0_countries.geojson":{"bytes":13287234,"sha256":"239eec57ac17f100a11e2536cffc56752c318b50ae765b0918ff7aab4ce8f255"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_geography_regions_polys.geojson":{"bytes":5583870,"sha256":"b7b26e50ea917d3696aec87f932def2bf5f890f5770e441d59c162c6f4c92a77"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_110m_geography_marine_polys.geojson":{"bytes":534055,"sha256":"b9c3f7f557d0ff5217906adc82b66ecdac14aa7438df7e518cf6675d037bceb8"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_50m_geography_marine_polys.geojson":{"bytes":1163418,"sha256":"6fe58083e0cc5c7fad9e396970e28a8580bbd8770cfa4d1d7b5a34423e912f97"},"https://cdn.jsdelivr.net/npm/us-atlas@3.0.1/states-10m.json":{"bytes":114554,"sha256":"d76b391ccfa8bff601d51e3e3da5d43a89fa46cd5caca72ce731b383be5596d0"},"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-110m.json":{"bytes":107761,"sha256":"2516c915867c7baf18ddec727aec46c315541a07cfb3d79a6559b05d5e94eee8"},"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-50m.json":{"bytes":756420,"sha256":"04342cdc1e3016bcd7db1630de95684d67b79fe3c8c460321e87aef469502394"},"https://download.geonames.org/export/dump/cities5000.zip":{"bytes":5549002,"sha256":"d20e28b2f610da34c21fd82ff6a8e4d24ebe67eba2dccf65bd2c4332ff0f380a"}},"sources":{"geonames":{"citiesUrl":"https://download.geonames.org/export/dump/cities5000.zip","license":"CC BY 4.0 — https://creativecommons.org/licenses/by/4.0/","modificationDateRange":"2006-01-17..2026-06-02 (filtered subset)"},"lakes":{"url":"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_lakes.json","version":"natural-earth 110m (martynafford snapshot)"},"marineCoarse":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_110m_geography_marine_polys.geojson","version":"natural-earth 110m (nvkelso vector snapshot)"},"marineDetail":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_50m_geography_marine_polys.geojson","version":"natural-earth 50m (nvkelso vector snapshot)"},"mountainRanges":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_geography_regions_polys.geojson","version":"natural-earth 10m (nvkelso vector snapshot)"},"naLakes":{"url":"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/10m/physical/ne_10m_lakes.json","version":"natural-earth 10m (martynafford snapshot)"},"naLand":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_admin_0_countries.geojson","version":"natural-earth 10m (nvkelso vector snapshot)"},"rivers":{"url":"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_rivers_lake_centerlines.json","version":"natural-earth 110m (martynafford snapshot)"},"usAtlas":{"url":"https://cdn.jsdelivr.net/npm/us-atlas@3.0.1/states-10m.json","version":"3.0.1"},"worldCoarse":{"url":"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-110m.json","version":"2.0.2"},"worldDetail":{"url":"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-50m.json","version":"2.0.2"}},"tooling":{"mapshaper":"0.7.22"}}
+{"assets":{"airport-collisions.json":{"bytes":29,"gzBytes":49,"sha256":"a7d0107c5fcc6d787e010ea100ce1946bb724f7ae1a79eb1b862a8cf822ed1d8"},"airports.json":{"bytes":104083,"gzBytes":38159,"sha256":"c17294d4e3fd259e02c63c49c36c02d9ff34f4462103ff54516d29e93667cd76"},"gazetteer.json":{"bytes":130767,"gzBytes":56261,"sha256":"5ad56e5ba0b3a4f9a6dc8bd3bf8b0fda0e7b86cbe4d85d231114f5dd967d65f7"},"lakes.json":{"bytes":6315,"gzBytes":1487,"sha256":"5840ffd49b8dbf30183a9534a72adf80b6e77ceec224665393fa94e956220323"},"mountain-ranges.json":{"bytes":90845,"gzBytes":26493,"sha256":"a698b3f296e61712fb39b3d8d42ec7c4699f8aadecb549367feb7d09f7785580"},"na-lakes.json":{"bytes":39387,"gzBytes":11281,"sha256":"2a41c04969209380d544a09efe354277e12d704458af95955201eb4f698d16c6"},"na-land.json":{"bytes":114082,"gzBytes":32375,"sha256":"7b94c9bb4e809c22813da5ae939e1ff6a781fd77a04d9c1585a9a82d2a195388"},"region-names.json":{"bytes":11667,"gzBytes":2235,"sha256":"059662d30b6ee8572c5943096905e05218e5f337e6973a9d43d6b41b7313a9ac"},"rivers.json":{"bytes":6707,"gzBytes":2158,"sha256":"3912508469099b1c37360c5505ea033c4ffa30ce95f7428e668e9d824cb81407"},"us-states.json":{"bytes":23313,"gzBytes":7413,"sha256":"0fe3a8937bc7566192662439f29a7866e8823d687290bcb003433ad5edd86567"},"water-bodies.json":{"bytes":4854,"gzBytes":2123,"sha256":"6d1a407a376c63518329c52189e2887053c4b61062af0597e060050ae8469635"},"world-coarse.json":{"bytes":55436,"gzBytes":18397,"sha256":"5cb42e3c8975dde56504ca5c68ece0a1e71d0929680b5fc8cdab758c8666dbf8"},"world-detail.json":{"bytes":163562,"gzBytes":46767,"sha256":"39f1736eaabe9e21190972be3157822be22ee84fdc41751237f2b516f09a7586"}},"counts":{"airportCollisions":2,"airports":1565,"countries":175,"gazetteerAliases":8,"gazetteerCities":2119,"mountainRanges":205,"usStates":56,"waterBodies":113},"generatedBy":"scripts/build-map-data.mjs","sourceHashes":{"file:scripts/airports-snapshot.csv":{"bytes":308536,"sha256":"58b6e45bb91045c2897f1e7e14430aecc3b5eca911bcb389855495ff66ab9599"},"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/10m/physical/ne_10m_lakes.json":{"bytes":6648697,"sha256":"93c8fdf0e591e113f449d0d466e15c7a9841b9b6571c7afe41f95ba51b322452"},"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_lakes.json":{"bytes":27711,"sha256":"6f315b60488e0cf5da9c360e3ce593babf64c2f44cc21e2820c536f7a2aff606"},"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_rivers_lake_centerlines.json":{"bytes":54146,"sha256":"959e13128e4eb5a6ee530b8270c5017bcee9149ce48a97f6fe7fee1fce600b5d"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_admin_0_countries.geojson":{"bytes":13287234,"sha256":"239eec57ac17f100a11e2536cffc56752c318b50ae765b0918ff7aab4ce8f255"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_geography_regions_polys.geojson":{"bytes":5583870,"sha256":"b7b26e50ea917d3696aec87f932def2bf5f890f5770e441d59c162c6f4c92a77"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_110m_geography_marine_polys.geojson":{"bytes":534055,"sha256":"b9c3f7f557d0ff5217906adc82b66ecdac14aa7438df7e518cf6675d037bceb8"},"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_50m_geography_marine_polys.geojson":{"bytes":1163418,"sha256":"6fe58083e0cc5c7fad9e396970e28a8580bbd8770cfa4d1d7b5a34423e912f97"},"https://cdn.jsdelivr.net/npm/us-atlas@3.0.1/states-10m.json":{"bytes":114554,"sha256":"d76b391ccfa8bff601d51e3e3da5d43a89fa46cd5caca72ce731b383be5596d0"},"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-110m.json":{"bytes":107761,"sha256":"2516c915867c7baf18ddec727aec46c315541a07cfb3d79a6559b05d5e94eee8"},"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-50m.json":{"bytes":756420,"sha256":"04342cdc1e3016bcd7db1630de95684d67b79fe3c8c460321e87aef469502394"},"https://download.geonames.org/export/dump/cities5000.zip":{"bytes":5549002,"sha256":"d20e28b2f610da34c21fd82ff6a8e4d24ebe67eba2dccf65bd2c4332ff0f380a"}},"sources":{"geonames":{"citiesUrl":"https://download.geonames.org/export/dump/cities5000.zip","license":"CC BY 4.0 — https://creativecommons.org/licenses/by/4.0/","modificationDateRange":"2006-01-17..2026-06-02 (filtered subset)"},"lakes":{"url":"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_lakes.json","version":"natural-earth 110m (martynafford snapshot)"},"marineCoarse":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_110m_geography_marine_polys.geojson","version":"natural-earth 110m (nvkelso vector snapshot)"},"marineDetail":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_50m_geography_marine_polys.geojson","version":"natural-earth 50m (nvkelso vector snapshot)"},"mountainRanges":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_geography_regions_polys.geojson","version":"natural-earth 10m (nvkelso vector snapshot)"},"naLakes":{"url":"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/10m/physical/ne_10m_lakes.json","version":"natural-earth 10m (martynafford snapshot)"},"naLand":{"url":"https://cdn.jsdelivr.net/gh/nvkelso/natural-earth-vector@master/geojson/ne_10m_admin_0_countries.geojson","version":"natural-earth 10m (nvkelso vector snapshot)"},"ourairports":{"license":"Public Domain — https://ourairports.com/data/","note":"Lean committed slice (scheduled_service=yes + 3-letter iata_code). Regenerate is a deliberate, reviewed bump (ADR-4).","snapshot":"scripts/airports-snapshot.csv","source":"https://davidmegginson.github.io/ourairports-data/airports.csv"},"rivers":{"url":"https://cdn.jsdelivr.net/gh/martynafford/natural-earth-geojson@master/110m/physical/ne_110m_rivers_lake_centerlines.json","version":"natural-earth 110m (martynafford snapshot)"},"usAtlas":{"url":"https://cdn.jsdelivr.net/npm/us-atlas@3.0.1/states-10m.json","version":"3.0.1"},"worldCoarse":{"url":"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-110m.json","version":"2.0.2"},"worldDetail":{"url":"https://cdn.jsdelivr.net/npm/world-atlas@2.0.2/countries-50m.json","version":"2.0.2"}},"tooling":{"mapshaper":"0.7.22"}}

package/src/map/data/airport-collisions.json

@@ -0,0 +1 @@
+{"collisions":["aba","ufa"]}