@chrtco/sdk 0.10.44 → 0.10.46

package/dist/atlas/browser.d.cts

@@ -42,7 +42,7 @@ interface SymbolImageSpec {
  */
 declare const BASE_PATTERN_GLYPHS: readonly string[];
 
-/** The two world hatches, in this palette. */
+/** The two world hatches, in this palette (coloured by `basePatternSvg`). */
 declare function basePatternImageSpecs(palette: ColorTableName): SymbolImageSpec[];
 /** The CHRT house glyphs (not the hatches, which `basePatternImageSpecs` owns). */
 declare function chrtImageSpecs(palette: ColorTableName): SymbolImageSpec[];
@@ -217,7 +217,7 @@ declare function reloadS101SymbolImages(map: maplibregl.Map, colorTable: ColorTa
  * NOTHING with no error anywhere (the crosshatch silently absent from the
  * whole world map). Two images, loaded beside every family's loader.
  *
- * Themed per palette (`themeChrtGlyph`): the hatches cover the whole uncharted
+ * Themed per palette (`basePatternSvg`): the hatches cover the whole uncharted
  * world, and at NIGHT they were the one grey-blue texture on a dark chart.
  */
 declare function loadBasePatternImages(map: maplibregl.Map, colorTable?: ColorTableName): Promise<void>;
@@ -343,6 +343,8 @@ interface RethemeResult {
 /**
  * Register every spec the map does not already hold. A first load, so there is
  * nothing to update in place; images the map already has are left alone.
+ *
+ * A map removed while a decode was out is left alone too — see `isMapLive`.
  */
 declare function loadSymbolImageSpecs(map: maplibregl.Map, specs: readonly SymbolImageSpec[]): Promise<void>;
 /**
@@ -352,6 +354,9 @@ declare function loadSymbolImageSpecs(map: maplibregl.Map, specs: readonly Symbo
  * reload). One it does not hold, or holds at another size, is added — the
  * slow path, which only a first load or a drifted spec should ever take, and
  * `RethemeResult.added` says how often it did.
+ *
+ * A map removed part-way (`isMapLive`) ends the re-theme as `aborted`: there is
+ * nothing left to draw on, and whoever removed it is building the next one.
  */
 declare function rethemeSymbolImages(map: maplibregl.Map, specs: readonly SymbolImageSpec[], opts?: RethemeOptions): Promise<RethemeResult>;
 

package/dist/atlas/browser.d.ts

@@ -42,7 +42,7 @@ interface SymbolImageSpec {
  */
 declare const BASE_PATTERN_GLYPHS: readonly string[];
 
-/** The two world hatches, in this palette. */
+/** The two world hatches, in this palette (coloured by `basePatternSvg`). */
 declare function basePatternImageSpecs(palette: ColorTableName): SymbolImageSpec[];
 /** The CHRT house glyphs (not the hatches, which `basePatternImageSpecs` owns). */
 declare function chrtImageSpecs(palette: ColorTableName): SymbolImageSpec[];
@@ -217,7 +217,7 @@ declare function reloadS101SymbolImages(map: maplibregl.Map, colorTable: ColorTa
  * NOTHING with no error anywhere (the crosshatch silently absent from the
  * whole world map). Two images, loaded beside every family's loader.
  *
- * Themed per palette (`themeChrtGlyph`): the hatches cover the whole uncharted
+ * Themed per palette (`basePatternSvg`): the hatches cover the whole uncharted
  * world, and at NIGHT they were the one grey-blue texture on a dark chart.
  */
 declare function loadBasePatternImages(map: maplibregl.Map, colorTable?: ColorTableName): Promise<void>;
@@ -343,6 +343,8 @@ interface RethemeResult {
 /**
  * Register every spec the map does not already hold. A first load, so there is
  * nothing to update in place; images the map already has are left alone.
+ *
+ * A map removed while a decode was out is left alone too — see `isMapLive`.
  */
 declare function loadSymbolImageSpecs(map: maplibregl.Map, specs: readonly SymbolImageSpec[]): Promise<void>;
 /**
@@ -352,6 +354,9 @@ declare function loadSymbolImageSpecs(map: maplibregl.Map, specs: readonly Symbo
  * reload). One it does not hold, or holds at another size, is added — the
  * slow path, which only a first load or a drifted spec should ever take, and
  * `RethemeResult.added` says how often it did.
+ *
+ * A map removed part-way (`isMapLive`) ends the re-theme as `aborted`: there is
+ * nothing left to draw on, and whoever removed it is building the next one.
  */
 declare function rethemeSymbolImages(map: maplibregl.Map, specs: readonly SymbolImageSpec[], opts?: RethemeOptions): Promise<RethemeResult>;
 

package/dist/atlas/browser.js

@@ -1112,6 +1112,11 @@ function applyStrokeBoost(svgString, multiplier) {
 }
 var S52_STROKE_BOOST = 1;
 
+// src/atlas/map-live.ts
+function isMapLive(map) {
+  return map._removed !== true;
+}
+
 // src/atlas/symbol-images-browser.ts
 function dataUrl(svg2) {
   return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg2)}`;
@@ -1252,9 +1257,9 @@ function existingSize(map, id) {
 async function loadSymbolImageSpecs(map, specs) {
   await Promise.all(
     specs.map(async (spec) => {
-      if (map.hasImage(spec.id)) return;
+      if (!isMapLive(map) || map.hasImage(spec.id)) return;
       const img = await decode(spec);
-      if (!img || map.hasImage(spec.id)) return;
+      if (!img || !isMapLive(map) || map.hasImage(spec.id)) return;
       map.addImage(spec.id, img, { sdf: spec.sdf, pixelRatio: spec.pixelRatio });
     })
   );
@@ -1278,7 +1283,7 @@ async function rethemeSymbolImages(map, specs, opts = {}) {
     }
     const sources = await sourcesFor(unit, decoded[u]);
     for (let i = 0; i < unitSpecs.length; i++) {
-      if (opts.signal?.aborted) {
+      if (opts.signal?.aborted || !isMapLive(map)) {
         result.aborted = true;
         break outer;
       }
@@ -1312,6 +1317,10 @@ async function rethemeSymbolImages(map, specs, opts = {}) {
       }
     }
   }
+  if (!isMapLive(map)) {
+    result.aborted = true;
+    return result;
+  }
   map.triggerRepaint();
   opts.onProgress?.({ done, total });
   return result;
@@ -1488,7 +1497,7 @@ async function imageToBitmap(img, size) {
   }
 }
 function addImageToMap(map, name, image) {
-  if (map.hasImage(name)) return;
+  if (!isMapLive(map) || map.hasImage(name)) return;
   try {
     map.addImage(name, image, {
       sdf: SDF_SYMBOLS2.has(name),
@@ -1515,6 +1524,7 @@ async function loadS52SymbolImagesCached(map, colorTable = "DAY", opts = {}) {
       cached = /* @__PURE__ */ new Map();
     }
   }
+  if (!isMapLive(map)) return;
   for (const [name, bitmap] of cached) {
     addImageToMap(map, name, bitmap);
   }
@@ -1528,7 +1538,7 @@ async function loadS52SymbolImagesCached(map, colorTable = "DAY", opts = {}) {
       const size = rasterSize2(name, themed);
       const img = await decodeSvgToImage(themed, size);
       if (!img) return;
-      addImageToMap(map, name, img);
+      if (isMapLive(map)) addImageToMap(map, name, img);
       try {
         const bitmap = await imageToBitmap(img, size);
         if (!bitmap) return;
@@ -15543,7 +15553,7 @@ async function loadSymbolImages(map) {
       const svgStr = sym.getSvg();
       const img = new Image(SIZE2, SIZE2);
       img.onload = () => {
-        if (!map.hasImage(sym.id)) {
+        if (isMapLive(map) && !map.hasImage(sym.id)) {
           map.addImage(sym.id, img, { sdf: false });
         }
         resolve();
@@ -15573,7 +15583,7 @@ async function loadThemedBridgeImages(map, colorTable) {
       const svgStr = sym.getThemedSvg(chblk, trfcd);
       const img = new Image(SIZE2, SIZE2);
       img.onload = () => {
-        if (!map.hasImage(sym.id)) {
+        if (isMapLive(map) && !map.hasImage(sym.id)) {
           map.addImage(sym.id, img, { sdf: false });
         }
         resolve();
@@ -15691,6 +15701,126 @@ function themeChrtGlyph(svg2, palette = "DAY") {
   );
 }
 
+// src/atlas/base-layers.ts
+var UNCHARTED_PATTERN = "chrt:hatch-uncharted";
+function inlandHatchColor(palette) {
+  return (BASE_THEMES[palette] ?? BASE_THEMES.DAY).inlandHatch;
+}
+function basePatternSvg(name, palette) {
+  const raw = CHRT_GLYPH_SVGS[name];
+  if (!raw) return null;
+  if (`${CHRT_ICON_PREFIX}${name}` === UNCHARTED_PATTERN) {
+    return raw.replace(/stroke="#[0-9a-fA-F]{3,6}"/g, `stroke="${inlandHatchColor(palette)}"`);
+  }
+  return themeChrtGlyph(raw, palette);
+}
+var BASE_THEMES = {
+  DAY: {
+    // ── `earth` is the jurisdiction tan DIMMED (~0.55), not a blue-grey ──
+    // Outside the jurisdiction the map still owes the reader "what is land".
+    // State 3 in the header is "the geography, under a crosshatch", and until
+    // 2026-08-31 that geography was unreadable: earth #2A3439 against sea
+    // #1B2328 measured 1.25:1, so Hispaniola showed charted boxes with tan
+    // land inside and nothing recognisable around them (owner report: "no
+    // land painting down near the DR at some zooms"). Land is warm and sea is
+    // cool because that is what land and sea are; dimming the JURISDICTION
+    // tan rather than inventing a colour says the true thing — this is the
+    // same land, we simply do not carry charts for it. Held against BOTH
+    // neighbours: legible over sea, and never mistakable for the full tan of
+    // a country we do carry. DAY 3.59:1 vs sea, 3.17:1 vs tan.
+    earth: "#807761",
+    water: "#1B2328",
+    river: "#24313A",
+    boundary: "#4A575E",
+    jurisdiction: "#D4C69D",
+    // CHRTland's own tan — one land colour
+    inlandWater: "#B9CFDD",
+    // muted, unmistakably not a charted blue
+    // The uncharted hatch's stripe, held to 2.3:1 against `inlandWater` in
+    // every palette (`inland-hatch-contrast.test.ts`) — the hatch says "we have
+    // not charted this water", and stripes the eye cannot find say nothing.
+    // DAY 3.08:1, darker than its ground. Also the colour the artwork file
+    // itself is drawn in.
+    inlandHatch: "#5B7383",
+    // State furniture. These three were referenced by the layers but missing
+    // from this table (and its type — the long-standing TS2339 trio), so the
+    // lines shipped on MapLibre's DEFAULT black. Now deliberate: a hairline
+    // a shade deeper than the tan, quiet caps, tan halo.
+    stateLine: "#B1A077",
+    stateLabel: "#8E8468",
+    stateHalo: "#D4C69D",
+    // Rough-lake furniture (owner ask 2026-08-28: "the lakes need labels,
+    // and shorelines drawn"): a shoreline a shade deeper than the rough
+    // water, and a name in the water's own voice, haloed by the water.
+    inlandShore: "#8FA9BA",
+    inlandLabel: "#54707F",
+    inlandHalo: "#B9CFDD"
+  },
+  DUSK: {
+    // ── Re-derived 2026-09-01: the basemap sits UNDER the chart ──────────
+    // These were the DAY tones scaled by a constant, never measured against
+    // the DUSK chart — so `jurisdiction` came out at L=0.506 against a chart
+    // whose own land (LANDA #8a7d5e) is L=0.209, i.e. the context layer was
+    // 2.4x brighter than the data layer. Now capped at the chart's own land.
+    // The rest of the block rides the same 0.666 channel factor so every
+    // relationship the palette already chose is preserved, only moved down.
+    // `water` is deliberately NOT scaled: it is the reference the land/sea
+    // floor is measured against.
+    earth: "#544E3E",
+    water: "#161D21",
+    river: "#141B20",
+    boundary: "#293135",
+    jurisdiction: "#867D64",
+    inlandWater: "#62717A",
+    // Owner's choice, 2026-10-04: dark stripes, 2.37:1. The DAY stripe here
+    // was 1.02:1 — invisible, so an uncharted lake read as plain water.
+    inlandHatch: "#2E383F",
+    // Label stays DARK here — the halo is still mid-toned, so 3:1 is reachable
+    // downward and a bright label would be a new light source at dusk.
+    stateLine: "#B5A987",
+    stateLabel: "#38342A",
+    stateHalo: "#867D64",
+    inlandShore: "#4D5B67",
+    inlandLabel: "#212629",
+    inlandHalo: "#62717A"
+  },
+  NIGHT: {
+    // ── Re-derived 2026-09-01 — the owner-reported night defect ──────────
+    // `jurisdiction` was L=0.240 against a chart whose own land (LANDA
+    // #3a3020) is L=0.031: the world basemap was 7.7x BRIGHTER than the chart
+    // it sits under, so at z<11 the uncharted interior read as a pale
+    // continent-sized slab on a night chart. Capped at the chart's own land.
+    //
+    // ⚠ `earth` AND `jurisdiction` CONVERGE HERE, and that is forced, not
+    // sloppy. Holding earth 2:1 above the ocean AND 2:1 below the jurisdiction
+    // tan requires jurisdiction >= L 0.174 — 5.6x the chart's own land. At
+    // night the range between the ocean (L 0.006) and the cap (L 0.031) is too
+    // compressed to carry two land tones. COVERAGE IS STILL SAID, by the
+    // `chrt:hatch-nocoverage` crosshatch, which is a stronger signal than tone
+    // and is the one thing that cannot be lost to palette compression.
+    //
+    // Labels invert to light-on-dark: 3:1 downward is unreachable off a halo
+    // this close to black, and CHRTland's own night town labels already sit at
+    // L=0.177 for exactly this reason.
+    earth: "#333026",
+    water: "#10161A",
+    river: "#090D0F",
+    boundary: "#131719",
+    jurisdiction: "#353128",
+    inlandWater: "#232A30",
+    // The DAY stripe, lighter than this ground: 2.92:1, and L 0.16, under the
+    // NIGHT muted-ink ceiling (`night-luminance.test.ts`). Red night draws the
+    // NIGHT chart, so this is its stripe too.
+    inlandHatch: "#5B7383",
+    stateLine: "#484236",
+    stateLabel: "#837963",
+    stateHalo: "#353128",
+    inlandShore: "#1C2227",
+    inlandLabel: "#617484",
+    inlandHalo: "#232A30"
+  }
+};
+
 // src/atlas/chrtraster-svgs-generated.ts
 var CHRTRASTER_SVGS = {
   "BCNGEN05": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M 11.6 26.8 L 11.6 1.0 L 20.0 1.0 L 20.0 27.2 L 19.4 25.8 L 19.3 24.7 L 18.9 24.3 L 17.6 23.7 L 16.5 23.4 L 16.2 23.2 L 15.1 23.4 L 14.5 23.4 L 13.8 23.7 L 13.3 24.5 L 12.7 25.3 L 12.0 25.8 L 11.6 26.6 Z" fill="CHWHT" /><path d="M 11.6 26.8 L 11.6 1.0 L 20.0 1.0 L 20.0 27.2 L 19.4 25.8 L 19.3 24.7 L 18.9 24.3 L 17.6 23.7 L 16.5 23.4 L 16.2 23.2 L 15.1 23.4 L 14.5 23.4 L 13.8 23.7 L 13.3 24.5 L 12.7 25.3 L 12.0 25.8 L 11.6 26.6 Z" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linejoin="round" /><circle cx="16.00" cy="27.21" r="3.79" fill="none" stroke="CHBLK" stroke-width="1.2" /><path d="M 7.3 27.2 L 12.2 27.2" fill="none" stroke="CHBLK" stroke-width="1.2" /><path d="M 19.8 27.2 L 24.7 27.2" fill="none" stroke="CHBLK" stroke-width="1.2" /></svg>',
@@ -16290,10 +16420,9 @@ function declared(id, svg2) {
 }
 function basePatternImageSpecs(palette) {
   return BASE_PATTERN_GLYPHS.flatMap((name) => {
-    const raw = CHRT_GLYPH_SVGS[name];
-    if (!raw) return [];
+    const svg2 = basePatternSvg(name, palette);
+    if (!svg2) return [];
     const id = `${CHRT_ICON_PREFIX}${name}`;
-    const svg2 = themeChrtGlyph(raw, palette);
     return [{ id, svg: svg2, ...declared(id, svg2), pixelRatio: 1, sdf: false }];
   });
 }