@chrtco/sdk 0.10.38 → 0.10.40

package/dist/index.js

@@ -367,9 +367,13 @@ var RELIEF_REGION = "CHRT_RELIEF";
 var BASE_REGION = "CHRT_BASE";
 var BASE_MINZOOM = 0;
 var BASE_MAXZOOM = 11;
+var BASE_ATTRIBUTION = "\xA9 CHRT \xB7 Made with Natural Earth \xB7 \xA9 OpenStreetMap contributors";
+var LAND_ATTRIBUTION = "\xA9 OpenStreetMap contributors";
+var RELIEF_ATTRIBUTION = "Elevation: USGS 3D Elevation Program";
 var RELIEF_MINZOOM = 9;
 var RELIEF_MAXZOOM = 13;
 var RELIEF_TILE_SIZE = 512;
+var RELIEF_ENCODING = "terrarium";
 var BUILD_PARAM = "v";
 function tileTemplate(base, region, extension, buildId) {
   const url = `${base}/v1/tiles/${region}/{z}/{x}/{y}.${extension}`;
@@ -413,14 +417,15 @@ function buildSources(opts = {}) {
       type: "vector",
       tiles: [tileTemplate(base, BASE_REGION, "mvt", buildFor(BASE_REGION))],
       minzoom: BASE_MINZOOM,
-      maxzoom: BASE_MAXZOOM
+      maxzoom: BASE_MAXZOOM,
+      attribution: BASE_ATTRIBUTION
     };
   }
   if (opts.relief) {
     sources[RELIEF_REGION] = {
       type: "raster-dem",
       tiles: [tileTemplate(base, RELIEF_REGION, "png", buildFor(RELIEF_REGION))],
-      encoding: "terrarium",
+      encoding: RELIEF_ENCODING,
       tileSize: RELIEF_TILE_SIZE,
       minzoom: RELIEF_MINZOOM,
       maxzoom: RELIEF_MAXZOOM
@@ -446,6 +451,7 @@ var TilesEndpoint = class {
     if (opts.mode) params.set("mode", opts.mode);
     if (opts.land) params.set("land", "1");
     if (opts.relief) params.set("relief", "1");
+    if (opts.units === "imperial") params.set("units", "imperial");
     const query2 = params.size > 0 ? `?${params.toString()}` : "";
     return `${this.tileBaseUrl}/v1/styles/${this.region}/style.json${query2}`;
   }
@@ -571,6 +577,9 @@ var WeatherEndpoint = class {
    *
    * `unavailable` names every field the station did not report, so absence is
    * stated rather than inferred from a missing key.
+   *
+   * Pass `hours` for the station's recent readings as `series` — NDBC's own
+   * readings at NDBC's own instants, never interpolated.
    */
   async conditions(options) {
     return this.http.request(
@@ -579,7 +588,8 @@ var WeatherEndpoint = class {
         lat: options.lat,
         lon: options.lon,
         units: options.units,
-        station: options.station
+        station: options.station,
+        hours: options.hours
       },
       options.signal
     );
@@ -1043,10 +1053,10 @@ async function readManifest(manifestPath, fs) {
   if (!manifestPath) return emptyManifest();
   if (!await fs.exists(manifestPath)) return emptyManifest();
   const raw = await fs.readFile(manifestPath);
-  const text = new TextDecoder().decode(raw);
+  const text2 = new TextDecoder().decode(raw);
   let parsed;
   try {
-    parsed = JSON.parse(text);
+    parsed = JSON.parse(text2);
   } catch {
     throw new OfflineError(
       "unexpected_response",
@@ -1070,8 +1080,8 @@ async function readManifest(manifestPath, fs) {
   };
 }
 async function writeManifest(manifestPath, fs, manifest) {
-  const text = JSON.stringify(manifest, null, 2);
-  const bytes = new TextEncoder().encode(text);
+  const text2 = JSON.stringify(manifest, null, 2);
+  const bytes = new TextEncoder().encode(text2);
   await fs.writeFile(manifestPath, bytes);
 }
 function usedBytes(manifest, excludeRegion) {
@@ -2036,110 +2046,438 @@ function s57AbbrTable(acronym) {
   return cached;
 }
 
-// src/interact/decode.ts
-function nameAbbrTable(acronym) {
-  const names = s57NameTable(acronym);
-  const abbrs = s57AbbrTable(acronym);
-  const out = {};
-  for (const [code, name] of Object.entries(names)) {
-    const abbr = abbrs[Number(code)];
-    if (abbr !== void 0) out[Number(code)] = { name, abbr };
-  }
-  return out;
-}
-var COLOUR_HEX = {
-  1: "#ffffff",
-  2: "#333333",
-  3: "#ef4444",
-  4: "#22c55e",
-  5: "#3b82f6",
-  6: "#eab308",
-  7: "#9ca3af",
-  8: "#92400e",
-  9: "#f59e0b",
-  10: "#8b5cf6",
-  11: "#f97316",
-  12: "#d946ef",
-  13: "#f472b6"
+// src/atlas/s52-colors.ts
+var S52_DAY = {
+  // Depth
+  NODTA: "#a4a4a4",
+  DEPIT: "#009678",
+  DEPVS: "#7fbfdf",
+  DEPMS: "#a7d4e8",
+  DEPMD: "#cae7f3",
+  DEPDW: "#ecf7fc",
+  // Land / topography
+  LANDA: "#e6d1a1",
+  LANDF: "#c8b078",
+  CHBRN: "#ab7948",
+  CHGRF: "#878787",
+  CHGRD: "#555555",
+  // Chart symbology
+  CHBLK: "#000000",
+  CSTLN: "#000000",
+  OUTLW: "#000000",
+  BKAJ1: "#4d4d4d",
+  // Navigation / traffic
+  TRFCD: "#d200d2",
+  TRFCF: "#e680e6",
+  RESBL: "#0064b4",
+  APTS1: "#d200d2",
+  // Danger / hazard
+  DNGHL: "#ff0000",
+  ISHDG: "#cc0000",
+  // Lights
+  LITRD: "#ee0000",
+  LITGN: "#00c800",
+  LITYW: "#fddc00",
+  LITWT: "#ffffff",
+  LITBL: "#0064ff",
+  LITOR: "#ff8c00",
+  // Buoys / marks
+  RADHI: "#68e456",
+  RADLO: "#3f8a34",
+  PLRTE: "#dc4025",
+  ARPAT: "#3fa56f",
+  ISDNG: "#c545c3",
+  // Chart colours
+  CHRED: "#f15469",
+  CHGRN: "#68e456",
+  CHYLW: "#f4da48",
+  CHMGD: "#c545c3",
+  CHMGF: "#d3a6e9",
+  CHWHT: "#d4eaee",
+  CHCOR: "#eb7d36",
+  // Soundings
+  SNDG1: "#7d898c",
+  SNDG2: "#070707",
+  DEPSC: "#525a5c",
+  DEPCN: "#555555",
+  // Utility / infrastructure
+  UINFD: "#070707",
+  UINFF: "#7d898c",
+  UINFR: "#f15469",
+  UINFG: "#68e456",
+  UINFO: "#eb7d36",
+  UINFB: "#3a78f0",
+  UINFM: "#c545c3",
+  UIBCK: "#d4eaee",
+  UIBDR: "#7d898c",
+  UIAFD: "#73b6ef",
+  UIAFF: "#c9b97a",
+  PIPLN: "#55aa00",
+  // Outlines
+  OUTLL: "#c9b97a",
+  // Miscellaneous
+  SCLBR: "#eb7d36",
+  NINFO: "#eb7d36",
+  ADINF: "#b29f34",
+  RESGR: "#7d898c",
+  SHIPS: "#070707",
+  PSTRK: "#070707",
+  SYTRK: "#7d898c",
+  APLRT: "#eb7d36",
+  CURSR: "#eb7d36",
+  BKAJ2: "#232728",
+  RES01: "#a3b4b7",
+  RES02: "#a3b4b7",
+  RES03: "#a3b4b7"
 };
-var LITCHR_TABLE = nameAbbrTable("LITCHR");
-var COLOUR_TABLE = Object.fromEntries(
-  Object.values(COLOUR_CODES).filter((c) => c.abbr !== void 0 && COLOUR_HEX[c.code] !== void 0).map((c) => [c.code, { name: c.name, abbr: c.abbr, hex: COLOUR_HEX[c.code] }])
-);
-var BOYSHP_TABLE = s57NameTable("BOYSHP");
-var CATLAM_TABLE = s57NameTable("CATLAM");
-var CATCAM_TABLE = s57NameTable("CATCAM");
-var CATLMK_TABLE = s57NameTable("CATLMK");
-var CATFOG_TABLE = s57NameTable("CATFOG");
-var CATFOG_ABBR_TABLE = s57AbbrTable("CATFOG");
-var CATFOG_NAUTOPHONE = Object.values(CATFOG_CODES).find(
-  (c) => c.name.toLowerCase() === "nautophone"
-)?.code;
-var CATLIT_TABLE = s57NameTable("CATLIT");
-var TOPSHP_TABLE = s57NameTable("TOPSHP");
-var STATUS_TABLE = s57NameTable("STATUS");
-var MARSYS_TABLE = s57NameTable("MARSYS");
-var LAYER_TYPE_MAP = {
-  BOYLAT: "Lateral Buoy",
-  BOYCAR: "Cardinal Buoy",
-  BOYSPP: "Special Purpose Buoy",
-  BOYISD: "Isolated Danger Buoy",
-  BOYSAW: "Safe Water Buoy",
-  BCNLAT: "Lateral Beacon",
-  BCNCAR: "Cardinal Beacon",
-  BCNSPP: "Special Purpose Beacon",
-  BCNISD: "Isolated Danger Beacon",
-  BCNSAW: "Safe Water Beacon",
-  LIGHTS: "Light",
-  DAYMAR: "Daymark",
-  FOGSIG: "Fog Signal",
-  RTPBCN: "Radar Transponder Beacon",
-  RDOSTA: "Radio/Radar Station",
-  TOPMAR: "Topmark",
-  MORFAC: "Mooring Facility",
-  LNDMRK: "Landmark",
-  SISTAT: "Signal Station",
-  PILBOP: "Pilot Boarding Place",
-  HRBFAC: "Harbour Facility",
-  SMCFAC: "Small Craft Facility",
-  CRANES: "Crane",
-  OFSPLF: "Offshore Platform",
-  ACHBRT: "Anchor Berth",
-  DISMAR: "Distance Mark",
-  LITVES: "Light Vessel",
-  LITFLT: "Light Float"
+var S52_DUSK = {
+  NODTA: "#6b6b6b",
+  DEPIT: "#006650",
+  DEPVS: "#487085",
+  DEPMS: "#608a9d",
+  DEPMD: "#7ba6b8",
+  DEPDW: "#95bfd0",
+  LANDA: "#8a7d5e",
+  LANDF: "#7a6a48",
+  CHBRN: "#6e4e30",
+  CHGRF: "#585858",
+  CHGRD: "#3a3a3a",
+  CHBLK: "#b0b0b0",
+  CSTLN: "#b0b0b0",
+  OUTLW: "#b0b0b0",
+  BKAJ1: "#707070",
+  TRFCD: "#a000a0",
+  TRFCF: "#b060b0",
+  RESBL: "#004a88",
+  APTS1: "#a000a0",
+  DNGHL: "#cc0000",
+  ISHDG: "#990000",
+  LITRD: "#bb0000",
+  LITGN: "#009900",
+  LITYW: "#c8b000",
+  LITWT: "#d0d0d0",
+  LITBL: "#004abb",
+  LITOR: "#cc7000",
+  RADHI: "#009940",
+  RADLO: "#2d6330",
+  PLRTE: "#a03020",
+  ARPAT: "#306040",
+  ISDNG: "#903090",
+  CHRED: "#b05060",
+  CHGRN: "#509040",
+  CHYLW: "#b0a030",
+  CHMGD: "#903090",
+  CHMGF: "#905090",
+  CHWHT: "#90a0a0",
+  CHCOR: "#a06030",
+  SNDG1: "#606060",
+  SNDG2: "#b0b0b0",
+  DEPSC: "#606060",
+  DEPCN: "#2E2E2E",
+  UINFD: "#b0b0b0",
+  UINFF: "#606060",
+  UINFR: "#b05060",
+  UINFG: "#509040",
+  UINFO: "#a06030",
+  UINFB: "#304090",
+  UINFM: "#903090",
+  UIBCK: "#1a1a1a",
+  UIBDR: "#606060",
+  UIAFD: "#405060",
+  UIAFF: "#605840",
+  PIPLN: "#3d7a00",
+  OUTLL: "#605840",
+  SCLBR: "#a06030",
+  NINFO: "#a06030",
+  ADINF: "#807020",
+  RESGR: "#606060",
+  SHIPS: "#b0b0b0",
+  PSTRK: "#b0b0b0",
+  SYTRK: "#606060",
+  APLRT: "#a06030",
+  CURSR: "#cc0000",
+  BKAJ2: "#252525",
+  RES01: "#606060",
+  RES02: "#606060",
+  RES03: "#606060"
 };
-var NAV_AID_QUERY_LAYERS = [
-  "enc-BOYLAT",
-  "enc-BOYCAR",
-  "enc-BOYSPP",
-  "enc-BOYISD",
-  "enc-BOYSAW",
-  "enc-BCNLAT",
-  "enc-BCNCAR",
-  "enc-BCNSPP",
-  "enc-BCNISD",
-  "enc-BCNSAW",
-  "enc-LIGHTS",
-  "enc-LIGHTS-point",
-  "enc-DAYMAR",
-  "enc-FOGSIG",
-  "enc-RTPBCN",
-  "enc-RDOSTA",
-  "enc-TOPMAR",
-  "enc-MORFAC",
-  "enc-MORFAC-point",
-  "enc-LNDMRK",
-  "enc-LNDMRK-point",
-  "enc-SISTAT",
-  "enc-SISTAT-point",
-  "enc-PILBOP",
-  "enc-PILBOP-point",
-  "enc-HRBFAC",
-  "enc-SMCFAC",
-  "enc-CRANES",
-  "enc-CRANES-point",
-  "enc-OFSPLF",
+var S52_NIGHT = {
+  NODTA: "#3a3a32",
+  DEPIT: "#003828",
+  DEPVS: "#356577",
+  DEPMS: "#265066",
+  DEPMD: "#102e44",
+  DEPDW: "#051a28",
+  LANDA: "#3a3020",
+  LANDF: "#302818",
+  CHBRN: "#382410",
+  CHGRF: "#2a2a22",
+  CHGRD: "#1e1e18",
+  CHBLK: "#c8aa78",
+  CSTLN: "#c8aa78",
+  OUTLW: "#c8aa78",
+  BKAJ1: "#504830",
+  TRFCD: "#6e006e",
+  TRFCF: "#803880",
+  RESBL: "#002a50",
+  APTS1: "#6e006e",
+  DNGHL: "#a00000",
+  ISHDG: "#700000",
+  LITRD: "#880000",
+  LITGN: "#006600",
+  LITYW: "#887800",
+  LITWT: "#a09878",
+  LITBL: "#003088",
+  LITOR: "#884800",
+  RADHI: "#005528",
+  RADLO: "#1a3a20",
+  PLRTE: "#6e2018",
+  ARPAT: "#1a3028",
+  ISDNG: "#481848",
+  CHRED: "#682030",
+  CHGRN: "#285020",
+  CHYLW: "#685828",
+  CHMGD: "#481848",
+  CHMGF: "#482848",
+  CHWHT: "#484840",
+  CHCOR: "#683818",
+  SNDG1: "#383028",
+  SNDG2: "#c8aa78",
+  DEPSC: "#383028",
+  // ⚠ DELIBERATE DEVIATION from the published S-52 NIGHT value (#1f2223),
+  // recorded here because `docs/validation/s52-spec-gap-matrix.json` tracks
+  // this token as `value-differs` and the CHRTstyles programme is bringing
+  // colours TO spec — this one moves further away, on purpose.
+  //
+  // Spec NIGHT DEPCN is near-black, which measures ~1.1:1 against this
+  // palette's own deep water (#051a28). S-52's NIGHT table assumes a
+  // dark-adapted eye in a darkened wheelhouse; on a phone or a laptop at
+  // anchor it is not dim, it is absent — reported as "can't see bottom
+  // contours in night mode only". A contour nobody can see fails the
+  // standard's intent while matching its number.
+  //
+  // The palette already makes this trade elsewhere and in the same
+  // direction: NIGHT's CHBLK/CSTLN/OUTLW are #c8aa78, light warm linework on
+  // dark water. This value is that family, dimmed to stay subordinate to the
+  // coastline. Revisit with the CHRTstyles programme, which owns the
+  // spec-vs-legibility call across all 63 tokens.
+  DEPCN: "#A68E84",
+  UINFD: "#c8aa78",
+  UINFF: "#383028",
+  UINFR: "#682030",
+  UINFG: "#285020",
+  UINFO: "#683818",
+  UINFB: "#182848",
+  UINFM: "#481848",
+  UIBCK: "#0a0a08",
+  UIBDR: "#383028",
+  UIAFD: "#182838",
+  UIAFF: "#302818",
+  PIPLN: "#284800",
+  OUTLL: "#302818",
+  SCLBR: "#683818",
+  NINFO: "#683818",
+  ADINF: "#483818",
+  RESGR: "#383028",
+  SHIPS: "#c8aa78",
+  PSTRK: "#c8aa78",
+  SYTRK: "#484030",
+  APLRT: "#683818",
+  CURSR: "#a00000",
+  BKAJ2: "#0a0a08",
+  RES01: "#383028",
+  RES02: "#383028",
+  RES03: "#383028"
+};
+var S52_COLORS = S52_DAY;
+var COLOR_TABLES = {
+  DAY: S52_DAY,
+  DUSK: S52_DUSK,
+  NIGHT: S52_NIGHT
+};
+function getColorTable(name) {
+  return COLOR_TABLES[name];
+}
+function resolveColor(token, table = "DAY") {
+  const t = COLOR_TABLES[table];
+  return t[token] ?? (table === "NIGHT" ? "#c8aa78" : "#000000");
+}
+
+// src/interact/light-sigseq.ts
+var SIGSEQ_MAX_TERMS = 24;
+var SIGPER_TOLERANCE_SECONDS = 0.06;
+var LAMP_TICK_MS = 100;
+var TERM = /^\d+(?:\.\d+)?$/;
+function text(v) {
+  if (v === null || v === void 0) return null;
+  const s = String(v).trim();
+  return s === "" ? null : s;
+}
+function parseSigseqTerms(sigseq, sigper) {
+  const raw = text(sigseq);
+  if (raw === null) return { refusal: "absent" };
+  const terms = raw.split("+");
+  if (terms.length === 0 || terms.length > SIGSEQ_MAX_TERMS) return { refusal: "malformed" };
+  const phases = [];
+  for (const term of terms) {
+    const t = term.trim();
+    if (t === "") return { refusal: "malformed" };
+    const isEclipse = t.startsWith("(") && t.endsWith(")");
+    const body = (isEclipse ? t.slice(1, -1) : t).trim();
+    if (!TERM.test(body)) return { refusal: "malformed" };
+    const seconds = Number(body);
+    if (!(seconds > 0) || !Number.isFinite(seconds)) return { refusal: "nonPositiveDuration" };
+    phases.push({ seconds, isOn: !isEclipse });
+  }
+  const sum = phases.reduce((t, p) => t + p.seconds, 0);
+  if (!(sum > 0)) return { refusal: "nonPositiveDuration" };
+  if (sigper !== null && sigper > 0) {
+    if (Math.abs(sum - sigper) > SIGPER_TOLERANCE_SECONDS) return { refusal: "sigperMismatch" };
+    return { phases, periodSeconds: sigper, checkedAgainstSigper: true };
+  }
+  return { phases, periodSeconds: sum, checkedAgainstSigper: false };
+}
+function rhythmProperties(parsed, onColoursHex) {
+  if (parsed === null || parsed.phases.length === 0) return { rp: 0, rn: 0 };
+  const out = { rp: parsed.periodSeconds, rn: parsed.phases.length };
+  let end = 0;
+  let onIndex = 0;
+  parsed.phases.forEach((p, i) => {
+    end += p.seconds;
+    const k = i + 1;
+    out[`r${k}`] = Math.round(end * 1e3) / 1e3;
+    out[`o${k}`] = p.isOn ? 1 : 0;
+    if (p.isOn) {
+      out[`c${k}`] = onColoursHex[onIndex % Math.max(1, onColoursHex.length)] ?? "#ffffff";
+      onIndex += 1;
+    }
+  });
+  return out;
+}
+function phaseExpr(nowSeconds2) {
+  return ["%", nowSeconds2, ["max", ["get", "rp"], 1e-3]];
+}
+function lampRhythmOpacity(nowSeconds2, base) {
+  const cases = ["case", ["<=", ["get", "rn"], 0], base];
+  for (let k = 1; k <= SIGSEQ_MAX_TERMS; k++) {
+    cases.push(["<", ["var", "ph"], ["coalesce", ["get", `r${k}`], 1e9]], ["*", base, ["coalesce", ["get", `o${k}`], 1]]);
+  }
+  cases.push(0);
+  return ["let", "ph", phaseExpr(nowSeconds2), cases];
+}
+function lampRhythmColour(nowSeconds2, fallback) {
+  const cases = ["case", ["<=", ["get", "rn"], 0], fallback];
+  for (let k = 1; k <= SIGSEQ_MAX_TERMS; k++) {
+    cases.push(["<", ["var", "ph"], ["coalesce", ["get", `r${k}`], 1e9]], ["coalesce", ["get", `c${k}`], fallback]);
+  }
+  cases.push(fallback);
+  return ["let", "ph", phaseExpr(nowSeconds2), cases];
+}
+
+// src/interact/decode.ts
+function nameAbbrTable(acronym) {
+  const names = s57NameTable(acronym);
+  const abbrs = s57AbbrTable(acronym);
+  const out = {};
+  for (const [code, name] of Object.entries(names)) {
+    const abbr = abbrs[Number(code)];
+    if (abbr !== void 0) out[Number(code)] = { name, abbr };
+  }
+  return out;
+}
+var COLOUR_HEX = {
+  1: "#ffffff",
+  2: "#333333",
+  3: "#ef4444",
+  4: "#22c55e",
+  5: "#3b82f6",
+  6: "#eab308",
+  7: "#9ca3af",
+  8: "#92400e",
+  9: "#f59e0b",
+  10: "#8b5cf6",
+  11: "#f97316",
+  12: "#d946ef",
+  13: "#f472b6"
+};
+var LITCHR_TABLE = nameAbbrTable("LITCHR");
+var COLOUR_TABLE = Object.fromEntries(
+  Object.values(COLOUR_CODES).filter((c) => c.abbr !== void 0 && COLOUR_HEX[c.code] !== void 0).map((c) => [c.code, { name: c.name, abbr: c.abbr, hex: COLOUR_HEX[c.code] }])
+);
+var BOYSHP_TABLE = s57NameTable("BOYSHP");
+var CATLAM_TABLE = s57NameTable("CATLAM");
+var CATCAM_TABLE = s57NameTable("CATCAM");
+var CATLMK_TABLE = s57NameTable("CATLMK");
+var CATFOG_TABLE = s57NameTable("CATFOG");
+var CATFOG_ABBR_TABLE = s57AbbrTable("CATFOG");
+var CATFOG_NAUTOPHONE = Object.values(CATFOG_CODES).find(
+  (c) => c.name.toLowerCase() === "nautophone"
+)?.code;
+var CATLIT_TABLE = s57NameTable("CATLIT");
+var TOPSHP_TABLE = s57NameTable("TOPSHP");
+var STATUS_TABLE = s57NameTable("STATUS");
+var MARSYS_TABLE = s57NameTable("MARSYS");
+var LAYER_TYPE_MAP = {
+  BOYLAT: "Lateral Buoy",
+  BOYCAR: "Cardinal Buoy",
+  BOYSPP: "Special Purpose Buoy",
+  BOYISD: "Isolated Danger Buoy",
+  BOYSAW: "Safe Water Buoy",
+  BCNLAT: "Lateral Beacon",
+  BCNCAR: "Cardinal Beacon",
+  BCNSPP: "Special Purpose Beacon",
+  BCNISD: "Isolated Danger Beacon",
+  BCNSAW: "Safe Water Beacon",
+  LIGHTS: "Light",
+  DAYMAR: "Daymark",
+  FOGSIG: "Fog Signal",
+  RTPBCN: "Radar Transponder Beacon",
+  RDOSTA: "Radio/Radar Station",
+  TOPMAR: "Topmark",
+  MORFAC: "Mooring Facility",
+  LNDMRK: "Landmark",
+  SISTAT: "Signal Station",
+  PILBOP: "Pilot Boarding Place",
+  HRBFAC: "Harbour Facility",
+  SMCFAC: "Small Craft Facility",
+  CRANES: "Crane",
+  OFSPLF: "Offshore Platform",
+  ACHBRT: "Anchor Berth",
+  DISMAR: "Distance Mark",
+  LITVES: "Light Vessel",
+  LITFLT: "Light Float"
+};
+var NAV_AID_QUERY_LAYERS = [
+  "enc-BOYLAT",
+  "enc-BOYCAR",
+  "enc-BOYSPP",
+  "enc-BOYISD",
+  "enc-BOYSAW",
+  "enc-BCNLAT",
+  "enc-BCNCAR",
+  "enc-BCNSPP",
+  "enc-BCNISD",
+  "enc-BCNSAW",
+  "enc-LIGHTS",
+  "enc-LIGHTS-point",
+  "enc-DAYMAR",
+  "enc-FOGSIG",
+  "enc-RTPBCN",
+  "enc-RDOSTA",
+  "enc-TOPMAR",
+  "enc-MORFAC",
+  "enc-MORFAC-point",
+  "enc-LNDMRK",
+  "enc-LNDMRK-point",
+  "enc-SISTAT",
+  "enc-SISTAT-point",
+  "enc-PILBOP",
+  "enc-PILBOP-point",
+  "enc-HRBFAC",
+  "enc-SMCFAC",
+  "enc-CRANES",
+  "enc-CRANES-point",
+  "enc-OFSPLF",
   "enc-OFSPLF-point",
   "enc-ACHBRT",
   "enc-DISMAR",
@@ -2942,14 +3280,8 @@ function decodeNavAidProps(layerName, props, coords) {
   const valnmr = props.VALNMR != null ? Number(props.VALNMR) : null;
   const nominalRange = valnmr != null && !isNaN(valnmr) && valnmr > 0 ? valnmr : null;
   if (isSectorLight) {
-    sectors.push({
-      sectorStart: sectr1,
-      sectorEnd: sectr2,
-      colour: colourEntry?.name ?? "White",
-      colourHex: colourEntry?.hex ?? "#ffffff",
-      notation,
-      nominalRange
-    });
+    const sec = sectorFromProps(props, sectr1, sectr2, "DAY", false);
+    if (sec) sectors.push({ ...sec, notation });
   }
   return {
     name,
@@ -2967,6 +3299,7 @@ function decodeNavAidProps(layerName, props, coords) {
     lightCharacterFull: litchrEntry?.name ?? null,
     period: sigper,
     group,
+    sigseq: props.SIGSEQ != null && String(props.SIGSEQ).trim() !== "" ? String(props.SIGSEQ).trim() : null,
     fogSignal: fogSignal2,
     fogSignalAbbr,
     radarReflector,
@@ -2997,6 +3330,18 @@ function buildNotation(litchrAbbr, colourAbbrs, sigper, group) {
 function buildFlashPattern(decoded) {
   const litchr = decoded.lightCharacter;
   if (!litchr) return null;
+  const charted = parseSigseqTerms(decoded.sigseq, decoded.period);
+  if (!("refusal" in charted)) {
+    const colours2 = decoded.colourHexList.length > 0 ? decoded.colourHexList : [decoded.lightColourHex];
+    let onIndex = 0;
+    const chartedPhases = charted.phases.map((p) => {
+      if (!p.isOn) return { on: false, duration: p.seconds * 1e3 };
+      const color = colours2[onIndex % colours2.length];
+      onIndex += 1;
+      return { on: true, duration: p.seconds * 1e3, color };
+    });
+    return { phases: chartedPhases, totalCycle: charted.periodSeconds * 1e3, notation: decoded.notation, timing: "charted" };
+  }
   const period = decoded.period && decoded.period > 0 ? decoded.period * 1e3 : 6e3;
   const groups = decoded.group ?? [1];
   const totalFlashes = groups.reduce((a, b) => a + b, 0);
@@ -3165,7 +3510,7 @@ function buildFlashPattern(decoded) {
     }
   }
   const totalCycle = phases.reduce((sum, p) => sum + p.duration, 0);
-  return { phases, totalCycle, notation };
+  return { timing: "invented", phases, totalCycle, notation };
 }
 function uncoveredSectorArcs(sectors) {
   const norm = (d) => (d % 360 + 360) % 360;
@@ -3204,7 +3549,70 @@ function uncoveredSectorArcs(sectors) {
   }
   return gaps.filter(([a, b]) => Math.abs(b - a) >= 0.05 || b < a).map(([a, b]) => ({ start: norm(a), end: norm(b) }));
 }
-function buildSectorsFromFeatures(features) {
+function parseCodes(val) {
+  if (val == null) return [];
+  const str = String(val).trim();
+  let parts;
+  if (str.startsWith("[")) {
+    try {
+      const arr = JSON.parse(str);
+      parts = Array.isArray(arr) ? arr.map(String) : [];
+    } catch {
+      parts = str.split(/[,;]/);
+    }
+  } else {
+    parts = str.split(/[,;]/);
+  }
+  return parts.map((p) => Number(p.trim())).filter((n) => !isNaN(n));
+}
+var OBSCURED_LITVIS = /* @__PURE__ */ new Set([3, 7, 8]);
+function sectorArcColourToken(colourCodes, obscured) {
+  if (obscured) return "CHBRN";
+  const has = (c) => colourCodes.includes(c);
+  if (colourCodes.length === 1) {
+    if (has(3)) return "LITRD";
+    if (has(4)) return "LITGN";
+    if (has(1) || has(6) || has(11)) return "LITYW";
+    return "CHMGD";
+  }
+  if (colourCodes.length === 2) {
+    if (has(1) && has(3)) return "LITRD";
+    if (has(1) && has(4)) return "LITGN";
+    return "CHMGD";
+  }
+  return "CHMGD";
+}
+function sectorFromProps(props, s1, s2, ct, allRound) {
+  const colourCodes = parseCodes(props.COLOUR);
+  const entries = colourCodes.map((c) => COLOUR_TABLE[c]).filter((e) => e != null);
+  if (allRound && entries.length === 0) return null;
+  const obscured = parseCodes(props.LITVIS).some((v) => OBSCURED_LITVIS.has(v));
+  const litchrCode = parseCode(props.LITCHR);
+  const le = litchrCode ? LITCHR_TABLE[litchrCode] : null;
+  const sigper = props.SIGPER != null ? Number(props.SIGPER) : null;
+  const group = parseGroup(props.SIGGRP);
+  const base = buildNotation(le?.abbr ?? null, entries.length > 0 ? [entries.map((e) => e.abbr).join("")] : [], sigper, group);
+  const notation = obscured && base ? `${base} (obsc)` : base;
+  const valnmr = props.VALNMR != null ? Number(props.VALNMR) : null;
+  const nominalRange = valnmr != null && !isNaN(valnmr) && valnmr > 0 ? valnmr : null;
+  const arcColourToken = sectorArcColourToken(colourCodes, obscured);
+  return {
+    sectorStart: s1,
+    sectorEnd: s2,
+    colour: entries[0]?.name ?? "White",
+    colourHex: entries[0]?.hex ?? "#ffffff",
+    notation,
+    nominalRange,
+    colourCodes,
+    arcColourToken,
+    arcColourHex: resolveColor(arcColourToken, ct),
+    obscured,
+    sigseq: props.SIGSEQ != null && String(props.SIGSEQ).trim() !== "" ? String(props.SIGSEQ).trim() : null,
+    sigper: sigper != null && !isNaN(sigper) && sigper > 0 ? sigper : null,
+    ...allRound ? { allRound: true } : {}
+  };
+}
+function buildSectorsFromFeatures(features, ct = "DAY") {
   const sectors = [];
   const allRound = [];
   for (const f of features) {
@@ -3215,47 +3623,15 @@ function buildSectorsFromFeatures(features) {
       if (props.SECTR1 == null && props.SECTR2 == null && parseCode(props.COLOUR) != null) allRound.push(props);
       continue;
     }
-    const colourCode = parseCode(props.COLOUR);
-    const ce = colourCode ? COLOUR_TABLE[colourCode] : null;
-    const litchrCode = parseCode(props.LITCHR);
-    const le = litchrCode ? LITCHR_TABLE[litchrCode] : null;
-    const sigper = props.SIGPER != null ? Number(props.SIGPER) : null;
-    const group = parseGroup(props.SIGGRP);
-    const notation = buildNotation(le?.abbr ?? null, ce ? [ce.abbr] : [], sigper, group);
-    const valnmr = props.VALNMR != null ? Number(props.VALNMR) : null;
-    const nominalRange = valnmr != null && !isNaN(valnmr) && valnmr > 0 ? valnmr : null;
-    sectors.push({
-      sectorStart: s1,
-      sectorEnd: s2,
-      colour: ce?.name ?? "White",
-      colourHex: ce?.hex ?? "#ffffff",
-      notation,
-      nominalRange
-    });
+    const sec = sectorFromProps(props, s1, s2, ct, false);
+    if (sec) sectors.push(sec);
   }
   if (sectors.length > 0 && allRound.length > 0) {
     const gaps = uncoveredSectorArcs(sectors);
     for (const props of allRound) {
-      const colourCode = parseCode(props.COLOUR);
-      const ce = colourCode ? COLOUR_TABLE[colourCode] : null;
-      if (!ce) continue;
-      const litchrCode = parseCode(props.LITCHR);
-      const le = litchrCode ? LITCHR_TABLE[litchrCode] : null;
-      const sigper = props.SIGPER != null ? Number(props.SIGPER) : null;
-      const group = parseGroup(props.SIGGRP);
-      const notation = buildNotation(le?.abbr ?? null, [ce.abbr], sigper, group);
-      const valnmr = props.VALNMR != null ? Number(props.VALNMR) : null;
-      const nominalRange = valnmr != null && !isNaN(valnmr) && valnmr > 0 ? valnmr : null;
       for (const gap of gaps) {
-        sectors.push({
-          sectorStart: gap.start,
-          sectorEnd: gap.end,
-          colour: ce.name,
-          colourHex: ce.hex,
-          notation,
-          nominalRange,
-          allRound: true
-        });
+        const sec = sectorFromProps(props, gap.start, gap.end, ct, true);
+        if (sec) sectors.push(sec);
       }
     }
   }
@@ -3305,12 +3681,16 @@ function buildSectorArcGeoJSON(center, startBearing, endBearing, radiusNm = 0.5,
 }
 function buildSectorArcsFC(center, sectors, radiusNm = 0.4, innerRadiusFrac = 0.92) {
   const innerNm = innerRadiusFrac > 0 ? radiusNm * innerRadiusFrac : 0;
-  const features = sectors.map((sec, i) => {
+  const drawn = sectors.filter((sec) => !sec.allRound);
+  const features = drawn.map((sec, i) => {
     const arc = buildSectorArcGeoJSON(center, sec.sectorStart, sec.sectorEnd, radiusNm, innerNm);
     arc.properties = {
       sectorIndex: i,
       colour: sec.colour,
       colourHex: sec.colourHex,
+      arcColourHex: sec.arcColourHex,
+      arcColourToken: sec.arcColourToken,
+      obscured: sec.obscured,
       notation: sec.notation,
       sectorStart: sec.sectorStart,
       sectorEnd: sec.sectorEnd,
@@ -3323,7 +3703,7 @@ function buildSectorArcsFC(center, sectors, radiusNm = 0.4, innerRadiusFrac = 0.
   const seenBearings = /* @__PURE__ */ new Set();
   const TICK_OUTER_OVERHANG = 1.05;
   const TICK_INNER_OVERHANG = 0.93;
-  for (const sec of sectors) {
+  for (const sec of drawn) {
     for (const bearing of [sec.sectorStart, sec.sectorEnd]) {
       const rad = sectorLimitToArcBearing(bearing) * Math.PI / 180;
       const radiusDeg = radiusNm / 60;
@@ -4193,10 +4573,10 @@ function ensureStyles(doc) {
   doc.head.appendChild(style);
   styleInjected = true;
 }
-function el(doc, tag, className, text) {
+function el(doc, tag, className, text2) {
   const node = doc.createElement(tag);
   node.className = className;
-  if (text != null) node.textContent = text;
+  if (text2 != null) node.textContent = text2;
   return node;
 }
 function animateDot(dot, pattern) {
@@ -4362,460 +4742,203 @@ ${notice.dataCurrency}`;
     this.place();
     this.map.on("move", this.reposition);
   }
-  place() {
-    if (!this.root || !this.lngLat) return;
-    const { x, y } = this.map.project(this.lngLat);
-    this.root.style.left = `${x}px`;
-    this.root.style.top = `${y}px`;
-  }
-  close() {
-    if (this.stopAnimation) {
-      this.stopAnimation();
-      this.stopAnimation = null;
-    }
-    if (this.root) {
-      this.map.off("move", this.reposition);
-      this.root.remove();
-      this.root = null;
-    }
-    this.lngLat = null;
-  }
-};
-
-// src/interact/index.ts
-var InteractClient = class {
-  constructor(http) {
-    this.http = http;
-    this.entitlementClient = new EntitlementClient(http);
-  }
-  entitlementClient;
-  /**
-   * Check the CHRTinteract entitlement for this API key (server-side, plan
-   * derived, cached per client). Throws `InteractError` with code
-   * `interact_not_enabled` for Free-plan teams.
-   */
-  async entitlement() {
-    return this.entitlementClient.check();
-  }
-  /**
-   * Decode a chart feature (from `queryRenderedFeatures`, the features API,
-   * or plain `{ layer, properties }`) into a typed {@link InspectResult}.
-   *
-   * The first call performs the server-side entitlement check. With
-   * `{ enrich: true }` the result is upgraded with full S-57 properties and
-   * source-cell provenance (edition / update / issue date) via the features
-   * API — metered against the key's `featureCalls` quota.
-   *
-   * @example
-   * const result = await chrt.interact.inspect(feature);
-   * if (result.kind === "navaid") console.log(result.characteristic); // "Fl R 4s"
-   */
-  async inspect(feature, opts) {
-    await this.entitlementClient.check();
-    const result = buildInspectResult(feature, opts);
-    if (opts?.enrich) {
-      return enrichResult(this.http, result, opts.signal);
-    }
-    return result;
-  }
-  /**
-   * Collect EVERY inspectable feature under a point on a CHRT map —
-   * deduplicated across tile boundaries by S-57 identity (`LNAM`) and
-   * ordered by class priority (point targets > lines > areas, safety
-   * classes first within each band). Area features never preempt the buoy
-   * on top of them but always stay selectable: a click on open water
-   * resolves to its DEPARE.
-   *
-   * `point` is a screen pixel point (`e.point` from a map click) or
-   * `[lng, lat]`. Point/line targets are picked up within
-   * `opts.tolerance` px (default 8); polygon candidates require the exact
-   * point to fall inside them.
-   *
-   * The first call performs the server-side entitlement check.
-   *
-   * @example
-   * const { candidates, select } = await chrt.interact.inspectAll(map, e.point);
-   * const result = await select(candidates[0]); // full decode (+ merge)
-   */
-  async inspectAll(map, point, opts = {}) {
-    if (!map || typeof map.queryRenderedFeatures !== "function") {
-      throw new InteractError(
-        "unexpected_response",
-        "inspectAll(): expected a MapLibre / Mapbox GL map instance"
-      );
-    }
-    await this.entitlementClient.check();
-    const screen = Array.isArray(point) ? map.project([point[0], point[1]]) : point;
-    const lngLat = Array.isArray(point) ? { lng: point[0], lat: point[1] } : map.unproject?.([point.x, point.y]) ?? null;
-    const at = { point: screen, lngLat };
-    const candidates = collectClickCandidates(map, screen, opts);
-    const http = this.http;
-    return {
-      candidates,
-      select: async (candidate, selectOpts) => {
-        const result = decodeCandidate(map, candidate, at, opts);
-        if (selectOpts?.enrich) {
-          return enrichResult(http, result, selectOpts.signal);
-        }
-        return result;
-      }
-    };
-  }
-  /**
-   * Attach click-to-inspect to a MapLibre / Mapbox GL map rendering CHRT
-   * tiles. Resolves once the server-side entitlement check passes; rejects
-   * with `InteractError` (`interact_not_enabled` on Free plans) otherwise —
-   * no listeners are wired on denial.
-   *
-   * Headless-first: pass `onInspect` to receive every decoded
-   * {@link InspectResult} and render your own UI. Without callbacks, the
-   * built-in minimal popup is shown (opt back in explicitly with
-   * `popup: true` to have both).
-   *
-   * A click that hits SEVERAL features (deduplicated by S-57 identity)
-   * disambiguates instead of silently taking the topmost:
-   *   - `onCandidates` provided → it receives the priority-ordered list;
-   *     resolve a choice with `ctx.select(candidate)`.
-   *   - built-in popup → shows a candidate list; picking a row opens the
-   *     result card.
-   *   - `onInspect` only → the top candidate is inspected immediately, and
-   *     clicking the SAME spot again cycles to the next candidate — so an
-   *     area feature under a buoy is reachable with a second click.
-   *
-   * @example
-   * const handle = await chrt.interact.attach(map, {
-   *   onInspect: (result) => console.log(result.title, result.characteristic),
-   * });
-   * // later: handle.detach();
-   */
-  async attach(map, opts = {}) {
-    if (!map || typeof map.queryRenderedFeatures !== "function" || typeof map.on !== "function") {
-      throw new InteractError(
-        "unexpected_response",
-        "attach(): expected a MapLibre / Mapbox GL map instance"
-      );
-    }
-    await this.entitlementClient.check();
-    const showPopup = opts.popup ?? (!opts.onInspect && !opts.onCandidates);
-    const popup = showPopup ? new InteractPopup(map) : null;
-    const http = this.http;
-    let cycle = null;
-    const samePoint = (a, b) => {
-      const pad = opts.tolerance ?? DEFAULT_CLICK_TOLERANCE;
-      return Math.abs(a.x - b.x) <= pad && Math.abs(a.y - b.y) <= pad;
-    };
-    const select = (candidate, e) => {
-      const result = decodeCandidate(map, candidate, e, opts);
-      const finish = (r) => {
-        popup?.show(r, r.coordinates ?? [e.lngLat.lng, e.lngLat.lat]);
-        opts.onInspect?.(r, { lngLat: e.lngLat, point: e.point, feature: candidate.feature });
-        return r;
-      };
-      if (opts.enrich) {
-        return enrichResult(http, result).then(finish).catch(() => finish(result));
-      }
-      return Promise.resolve(finish(result));
-    };
-    const clickHandler = (e) => {
-      const candidates = collectClickCandidates(map, e.point, opts);
-      if (candidates.length === 0) {
-        cycle = null;
-        popup?.close();
-        opts.onMiss?.({ lngLat: e.lngLat });
-        return;
-      }
-      if (candidates.length === 1) {
-        cycle = null;
-        void select(candidates[0], e);
-        return;
-      }
-      if (opts.onCandidates || popup) {
-        cycle = null;
-        if (popup) {
-          popup.showList(candidates, [e.lngLat.lng, e.lngLat.lat], (c) => void select(c, e));
-        }
-        opts.onCandidates?.(candidates, {
-          lngLat: e.lngLat,
-          point: e.point,
-          select: (c) => select(c, e)
-        });
-        return;
-      }
-      const key = candidates.map((c) => c.identity ?? c.layerId).join("/");
-      if (cycle && cycle.key === key && samePoint(cycle.point, e.point)) {
-        cycle.index = (cycle.index + 1) % candidates.length;
-        cycle.point = e.point;
-      } else {
-        cycle = { key, point: e.point, index: 0 };
-      }
-      void select(candidates[cycle.index], e);
-    };
-    map.on("click", clickHandler);
-    return {
-      detach: () => {
-        map.off("click", clickHandler);
-        popup?.close();
-      }
-    };
-  }
-};
-
-// src/atlas/s52-colors.ts
-var S52_DAY = {
-  // Depth
-  NODTA: "#a4a4a4",
-  DEPIT: "#009678",
-  DEPVS: "#7fbfdf",
-  DEPMS: "#a7d4e8",
-  DEPMD: "#cae7f3",
-  DEPDW: "#ecf7fc",
-  // Land / topography
-  LANDA: "#e6d1a1",
-  LANDF: "#c8b078",
-  CHBRN: "#ab7948",
-  CHGRF: "#878787",
-  CHGRD: "#555555",
-  // Chart symbology
-  CHBLK: "#000000",
-  CSTLN: "#000000",
-  OUTLW: "#000000",
-  BKAJ1: "#4d4d4d",
-  // Navigation / traffic
-  TRFCD: "#d200d2",
-  TRFCF: "#e680e6",
-  RESBL: "#0064b4",
-  APTS1: "#d200d2",
-  // Danger / hazard
-  DNGHL: "#ff0000",
-  ISHDG: "#cc0000",
-  // Lights
-  LITRD: "#ee0000",
-  LITGN: "#00c800",
-  LITYW: "#fddc00",
-  LITWT: "#ffffff",
-  LITBL: "#0064ff",
-  LITOR: "#ff8c00",
-  // Buoys / marks
-  RADHI: "#68e456",
-  RADLO: "#3f8a34",
-  PLRTE: "#dc4025",
-  ARPAT: "#3fa56f",
-  ISDNG: "#c545c3",
-  // Chart colours
-  CHRED: "#f15469",
-  CHGRN: "#68e456",
-  CHYLW: "#f4da48",
-  CHMGD: "#c545c3",
-  CHMGF: "#d3a6e9",
-  CHWHT: "#d4eaee",
-  CHCOR: "#eb7d36",
-  // Soundings
-  SNDG1: "#7d898c",
-  SNDG2: "#070707",
-  DEPSC: "#525a5c",
-  DEPCN: "#555555",
-  // Utility / infrastructure
-  UINFD: "#070707",
-  UINFF: "#7d898c",
-  UINFR: "#f15469",
-  UINFG: "#68e456",
-  UINFO: "#eb7d36",
-  UINFB: "#3a78f0",
-  UINFM: "#c545c3",
-  UIBCK: "#d4eaee",
-  UIBDR: "#7d898c",
-  UIAFD: "#73b6ef",
-  UIAFF: "#c9b97a",
-  PIPLN: "#55aa00",
-  // Outlines
-  OUTLL: "#c9b97a",
-  // Miscellaneous
-  SCLBR: "#eb7d36",
-  NINFO: "#eb7d36",
-  ADINF: "#b29f34",
-  RESGR: "#7d898c",
-  SHIPS: "#070707",
-  PSTRK: "#070707",
-  SYTRK: "#7d898c",
-  APLRT: "#eb7d36",
-  CURSR: "#eb7d36",
-  BKAJ2: "#232728",
-  RES01: "#a3b4b7",
-  RES02: "#a3b4b7",
-  RES03: "#a3b4b7"
-};
-var S52_DUSK = {
-  NODTA: "#6b6b6b",
-  DEPIT: "#006650",
-  DEPVS: "#487085",
-  DEPMS: "#608a9d",
-  DEPMD: "#7ba6b8",
-  DEPDW: "#95bfd0",
-  LANDA: "#8a7d5e",
-  LANDF: "#7a6a48",
-  CHBRN: "#6e4e30",
-  CHGRF: "#585858",
-  CHGRD: "#3a3a3a",
-  CHBLK: "#b0b0b0",
-  CSTLN: "#b0b0b0",
-  OUTLW: "#b0b0b0",
-  BKAJ1: "#707070",
-  TRFCD: "#a000a0",
-  TRFCF: "#b060b0",
-  RESBL: "#004a88",
-  APTS1: "#a000a0",
-  DNGHL: "#cc0000",
-  ISHDG: "#990000",
-  LITRD: "#bb0000",
-  LITGN: "#009900",
-  LITYW: "#c8b000",
-  LITWT: "#d0d0d0",
-  LITBL: "#004abb",
-  LITOR: "#cc7000",
-  RADHI: "#009940",
-  RADLO: "#2d6330",
-  PLRTE: "#a03020",
-  ARPAT: "#306040",
-  ISDNG: "#903090",
-  CHRED: "#b05060",
-  CHGRN: "#509040",
-  CHYLW: "#b0a030",
-  CHMGD: "#903090",
-  CHMGF: "#905090",
-  CHWHT: "#90a0a0",
-  CHCOR: "#a06030",
-  SNDG1: "#606060",
-  SNDG2: "#b0b0b0",
-  DEPSC: "#606060",
-  DEPCN: "#2E2E2E",
-  UINFD: "#b0b0b0",
-  UINFF: "#606060",
-  UINFR: "#b05060",
-  UINFG: "#509040",
-  UINFO: "#a06030",
-  UINFB: "#304090",
-  UINFM: "#903090",
-  UIBCK: "#1a1a1a",
-  UIBDR: "#606060",
-  UIAFD: "#405060",
-  UIAFF: "#605840",
-  PIPLN: "#3d7a00",
-  OUTLL: "#605840",
-  SCLBR: "#a06030",
-  NINFO: "#a06030",
-  ADINF: "#807020",
-  RESGR: "#606060",
-  SHIPS: "#b0b0b0",
-  PSTRK: "#b0b0b0",
-  SYTRK: "#606060",
-  APLRT: "#a06030",
-  CURSR: "#cc0000",
-  BKAJ2: "#252525",
-  RES01: "#606060",
-  RES02: "#606060",
-  RES03: "#606060"
-};
-var S52_NIGHT = {
-  NODTA: "#3a3a32",
-  DEPIT: "#003828",
-  DEPVS: "#356577",
-  DEPMS: "#265066",
-  DEPMD: "#102e44",
-  DEPDW: "#051a28",
-  LANDA: "#3a3020",
-  LANDF: "#302818",
-  CHBRN: "#382410",
-  CHGRF: "#2a2a22",
-  CHGRD: "#1e1e18",
-  CHBLK: "#c8aa78",
-  CSTLN: "#c8aa78",
-  OUTLW: "#c8aa78",
-  BKAJ1: "#504830",
-  TRFCD: "#6e006e",
-  TRFCF: "#803880",
-  RESBL: "#002a50",
-  APTS1: "#6e006e",
-  DNGHL: "#a00000",
-  ISHDG: "#700000",
-  LITRD: "#880000",
-  LITGN: "#006600",
-  LITYW: "#887800",
-  LITWT: "#a09878",
-  LITBL: "#003088",
-  LITOR: "#884800",
-  RADHI: "#005528",
-  RADLO: "#1a3a20",
-  PLRTE: "#6e2018",
-  ARPAT: "#1a3028",
-  ISDNG: "#481848",
-  CHRED: "#682030",
-  CHGRN: "#285020",
-  CHYLW: "#685828",
-  CHMGD: "#481848",
-  CHMGF: "#482848",
-  CHWHT: "#484840",
-  CHCOR: "#683818",
-  SNDG1: "#383028",
-  SNDG2: "#c8aa78",
-  DEPSC: "#383028",
-  // ⚠ DELIBERATE DEVIATION from the published S-52 NIGHT value (#1f2223),
-  // recorded here because `docs/validation/s52-spec-gap-matrix.json` tracks
-  // this token as `value-differs` and the CHRTstyles programme is bringing
-  // colours TO spec — this one moves further away, on purpose.
-  //
-  // Spec NIGHT DEPCN is near-black, which measures ~1.1:1 against this
-  // palette's own deep water (#051a28). S-52's NIGHT table assumes a
-  // dark-adapted eye in a darkened wheelhouse; on a phone or a laptop at
-  // anchor it is not dim, it is absent — reported as "can't see bottom
-  // contours in night mode only". A contour nobody can see fails the
-  // standard's intent while matching its number.
-  //
-  // The palette already makes this trade elsewhere and in the same
-  // direction: NIGHT's CHBLK/CSTLN/OUTLW are #c8aa78, light warm linework on
-  // dark water. This value is that family, dimmed to stay subordinate to the
-  // coastline. Revisit with the CHRTstyles programme, which owns the
-  // spec-vs-legibility call across all 63 tokens.
-  DEPCN: "#A68E84",
-  UINFD: "#c8aa78",
-  UINFF: "#383028",
-  UINFR: "#682030",
-  UINFG: "#285020",
-  UINFO: "#683818",
-  UINFB: "#182848",
-  UINFM: "#481848",
-  UIBCK: "#0a0a08",
-  UIBDR: "#383028",
-  UIAFD: "#182838",
-  UIAFF: "#302818",
-  PIPLN: "#284800",
-  OUTLL: "#302818",
-  SCLBR: "#683818",
-  NINFO: "#683818",
-  ADINF: "#483818",
-  RESGR: "#383028",
-  SHIPS: "#c8aa78",
-  PSTRK: "#c8aa78",
-  SYTRK: "#484030",
-  APLRT: "#683818",
-  CURSR: "#a00000",
-  BKAJ2: "#0a0a08",
-  RES01: "#383028",
-  RES02: "#383028",
-  RES03: "#383028"
+  place() {
+    if (!this.root || !this.lngLat) return;
+    const { x, y } = this.map.project(this.lngLat);
+    this.root.style.left = `${x}px`;
+    this.root.style.top = `${y}px`;
+  }
+  close() {
+    if (this.stopAnimation) {
+      this.stopAnimation();
+      this.stopAnimation = null;
+    }
+    if (this.root) {
+      this.map.off("move", this.reposition);
+      this.root.remove();
+      this.root = null;
+    }
+    this.lngLat = null;
+  }
 };
-var S52_COLORS = S52_DAY;
-var COLOR_TABLES = {
-  DAY: S52_DAY,
-  DUSK: S52_DUSK,
-  NIGHT: S52_NIGHT
+
+// src/interact/index.ts
+var InteractClient = class {
+  constructor(http) {
+    this.http = http;
+    this.entitlementClient = new EntitlementClient(http);
+  }
+  entitlementClient;
+  /**
+   * Check the CHRTinteract entitlement for this API key (server-side, plan
+   * derived, cached per client). Throws `InteractError` with code
+   * `interact_not_enabled` for Free-plan teams.
+   */
+  async entitlement() {
+    return this.entitlementClient.check();
+  }
+  /**
+   * Decode a chart feature (from `queryRenderedFeatures`, the features API,
+   * or plain `{ layer, properties }`) into a typed {@link InspectResult}.
+   *
+   * The first call performs the server-side entitlement check. With
+   * `{ enrich: true }` the result is upgraded with full S-57 properties and
+   * source-cell provenance (edition / update / issue date) via the features
+   * API — metered against the key's `featureCalls` quota.
+   *
+   * @example
+   * const result = await chrt.interact.inspect(feature);
+   * if (result.kind === "navaid") console.log(result.characteristic); // "Fl R 4s"
+   */
+  async inspect(feature, opts) {
+    await this.entitlementClient.check();
+    const result = buildInspectResult(feature, opts);
+    if (opts?.enrich) {
+      return enrichResult(this.http, result, opts.signal);
+    }
+    return result;
+  }
+  /**
+   * Collect EVERY inspectable feature under a point on a CHRT map —
+   * deduplicated across tile boundaries by S-57 identity (`LNAM`) and
+   * ordered by class priority (point targets > lines > areas, safety
+   * classes first within each band). Area features never preempt the buoy
+   * on top of them but always stay selectable: a click on open water
+   * resolves to its DEPARE.
+   *
+   * `point` is a screen pixel point (`e.point` from a map click) or
+   * `[lng, lat]`. Point/line targets are picked up within
+   * `opts.tolerance` px (default 8); polygon candidates require the exact
+   * point to fall inside them.
+   *
+   * The first call performs the server-side entitlement check.
+   *
+   * @example
+   * const { candidates, select } = await chrt.interact.inspectAll(map, e.point);
+   * const result = await select(candidates[0]); // full decode (+ merge)
+   */
+  async inspectAll(map, point, opts = {}) {
+    if (!map || typeof map.queryRenderedFeatures !== "function") {
+      throw new InteractError(
+        "unexpected_response",
+        "inspectAll(): expected a MapLibre / Mapbox GL map instance"
+      );
+    }
+    await this.entitlementClient.check();
+    const screen = Array.isArray(point) ? map.project([point[0], point[1]]) : point;
+    const lngLat = Array.isArray(point) ? { lng: point[0], lat: point[1] } : map.unproject?.([point.x, point.y]) ?? null;
+    const at = { point: screen, lngLat };
+    const candidates = collectClickCandidates(map, screen, opts);
+    const http = this.http;
+    return {
+      candidates,
+      select: async (candidate, selectOpts) => {
+        const result = decodeCandidate(map, candidate, at, opts);
+        if (selectOpts?.enrich) {
+          return enrichResult(http, result, selectOpts.signal);
+        }
+        return result;
+      }
+    };
+  }
+  /**
+   * Attach click-to-inspect to a MapLibre / Mapbox GL map rendering CHRT
+   * tiles. Resolves once the server-side entitlement check passes; rejects
+   * with `InteractError` (`interact_not_enabled` on Free plans) otherwise —
+   * no listeners are wired on denial.
+   *
+   * Headless-first: pass `onInspect` to receive every decoded
+   * {@link InspectResult} and render your own UI. Without callbacks, the
+   * built-in minimal popup is shown (opt back in explicitly with
+   * `popup: true` to have both).
+   *
+   * A click that hits SEVERAL features (deduplicated by S-57 identity)
+   * disambiguates instead of silently taking the topmost:
+   *   - `onCandidates` provided → it receives the priority-ordered list;
+   *     resolve a choice with `ctx.select(candidate)`.
+   *   - built-in popup → shows a candidate list; picking a row opens the
+   *     result card.
+   *   - `onInspect` only → the top candidate is inspected immediately, and
+   *     clicking the SAME spot again cycles to the next candidate — so an
+   *     area feature under a buoy is reachable with a second click.
+   *
+   * @example
+   * const handle = await chrt.interact.attach(map, {
+   *   onInspect: (result) => console.log(result.title, result.characteristic),
+   * });
+   * // later: handle.detach();
+   */
+  async attach(map, opts = {}) {
+    if (!map || typeof map.queryRenderedFeatures !== "function" || typeof map.on !== "function") {
+      throw new InteractError(
+        "unexpected_response",
+        "attach(): expected a MapLibre / Mapbox GL map instance"
+      );
+    }
+    await this.entitlementClient.check();
+    const showPopup = opts.popup ?? (!opts.onInspect && !opts.onCandidates);
+    const popup = showPopup ? new InteractPopup(map) : null;
+    const http = this.http;
+    let cycle = null;
+    const samePoint = (a, b) => {
+      const pad = opts.tolerance ?? DEFAULT_CLICK_TOLERANCE;
+      return Math.abs(a.x - b.x) <= pad && Math.abs(a.y - b.y) <= pad;
+    };
+    const select = (candidate, e) => {
+      const result = decodeCandidate(map, candidate, e, opts);
+      const finish = (r) => {
+        popup?.show(r, r.coordinates ?? [e.lngLat.lng, e.lngLat.lat]);
+        opts.onInspect?.(r, { lngLat: e.lngLat, point: e.point, feature: candidate.feature });
+        return r;
+      };
+      if (opts.enrich) {
+        return enrichResult(http, result).then(finish).catch(() => finish(result));
+      }
+      return Promise.resolve(finish(result));
+    };
+    const clickHandler = (e) => {
+      const candidates = collectClickCandidates(map, e.point, opts);
+      if (candidates.length === 0) {
+        cycle = null;
+        popup?.close();
+        opts.onMiss?.({ lngLat: e.lngLat });
+        return;
+      }
+      if (candidates.length === 1) {
+        cycle = null;
+        void select(candidates[0], e);
+        return;
+      }
+      if (opts.onCandidates || popup) {
+        cycle = null;
+        if (popup) {
+          popup.showList(candidates, [e.lngLat.lng, e.lngLat.lat], (c) => void select(c, e));
+        }
+        opts.onCandidates?.(candidates, {
+          lngLat: e.lngLat,
+          point: e.point,
+          select: (c) => select(c, e)
+        });
+        return;
+      }
+      const key = candidates.map((c) => c.identity ?? c.layerId).join("/");
+      if (cycle && cycle.key === key && samePoint(cycle.point, e.point)) {
+        cycle.index = (cycle.index + 1) % candidates.length;
+        cycle.point = e.point;
+      } else {
+        cycle = { key, point: e.point, index: 0 };
+      }
+      void select(candidates[cycle.index], e);
+    };
+    map.on("click", clickHandler);
+    return {
+      detach: () => {
+        map.off("click", clickHandler);
+        popup?.close();
+      }
+    };
+  }
 };
-function getColorTable(name) {
-  return COLOR_TABLES[name];
-}
-function resolveColor(token, table = "DAY") {
-  const t = COLOR_TABLES[table];
-  return t[token] ?? (table === "NIGHT" ? "#c8aa78" : "#000000");
-}
 
 // src/atlas/s52-linestyles-generated.ts
 var S52_LINESTYLES = {
@@ -27466,6 +27589,35 @@ function iconExpressionForFamily(objectClass, family) {
   }
 }
 
+// src/atlas/base-bundle.ts
+var BASE_BUNDLE_ID = BASE_REGION;
+var BASE_BUNDLE_SCHEMA = "chrt.basemap-bundle/1";
+var BASE_BUNDLE_MAXZOOM = 6;
+var BASE_BUNDLE_SOURCE_LAYERS = [
+  "base_earth",
+  "base_water",
+  "base_boundary",
+  "country_boundary"
+];
+var BASE_BUNDLE_ATTRIBUTION = "\xA9 CHRT \xB7 Made with Natural Earth";
+var BASE_CLIENT_RASTER_BEFORE_ID = "chrtbase-nocoverage";
+function applyBaseBundle(style, opts) {
+  const keep = new Set(BASE_BUNDLE_SOURCE_LAYERS);
+  style.layers = style.layers.filter((raw) => {
+    const layer = raw;
+    if (layer.source !== BASE_REGION) return true;
+    return typeof layer["source-layer"] === "string" && keep.has(layer["source-layer"]);
+  });
+  style.sources[BASE_REGION] = {
+    type: "vector",
+    tiles: [opts.tiles],
+    minzoom: BASE_MINZOOM,
+    maxzoom: BASE_BUNDLE_MAXZOOM,
+    attribution: BASE_BUNDLE_ATTRIBUTION
+  };
+  return style;
+}
+
 // src/atlas/layer-builder.ts
 var SCAMIN_DECLUTTER_CLASSES = /* @__PURE__ */ new Set([
   "OFSPLF",
@@ -28806,6 +28958,99 @@ function getOrderedClasses() {
   return ordered;
 }
 
+// src/atlas/terrain-order.ts
+var DRAPEABLE_LAYER_TYPES = /* @__PURE__ */ new Set([
+  "background",
+  "fill",
+  "line",
+  "raster",
+  "hillshade",
+  "color-relief"
+]);
+function isDrapeable(layer) {
+  return DRAPEABLE_LAYER_TYPES.has(layer.type);
+}
+function drapedFirst(layers) {
+  const draped = [];
+  const direct = [];
+  for (const l of layers) (isDrapeable(l) ? draped : direct).push(l);
+  return [...draped, ...direct];
+}
+function terrainStackCount(layers) {
+  let stacks = 0;
+  let prevDraped = false;
+  for (const l of layers) {
+    const d = isDrapeable(l);
+    if (d && !prevDraped) stacks++;
+    prevDraped = d;
+  }
+  return stacks;
+}
+function drapeHalves(layers) {
+  const draped = [];
+  const direct = [];
+  for (const l of layers) (isDrapeable(l) ? draped : direct).push(l);
+  return { draped, direct };
+}
+
+// src/atlas/lamps.ts
+var LAMP_GLOW_LAYER_ID = "s52-LIGHTS-lamp-glow";
+var LAMP_CORE_LAYER_ID = "s52-LIGHTS-lamp-core";
+var LAMP_LAYER_IDS = [LAMP_GLOW_LAYER_ID, LAMP_CORE_LAYER_ID];
+var RANGE_NM = ["to-number", ["coalesce", ["get", "VALNMR"], ["get", "valnmr"]], 6];
+var UNSECTORED_POINTS = [
+  "all",
+  ["any", ["==", ["geometry-type"], "Point"], ["==", ["geometry-type"], "MultiPoint"]],
+  ["!", ["has", "SECTR1"]],
+  // …and not lights with a charted rhythm either: those flash, and the
+  // flashing is computed by the app from `SIGSEQ` (light-sigseq.ts). What is
+  // left here is exactly the set that is steady from every bearing.
+  ["!", ["has", "SIGSEQ"]]
+];
+function buildLampLayers(sourceId, ct) {
+  const colour = lightFillExpression(ct);
+  const common = {
+    type: "circle",
+    source: sourceId,
+    "source-layer": "LIGHTS",
+    filter: UNSECTORED_POINTS,
+    layout: { visibility: "none" }
+  };
+  const metadata = { "chrt:role": "lamp", "s52:objectClass": "LIGHTS" };
+  return [
+    {
+      ...common,
+      id: LAMP_GLOW_LAYER_ID,
+      paint: {
+        "circle-color": colour,
+        // 4 nm → 7 px, 12 nm → 12 px, 25 nm → 20 px; capped, because a
+        // primary seacoast light is not a searchlight.
+        "circle-radius": ["interpolate", ["linear"], RANGE_NM, 0, 5, 4, 7, 12, 12, 25, 20],
+        "circle-blur": 1,
+        "circle-opacity": 0.55,
+        // A lamp is a point of light: it does not grow as it comes near, and
+        // it does not lie down with the chart.
+        "circle-pitch-alignment": "viewport",
+        "circle-pitch-scale": "viewport"
+      },
+      metadata: { ...metadata, "chrt:lamp": "glow" }
+    },
+    {
+      ...common,
+      id: LAMP_CORE_LAYER_ID,
+      paint: {
+        "circle-color": colour,
+        "circle-radius": ["interpolate", ["linear"], RANGE_NM, 0, 1.5, 12, 2.5, 25, 3.5],
+        "circle-blur": 0.25,
+        "circle-opacity": 1,
+        "circle-pitch-alignment": "viewport",
+        "circle-pitch-scale": "viewport"
+      },
+      metadata: { ...metadata, "chrt:lamp": "core" }
+    }
+  ];
+}
+
 // src/atlas/band-priority.ts
 var BAND_PRIORITY_RANGES = {
   "1": { minzoom: 0 },
@@ -28841,6 +29086,17 @@ function isExemptOpaqueFill(layer) {
   }
   return false;
 }
+var GROUND_FILL_CLASSES = /* @__PURE__ */ new Set([
+  ...DOMINANCE_EXEMPT_FILL_CLASSES,
+  "RIVERS"
+]);
+function isGroundFill(layer) {
+  if (layer.type !== "fill") return false;
+  for (const cls of GROUND_FILL_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return true;
+  }
+  return false;
+}
 var FILL_FLOOR_FREE_BANDS = /* @__PURE__ */ new Set([
   "1",
   "2",
@@ -28848,10 +29104,10 @@ var FILL_FLOOR_FREE_BANDS = /* @__PURE__ */ new Set([
 ]);
 function bandVariantMinzoom(layer, B) {
   const classMinzoom = layer.minzoom ?? 0;
-  if (isExemptOpaqueFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
-    return classMinzoom;
+  if (isGroundFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
+    return 0;
   }
-  if (isExemptOpaqueFill(layer)) {
+  if (isGroundFill(layer)) {
     return BAND_PRIORITY_RANGES[B].minzoom;
   }
   return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
@@ -28910,11 +29166,21 @@ function styleModeBand(mode) {
   return mode === "continuous" ? null : mode.slice("chart:".length);
 }
 function bandFilterExpression(codes) {
+  return cellBandMatch(["slice", ["get", "_cell_id"], 2, 3], codes);
+}
+var BAND_CODE_ALIASES = {
+  "5": ["7"]
+};
+function cellBandCharacters(code) {
+  return [code, ...BAND_CODE_ALIASES[code] ?? []];
+}
+function cellBandMatch(cellBandExpr, codes) {
   const list = Array.isArray(codes) ? codes : [codes];
-  if (list.length === 1) {
-    return ["==", ["slice", ["get", "_cell_id"], 2, 3], list[0]];
+  const chars = [...new Set(list.flatMap((c) => cellBandCharacters(c)))];
+  if (chars.length === 1) {
+    return ["==", cellBandExpr, chars[0]];
   }
-  return ["in", ["slice", ["get", "_cell_id"], 2, 3], ["literal", [...list]]];
+  return ["in", cellBandExpr, ["literal", chars]];
 }
 function combineWithBandFilter(baseFilter, bandFilter) {
   if (!baseFilter) return bandFilter;
@@ -29998,7 +30264,8 @@ function fanOrientationLabelByCellBand(label, bandFan, objectClass) {
     }
     const cellFiltered = combineWithBandFilter(
       label.filter,
-      ["==", cellBandExpr, code]
+      // Aliases included (USACE `7` rides with band 5 — #269).
+      cellBandMatch(cellBandExpr, code)
     );
     const minzoom = Math.max(
       label.minzoom ?? range.minzoom,
@@ -30203,6 +30470,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     (b) => !TOP_STACK_LIGHT_CLASSES.has(b.objectClass) && !BOTTOM_STACK_WATER_BASE_CLASSES.has(b.objectClass)
   );
   const topLightBundles = bundles.filter((b) => TOP_STACK_LIGHT_CLASSES.has(b.objectClass));
+  const lampLayers = buildLampLayers(sourceId, palette);
   const waterBaseBundles = bundles.filter(
     (b) => BOTTOM_STACK_WATER_BASE_CLASSES.has(b.objectClass)
   );
@@ -30236,6 +30504,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     emitChartFeatureVariants(waterBaseBundles);
     emitChartFeatureVariants(regularBundles);
     emitChartFeatureVariants(topLightBundles);
+    layers.push(...lampLayers);
     const chartLabelBundles = byLabelPriorityBottomUp(
       bundles.filter(
         (b) => b.label !== null && (opts.labels !== "placename" || getLabelBehavior(b.objectClass) !== "orientation-cross-band")
@@ -30313,6 +30582,7 @@ function generateStyle(palette = "DAY", opts = {}) {
         }
       }
     }
+    layers.push(...lampLayers);
     {
       const TERMINAL_FILL_RE = new RegExp(
         `^s52-(?:${[...DOMINANCE_EXEMPT_FILL_CLASSES].join("|")})-fill-band[456]$`
@@ -30401,13 +30671,18 @@ function generateStyle(palette = "DAY", opts = {}) {
   const glyphsBase = `${opts.tileBaseUrl ?? "https://tiles.chrt.co"}/v1/glyphs`;
   const isLndareFill = (l) => /^s52-LNDARE-fill-band\d+$/.test(l.id);
   const isWaterBaseFill = (l) => /^s52-(DEPARE|DRGARE|UNSARE)-fill-band\d+$/.test(l.id);
+  const isLakareFill = (l) => /^s52-LAKARE-fill-band\d+$/.test(l.id);
   const bandOf = (l) => {
     const m = /-band(\d+)$/.exec(l.id);
     return m ? Number(m[1]) : 0;
   };
   const emitted = opts.land ? (() => {
-    const relocated = layers.filter((l) => isLndareFill(l) || isWaterBaseFill(l));
-    const others = layers.filter((l) => !isLndareFill(l) && !isWaterBaseFill(l));
+    const relocated = layers.filter(
+      (l) => isLndareFill(l) || isWaterBaseFill(l) || isLakareFill(l)
+    );
+    const others = layers.filter(
+      (l) => !isLndareFill(l) && !isWaterBaseFill(l) && !isLakareFill(l)
+    );
     const isSeaareFill = (l) => /^s52-SEAARE-fill-band\d+$/.test(l.id);
     const seaare = others.filter(isSeaareFill);
     const rest = others.filter((l) => !isSeaareFill(l));
@@ -30431,40 +30706,43 @@ function generateStyle(palette = "DAY", opts = {}) {
     for (const b of bands) {
       ordered.push(...relocated.filter((l) => bandOf(l) === b && isWaterBaseFill(l)));
       ordered.push(...relocated.filter((l) => bandOf(l) === b && isLndareFill(l)).map(asBaseTan));
+      ordered.push(...relocated.filter((l) => bandOf(l) === b && isLakareFill(l)));
     }
     const findRest = (id) => restAbove.findIndex((l) => l.id === id);
-    const shoreAt = findRest("chrtbase-inland-shore");
-    const pairAt = shoreAt !== -1 ? shoreAt : findRest("chrtbase-inland-hatch");
+    const pairAt = findRest("chrtbase-inland-water");
     let restFinal = restAbove;
     if (pairAt !== -1) {
       const repaint = [];
-      for (const b of bands) {
-        for (const l of relocated.filter((x) => bandOf(x) === b && isWaterBaseFill(x))) {
-          const src = l;
-          const meta = { ...src.metadata ?? {}, "chrt:role": "charted-water-repaint" };
-          const notDom = {
+      const pushCascadeClones = (l, b) => {
+        const src = l;
+        const meta = { ...src.metadata ?? {}, "chrt:role": "charted-water-repaint" };
+        const notDom = {
+          ...l,
+          id: `${src.id}-overpair`,
+          filter: ["all", src.filter, NOT_DOMINATED_FILTER],
+          metadata: meta
+        };
+        delete notDom.maxzoom;
+        delete notDom.minzoom;
+        repaint.push(notDom);
+        for (const D of BAND_DRAW_ORDER) {
+          if (parseInt(D, 10) <= b) continue;
+          const dMaxzoom = dominatedVariantMaxzoom(D);
+          if (dMaxzoom <= 0) continue;
+          const domVariant = {
             ...l,
-            id: `${src.id}-overpair`,
-            filter: ["all", src.filter, NOT_DOMINATED_FILTER],
-            metadata: meta
+            id: `${src.id}-overpair-domBy${D}`,
+            filter: ["all", src.filter, dominatedByMinFilter(D)],
+            metadata: meta,
+            maxzoom: dMaxzoom
           };
-          delete notDom.maxzoom;
-          delete notDom.minzoom;
-          repaint.push(notDom);
-          for (const D of BAND_DRAW_ORDER) {
-            if (parseInt(D, 10) <= b) continue;
-            const dMaxzoom = dominatedVariantMaxzoom(D);
-            if (dMaxzoom <= 0) continue;
-            const domVariant = {
-              ...l,
-              id: `${src.id}-overpair-domBy${D}`,
-              filter: ["all", src.filter, dominatedByMinFilter(D)],
-              metadata: meta,
-              maxzoom: dMaxzoom
-            };
-            delete domVariant.minzoom;
-            repaint.push(domVariant);
-          }
+          delete domVariant.minzoom;
+          repaint.push(domVariant);
+        }
+      };
+      for (const b of bands) {
+        for (const l of relocated.filter((x) => bandOf(x) === b && isWaterBaseFill(x))) {
+          pushCascadeClones(l, b);
         }
         if (parseInt(b, 10) >= FINE_LAND_REPAINT_MIN_BAND) {
           for (const l of relocated.filter(
@@ -30480,6 +30758,9 @@ function generateStyle(palette = "DAY", opts = {}) {
             repaint.push(landClone);
           }
         }
+        for (const l of relocated.filter((x) => bandOf(x) === b && isLakareFill(x))) {
+          pushCascadeClones(l, b);
+        }
       }
       const isCoalneLine = (l) => /^s52-COALNE-line-band\d(-domBy\d)?$/.test(l.id);
       for (const l of layers.filter(isCoalneLine)) {
@@ -30503,9 +30784,9 @@ function generateStyle(palette = "DAY", opts = {}) {
         repaint.push(terminal);
       }
       restFinal = [
-        ...restAbove.slice(0, pairAt + 1),
+        ...restAbove.slice(0, pairAt),
         ...repaint,
-        ...restAbove.slice(pairAt + 1)
+        ...restAbove.slice(pairAt)
       ];
     }
     {
@@ -30554,6 +30835,7 @@ function generateStyle(palette = "DAY", opts = {}) {
       emitted.push(layer);
     }
   }
+  const finalLayers = drapedFirst(emitted);
   const style = {
     version: 8,
     name: `CHRT ${SYMBOL_SET_LABELS[symbolSet]} ${PALETTE_NAMES[palette]}${opts.chartMode ? ` \u2014 chart:${opts.chartMode.band}` : ""}`,
@@ -30562,7 +30844,7 @@ function generateStyle(palette = "DAY", opts = {}) {
       "chrt:symbol-set": symbolSet,
       "chrt:color-table": palette,
       "chrt:generated-at": (/* @__PURE__ */ new Date()).toISOString(),
-      "chrt:layer-count": emitted.length,
+      "chrt:layer-count": finalLayers.length,
       "chrt:land": Boolean(opts.land),
       "chrt:relief": Boolean(opts.relief),
       "chrt:base": Boolean(opts.base),
@@ -30602,7 +30884,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     // upstream glyph byte-identical and composite only those six in from
     // Noto Sans; see scripts/generate-glyphs.mjs.
     glyphs: `${glyphsBase}/{fontstack}/{range}.pbf`,
-    layers: emitted
+    layers: finalLayers
   };
   if (symbolSet === "s101") return applyS101SymbolSet(style);
   if (symbolSet === "chrt") return applyChrtSymbolSet(style, palette);
@@ -31430,8 +31712,16 @@ export {
   ALL_WATER_BODY_LAYERS,
   AREA_QUERY_LAYERS,
   ATON_EXPRESSION_CLASSES,
+  BAND_CODE_ALIASES,
   BAND_DRAW_ORDER,
   BAND_PRIORITY_RANGES,
+  BASE_ATTRIBUTION,
+  BASE_BUNDLE_ATTRIBUTION,
+  BASE_BUNDLE_ID,
+  BASE_BUNDLE_MAXZOOM,
+  BASE_BUNDLE_SCHEMA,
+  BASE_BUNDLE_SOURCE_LAYERS,
+  BASE_CLIENT_RASTER_BEFORE_ID,
   BASE_MAXZOOM,
   BASE_MINZOOM,
   BASE_REGION,
@@ -31464,6 +31754,7 @@ export {
   DEFAULT_TILE_BASE_URL,
   DEFAULT_TILE_REGION,
   DEFAULT_WATER_BODY_SETTINGS,
+  DRAPEABLE_LAYER_TYPES,
   INSPECT_CLASS_RANK,
   INSPECT_RANK_DEVIATIONS,
   InteractClient,
@@ -31472,6 +31763,11 @@ export {
   LABEL_BEHAVIOR,
   LABEL_LAYER_GROUPS,
   LABEL_PRIORITY,
+  LAMP_CORE_LAYER_ID,
+  LAMP_GLOW_LAYER_ID,
+  LAMP_LAYER_IDS,
+  LAMP_TICK_MS,
+  LAND_ATTRIBUTION,
   LAND_BUILD_MAXZOOM,
   LAND_REGION,
   NAUTICAL_SYMBOLS,
@@ -31487,7 +31783,10 @@ export {
   RASTER_ATON_CLASSES,
   RASTER_GLYPH_NAMES,
   RASTER_ICON_PREFIX,
+  RELIEF_ATTRIBUTION,
+  RELIEF_ENCODING,
   RELIEF_REGION,
+  RELIEF_TILE_SIZE,
   S101_AREA_FILL_NAMES,
   S101_CHART_SECTIONS,
   S101_FEATURES,
@@ -31507,6 +31806,8 @@ export {
   S52_LOOKUP,
   S52_NIGHT,
   S52_PATTERN_SPRITE_PREFIX,
+  SIGPER_TOLERANCE_SECONDS,
+  SIGSEQ_MAX_TERMS,
   SOUNDING_LAYERS,
   SYMBOL_FAMILIES,
   SYMBOL_FAMILY_META,
@@ -31516,6 +31817,7 @@ export {
   TileTokenError,
   WATER_BODY_LAYER_GROUPS,
   WeatherEndpoint,
+  applyBaseBundle,
   applyChrtSymbolSet,
   applyColorTheme,
   applyCustomStyleSettings,
@@ -31528,6 +31830,7 @@ export {
   buildFlashPattern,
   buildLabelLayer,
   buildLakeTierExpression,
+  buildLampLayers,
   buildLandAreaTierExpression,
   buildLandRegionTierExpression,
   buildLayersForClass,
@@ -31540,6 +31843,8 @@ export {
   buildSectorsFromFeatures,
   buildSources,
   candidateRank,
+  cellBandCharacters,
+  cellBandMatch,
   chrtAtonTintExpression,
   chrtLightTintExpression,
   collectCandidates,
@@ -31554,6 +31859,8 @@ export {
   depareColor,
   depareFillExpression,
   deriveMarinerName,
+  drapeHalves,
+  drapedFirst,
   extractNavAidDesignation,
   featureIdentity,
   generateCustomStyle,
@@ -31586,6 +31893,7 @@ export {
   hazardColor,
   hazardFillExpression,
   iconExpressionForFamily,
+  isDrapeable,
   isLabelLayerVisible,
   isNavAidLayer,
   isNavAidLayerVisible,
@@ -31593,6 +31901,8 @@ export {
   isVisibleInMode,
   isWaterBodyLayerVisible,
   labelSortKey,
+  lampRhythmColour,
+  lampRhythmOpacity,
   lateralColor,
   lateralFillExpression,
   lightColor,
@@ -31602,6 +31912,7 @@ export {
   normalizeTheme,
   paginate,
   parseListCodes,
+  parseSigseqTerms,
   parseSymbolFamily,
   parseWebhook,
   patternSpriteId,
@@ -31616,12 +31927,14 @@ export {
   resolveS101Color,
   resolveStyle,
   resolveTargetClass,
+  rhythmProperties,
   s101ArtworkProvenance,
   sanitizeCustomStyleConfig,
   scaleSizeValue,
   scaminToMinZoom,
   sectorLimitToArcBearing,
   styleModeBand,
+  terrainStackCount,
   tileTemplate,
   uncoveredSectorArcs,
   withinBboxFilter,