@chrtco/sdk 0.10.46 → 0.10.47

package/dist/index.js

@@ -2057,6 +2057,19 @@ function s57AbbrTable(acronym) {
 }
 
 // src/atlas/s52-colors.ts
+var EINK_COLOR_TABLES = { color: "EINK_COLOR", mono: "EINK_MONO", night: "EINK_NIGHT" };
+function isEinkColorTable(ct) {
+  return ct === "EINK_COLOR" || ct === "EINK_MONO" || ct === "EINK_NIGHT";
+}
+function isEinkGreyTable(ct) {
+  return ct === "EINK_MONO" || ct === "EINK_NIGHT";
+}
+var EINK_MONO_GREYS = {
+  INK: "#000000",
+  DARK: "#555555",
+  MID: "#aaaaaa",
+  PAPER: "#ffffff"
+};
 var S52_DAY = {
   // Depth
   NODTA: "#a4a4a4",
@@ -2337,11 +2350,235 @@ var S52_NIGHT = {
   RES02: "#383028",
   RES03: "#383028"
 };
+var S52_EINK_COLOR = {
+  NODTA: "#b4b4b4",
+  DEPIT: "#4f8f3a",
+  DEPVS: "#74ade0",
+  DEPMS: "#bad6ef",
+  DEPMD: "#ffffff",
+  DEPDW: "#ffffff",
+  LANDA: "#f2e2b0",
+  LANDF: "#c49a4a",
+  CHBRN: "#8b5a2b",
+  CHGRF: "#9a9a9a",
+  CHGRD: "#444444",
+  CHBLK: "#000000",
+  CSTLN: "#000000",
+  OUTLW: "#000000",
+  BKAJ1: "#333333",
+  TRFCD: "#c800c8",
+  TRFCF: "#c800c8",
+  RESBL: "#0050c8",
+  APTS1: "#c800c8",
+  DNGHL: "#e00000",
+  ISHDG: "#e00000",
+  LITRD: "#e00000",
+  LITGN: "#00a000",
+  LITYW: "#f0c000",
+  LITWT: "#ffffff",
+  LITBL: "#0050c8",
+  LITOR: "#f07000",
+  RADHI: "#00a000",
+  RADLO: "#006000",
+  PLRTE: "#e00000",
+  ARPAT: "#008040",
+  ISDNG: "#c800c8",
+  CHRED: "#e00000",
+  CHGRN: "#00a000",
+  CHYLW: "#f0c000",
+  CHMGD: "#c800c8",
+  CHMGF: "#c800c8",
+  CHWHT: "#ffffff",
+  CHCOR: "#f07000",
+  // Deeper-than-safety soundings: dark grey, the one secondary ink. Shoal
+  // soundings are black — the louder numeral, as in every other table.
+  SNDG1: "#555555",
+  SNDG2: "#000000",
+  DEPSC: "#000000",
+  DEPCN: "#555555",
+  UINFD: "#000000",
+  UINFF: "#555555",
+  UINFR: "#e00000",
+  UINFG: "#00a000",
+  UINFO: "#f07000",
+  UINFB: "#0050c8",
+  UINFM: "#c800c8",
+  UIBCK: "#ffffff",
+  UIBDR: "#555555",
+  UIAFD: "#74ade0",
+  UIAFF: "#c49a4a",
+  PIPLN: "#008000",
+  OUTLL: "#c49a4a",
+  SCLBR: "#f07000",
+  NINFO: "#f07000",
+  ADINF: "#b08800",
+  RESGR: "#555555",
+  SHIPS: "#000000",
+  PSTRK: "#000000",
+  SYTRK: "#555555",
+  APLRT: "#f07000",
+  CURSR: "#f07000",
+  BKAJ2: "#000000",
+  RES01: "#808080",
+  RES02: "#808080",
+  RES03: "#808080"
+};
+var M = EINK_MONO_GREYS;
+var S52_EINK_MONO = {
+  // No data is DARK, never the land tone: a no-data edge in the land tone
+  // reads as a coastline (seen on the Boston render, 2026-10-05).
+  NODTA: M.DARK,
+  DEPIT: M.PAPER,
+  DEPVS: M.PAPER,
+  DEPMS: M.PAPER,
+  DEPMD: M.PAPER,
+  DEPDW: M.PAPER,
+  LANDA: M.MID,
+  LANDF: M.DARK,
+  CHBRN: M.DARK,
+  CHGRF: M.MID,
+  CHGRD: M.DARK,
+  CHBLK: M.INK,
+  CSTLN: M.INK,
+  OUTLW: M.INK,
+  BKAJ1: M.DARK,
+  TRFCD: M.INK,
+  TRFCF: M.INK,
+  RESBL: M.INK,
+  APTS1: M.INK,
+  DNGHL: M.INK,
+  ISHDG: M.INK,
+  LITRD: M.INK,
+  LITGN: M.INK,
+  LITYW: M.INK,
+  LITWT: M.PAPER,
+  LITBL: M.INK,
+  LITOR: M.INK,
+  RADHI: M.INK,
+  RADLO: M.DARK,
+  PLRTE: M.INK,
+  ARPAT: M.INK,
+  ISDNG: M.INK,
+  CHRED: M.DARK,
+  CHGRN: M.MID,
+  CHYLW: M.MID,
+  CHMGD: M.INK,
+  CHMGF: M.INK,
+  CHWHT: M.PAPER,
+  CHCOR: M.MID,
+  SNDG1: M.DARK,
+  SNDG2: M.INK,
+  DEPSC: M.INK,
+  DEPCN: M.DARK,
+  UINFD: M.INK,
+  UINFF: M.DARK,
+  UINFR: M.INK,
+  UINFG: M.INK,
+  UINFO: M.INK,
+  UINFB: M.INK,
+  UINFM: M.INK,
+  UIBCK: M.PAPER,
+  UIBDR: M.DARK,
+  UIAFD: M.MID,
+  UIAFF: M.MID,
+  PIPLN: M.INK,
+  OUTLL: M.DARK,
+  SCLBR: M.INK,
+  NINFO: M.INK,
+  ADINF: M.DARK,
+  RESGR: M.DARK,
+  SHIPS: M.INK,
+  PSTRK: M.INK,
+  SYTRK: M.DARK,
+  APLRT: M.INK,
+  CURSR: M.INK,
+  BKAJ2: M.INK,
+  RES01: M.DARK,
+  RES02: M.DARK,
+  RES03: M.DARK
+};
+var N = { GROUND: M.INK, DIM: M.DARK, LINE: M.MID, BRIGHT: M.PAPER };
+var S52_EINK_NIGHT = {
+  NODTA: N.GROUND,
+  DEPIT: N.GROUND,
+  DEPVS: N.GROUND,
+  DEPMS: N.GROUND,
+  DEPMD: N.GROUND,
+  DEPDW: N.GROUND,
+  LANDA: N.DIM,
+  LANDF: N.LINE,
+  CHBRN: N.LINE,
+  CHGRF: N.DIM,
+  CHGRD: N.LINE,
+  CHBLK: N.LINE,
+  CSTLN: N.LINE,
+  OUTLW: N.LINE,
+  BKAJ1: N.DIM,
+  TRFCD: N.LINE,
+  TRFCF: N.LINE,
+  RESBL: N.LINE,
+  APTS1: N.LINE,
+  DNGHL: N.BRIGHT,
+  ISHDG: N.BRIGHT,
+  LITRD: N.BRIGHT,
+  LITGN: N.BRIGHT,
+  LITYW: N.BRIGHT,
+  LITWT: N.BRIGHT,
+  LITBL: N.BRIGHT,
+  LITOR: N.BRIGHT,
+  RADHI: N.LINE,
+  RADLO: N.DIM,
+  PLRTE: N.LINE,
+  ARPAT: N.LINE,
+  ISDNG: N.BRIGHT,
+  // Mark bodies by tone, as in mono, so they stay apart from each other and
+  // from the black water; shape still says which side.
+  CHRED: N.DIM,
+  CHGRN: N.LINE,
+  CHYLW: N.LINE,
+  CHMGD: N.LINE,
+  CHMGF: N.LINE,
+  CHWHT: N.BRIGHT,
+  CHCOR: N.LINE,
+  SNDG1: N.LINE,
+  SNDG2: N.BRIGHT,
+  DEPSC: N.BRIGHT,
+  DEPCN: N.LINE,
+  UINFD: N.LINE,
+  UINFF: N.DIM,
+  UINFR: N.BRIGHT,
+  UINFG: N.LINE,
+  UINFO: N.LINE,
+  UINFB: N.LINE,
+  UINFM: N.LINE,
+  UIBCK: N.GROUND,
+  UIBDR: N.DIM,
+  UIAFD: N.DIM,
+  UIAFF: N.DIM,
+  PIPLN: N.LINE,
+  OUTLL: N.DIM,
+  SCLBR: N.LINE,
+  NINFO: N.LINE,
+  ADINF: N.DIM,
+  RESGR: N.DIM,
+  SHIPS: N.BRIGHT,
+  PSTRK: N.LINE,
+  SYTRK: N.DIM,
+  APLRT: N.BRIGHT,
+  CURSR: N.BRIGHT,
+  BKAJ2: N.GROUND,
+  RES01: N.DIM,
+  RES02: N.DIM,
+  RES03: N.DIM
+};
 var S52_COLORS = S52_DAY;
 var COLOR_TABLES = {
   DAY: S52_DAY,
   DUSK: S52_DUSK,
-  NIGHT: S52_NIGHT
+  NIGHT: S52_NIGHT,
+  EINK_COLOR: S52_EINK_COLOR,
+  EINK_MONO: S52_EINK_MONO,
+  EINK_NIGHT: S52_EINK_NIGHT
 };
 function getColorTable(name) {
   return COLOR_TABLES[name];
@@ -4988,6 +5225,254 @@ var InteractClient = class {
   }
 };
 
+// src/atlas/chrt-svgs-generated.ts
+var CHRT_GLYPH_SVGS = {
+  "badge-radar": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="19" r="2.6" fill="#D200D2"/><path d="M9 19a7 7 0 0 1 14 0M5 19a11 11 0 0 1 22 0" stroke="#D200D2" stroke-width="2.4" fill="none" stroke-linecap="round" stroke-dasharray="4 3"/></svg>',
+  "badge-sound": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="7" cy="16" r="2.2" fill="#D200D2"/><path d="M12 10a9 9 0 0 1 0 12M16.5 6.5a15 15 0 0 1 0 19M21 3a21 21 0 0 1 0 26" stroke="#D200D2" stroke-width="2.4" fill="none" stroke-linecap="round"/></svg>',
+  "beacon-cairn": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="11" r="4" fill="#fff"/><circle cx="11.5" cy="19" r="4.6" fill="#fff"/><circle cx="20.5" cy="19" r="4.6" fill="#fff"/><path d="M7 28h18" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "beacon-generic": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 25V12" stroke="#fff" stroke-width="2.6" stroke-linecap="round"/><path d="M16 4l6 8H10Z" fill="#fff"/><path d="M8 28h16M11 25h10" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "beacon-lattice": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M11 25 13 6h6l2 19M12 20h8M12.6 13h6.8M11 25l9-12M21 25l-9-12" stroke="#fff" stroke-width="1.8" stroke-linecap="round" fill="none"/><path d="M8 28h16" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "beacon-stake": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 25V6" stroke="#fff" stroke-width="2.8" stroke-linecap="round"/><path d="M9 28h14" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "beacon-tower": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M12 6h8l1.6 19H10.4Z" fill="#fff"/><path d="M10 6h12" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><path d="M8 28h16" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-barrel": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><rect x="7" y="13" width="18" height="11" rx="5.5" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-can": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M9 12h14v11a2 2 0 0 1-2 2H11a2 2 0 0 1-2-2Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-conical": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 8 24.5 25H7.5Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-pillar": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M13 6h6l1.4 19H11.6Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-spar": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M14.5 5h3l1 20h-5Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-spherical": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="17.5" r="8.5" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "buoy-super": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M7 17h18l-2.5 8h-13Z" fill="#fff"/><path d="M16 17V8" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><circle cx="16" cy="6.5" r="2" fill="#fff"/><path d="M5 28h22" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "cardinal-e": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 1.5 20 6h-8Z" fill="#101418"/><path d="M16 11 12 6.5h8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "cardinal-n": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 1.5 20 6h-8Z" fill="#101418"/><path d="M16 6.5 20 11h-8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "cardinal-s": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 11 12 6.5h8Z" fill="#101418"/><path d="M16 6 12 1.5h8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "cardinal-w": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 6 12 1.5h8Z" fill="#101418"/><path d="M16 6.5 20 11h-8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "daymark-square": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><rect x="6" y="6" width="20" height="20" rx="1.5" fill="#fff"/></svg>',
+  "daymark-triangle": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 5 28 26H4Z" fill="#fff"/></svg>',
+  "eink-danger": '<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8"><path d="M-2 2 L2 -2 M0 8 L8 0 M6 10 L10 6" stroke="#000000" stroke-width="1" fill="none"/><path d="M-2 6 L2 10 M0 0 L8 8 M6 -2 L10 2" stroke="#000000" stroke-width="1" fill="none"/></svg>',
+  "eink-dots": '<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10"><circle cx="2.5" cy="2.5" r="0.9" fill="#000000"/><circle cx="7.5" cy="7.5" r="0.9" fill="#000000"/></svg>',
+  "eink-hatch": '<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8"><path d="M-2 2 L2 -2 M0 8 L8 0 M6 10 L10 6" stroke="#000000" stroke-width="0.9" fill="none"/></svg>',
+  "hatch-nocoverage": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M-3 9 L9 -3 M-3 21 L21 -3 M3 27 L27 3 M15 27 L27 15" stroke="#8A97A0" stroke-width="0.8" fill="none"/><path d="M-3 15 L15 33 M-3 3 L21 27 M3 -3 L27 21 M15 -3 L27 9" stroke="#8A97A0" stroke-width="0.8" fill="none"/></svg>',
+  "hatch-uncharted": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M-3 9 L9 -3 M-3 21 L21 -3 M3 27 L27 3 M15 27 L27 15" stroke="#5B7383" stroke-width="0.65" fill="none"/></svg>',
+  "isolated-danger": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="3.5" r="2.4" fill="#101418"/><circle cx="16" cy="9.5" r="2.4" fill="#101418"/><path d="M13 13h6l1 12H12Z" fill="#101418"/><rect x="12.4" y="17.5" width="7.2" height="3.4" fill="#E5484D"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "light-flare": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="11" cy="11" r="3.2" fill="#fff"/><path d="M13.4 13.4 24 19.5a2.6 2.6 0 0 1-4.5 4.5L13.4 13.4Z" fill="#fff"/></svg>',
+  "lightship": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M6 20l3-5h14l3 5-3.5 4h-13Z" fill="#fff"/><path d="M16 15V8" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><circle cx="16" cy="6" r="2.2" fill="#fff"/><path d="M5 28h22" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
+  "safe-water": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="6" r="2.4" fill="#E5484D"/><circle cx="16" cy="17.5" r="8" fill="#F8FAFC"/><path d="M12.2 10.5a8 8 0 0 0 0 14M19.8 10.5a8 8 0 0 1 0 14" stroke="#E5484D" stroke-width="3" fill="none"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>'
+};
+
+// src/atlas/s52-pattern.ts
+var S52_PATTERN_SPRITE_PREFIX = "AP:";
+function patternSpriteId(patternName) {
+  return `${S52_PATTERN_SPRITE_PREFIX}${patternName}`;
+}
+
+// src/atlas/s52-conditional.ts
+var DEFAULT_SAFETY_CONTOUR_M = 10;
+var DEPARE_DEEP_CUT_M = 18.2;
+var DEPARE_SHALLOW_CUT_M = 2;
+function effectiveSafetyContour(safetyContourM) {
+  if (!Number.isFinite(safetyContourM)) return DEFAULT_SAFETY_CONTOUR_M;
+  return Math.min(Math.max(safetyContourM, DEPARE_SHALLOW_CUT_M), DEPARE_DEEP_CUT_M);
+}
+function depareColor(props, ct = "DAY", safetyContourM = DEFAULT_SAFETY_CONTOUR_M) {
+  const drval1 = Number(props.DRVAL1 ?? props.drval1 ?? -1);
+  const drval2 = Number(props.DRVAL2 ?? props.drval2 ?? drval1);
+  const safety = effectiveSafetyContour(safetyContourM);
+  if (drval1 < 0 && drval2 <= 0) return resolveColor("DEPIT", ct);
+  if (drval1 < DEPARE_SHALLOW_CUT_M) return resolveColor("DEPVS", ct);
+  if (drval1 < safety) return resolveColor("DEPMS", ct);
+  if (drval1 < DEPARE_DEEP_CUT_M) return resolveColor("DEPMD", ct);
+  return resolveColor("DEPDW", ct);
+}
+var DEPARE_FILL_BRANCH_TOKENS = ["DEPIT", "DEPVS", "DEPMS", "DEPMD"];
+var DEPARE_FILL_FALLBACK_TOKEN = "DEPDW";
+function depareFillExpression(ct = "DAY", safetyContourM = DEFAULT_SAFETY_CONTOUR_M) {
+  const safety = effectiveSafetyContour(safetyContourM);
+  const [it, vs, ms, md] = DEPARE_FILL_BRANCH_TOKENS;
+  return [
+    "case",
+    [
+      "all",
+      ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], 0],
+      ["<=", ["coalesce", ["get", "DRVAL2"], ["get", "drval2"], 0], 0]
+    ],
+    resolveColor(it, ct),
+    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], DEPARE_SHALLOW_CUT_M],
+    resolveColor(vs, ct),
+    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], safety],
+    resolveColor(ms, ct),
+    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], DEPARE_DEEP_CUT_M],
+    resolveColor(md, ct),
+    resolveColor(DEPARE_FILL_FALLBACK_TOKEN, ct)
+  ];
+}
+function listAttrString(attr) {
+  return ["to-string", ["coalesce", ["get", attr], ["get", attr.toLowerCase()], ""]];
+}
+function listAttrCase(attr, cases, fallback) {
+  const attrStr = listAttrString(attr);
+  const expr = ["case"];
+  for (const [code, value] of cases) {
+    expr.push([">=", ["index-of", `"${code}"`, attrStr], 0], value);
+  }
+  for (const [code, value] of cases) {
+    expr.push(["==", attrStr, code], value);
+  }
+  for (const [code, value] of cases) {
+    expr.push(["==", attrStr, `[${code}]`], value);
+  }
+  expr.push(fallback);
+  return expr;
+}
+function listAttrHas(attr, codes) {
+  const attrStr = listAttrString(attr);
+  const clauses = [];
+  for (const code of codes) {
+    clauses.push([">=", ["index-of", `"${code}"`, attrStr], 0]);
+    clauses.push(["==", attrStr, code]);
+    clauses.push(["==", attrStr, `[${code}]`]);
+  }
+  return ["any", ...clauses];
+}
+function colourCodeCase(cases, fallback) {
+  return listAttrCase("COLOUR", cases, fallback);
+}
+function lightColor(props, ct = "DAY") {
+  const raw = props.COLOUR ?? props.colour;
+  const code = Array.isArray(raw) ? Number(raw[0]) : typeof raw === "string" && raw.startsWith("[") ? Number(JSON.parse(raw)[0]) : Number(raw ?? 0);
+  switch (code) {
+    case 1:
+      return resolveColor("LITWT", ct);
+    case 3:
+      return resolveColor("LITRD", ct);
+    case 4:
+      return resolveColor("LITGN", ct);
+    case 5:
+      return resolveColor("LITBL", ct);
+    case 6:
+      return resolveColor("LITYW", ct);
+    case 11:
+      return resolveColor("LITOR", ct);
+    default:
+      return resolveColor("LITYW", ct);
+  }
+}
+function lightFillExpression(ct = "DAY") {
+  return colourCodeCase(
+    [
+      ["3", resolveColor("LITRD", ct)],
+      ["4", resolveColor("LITGN", ct)],
+      ["6", resolveColor("LITYW", ct)],
+      ["11", resolveColor("LITOR", ct)],
+      ["5", resolveColor("LITBL", ct)],
+      ["1", resolveColor("LITWT", ct)]
+    ],
+    resolveColor("LITYW", ct)
+  );
+}
+function lateralColor(props, ct = "DAY") {
+  const catlam = Number(props.CATLAM ?? props.catlam ?? 0);
+  if (catlam === 1) return resolveColor("LITRD", ct);
+  if (catlam === 2) return resolveColor("LITGN", ct);
+  return resolveColor("LITYW", ct);
+}
+function lateralFillExpression(ct = "DAY") {
+  return [
+    "match",
+    ["coalesce", ["get", "CATLAM"], ["get", "catlam"], 0],
+    1,
+    resolveColor("LITRD", ct),
+    2,
+    resolveColor("LITGN", ct),
+    resolveColor("LITYW", ct)
+  ];
+}
+function hazardColor(props, ct = "DAY") {
+  const watlev = Number(props.WATLEV ?? props.watlev ?? 0);
+  const valsou = props.VALSOU ?? props.valsou;
+  if (watlev === 1 || watlev === 2) return resolveColor("DNGHL", ct);
+  if (valsou != null && Number(valsou) < 2) return resolveColor("DNGHL", ct);
+  return resolveColor("RESBL", ct);
+}
+function hazardFillExpression(ct = "DAY") {
+  return [
+    "case",
+    [
+      "any",
+      ["==", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 1],
+      ["==", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 2]
+    ],
+    resolveColor("DNGHL", ct),
+    [
+      "all",
+      ["has", "VALSOU"],
+      ["<", ["get", "VALSOU"], 2]
+    ],
+    resolveColor("DNGHL", ct),
+    resolveColor("RESBL", ct)
+  ];
+}
+function vegatnPatternExpression() {
+  return [
+    "match",
+    ["coalesce", ["get", "CATVEG"], ["get", "catveg"], 0],
+    1,
+    patternSpriteId("VEGATN03"),
+    // grass
+    3,
+    patternSpriteId("VEGATN03"),
+    // bush
+    4,
+    patternSpriteId("VEGATN04"),
+    // deciduous wood
+    5,
+    patternSpriteId("VEGATN04"),
+    // coniferous wood
+    6,
+    patternSpriteId("VEGATN04"),
+    // wood (mixed)
+    7,
+    patternSpriteId("MARSHES1"),
+    // mangroves
+    10,
+    patternSpriteId("VEGATN03"),
+    // scrub
+    11,
+    patternSpriteId("VEGATN04"),
+    // tree
+    12,
+    patternSpriteId("VEGATN04"),
+    // evergreen
+    16,
+    patternSpriteId("MARSHES1"),
+    // swamp
+    17,
+    patternSpriteId("MARSHES1"),
+    // marsh
+    21,
+    patternSpriteId("VEGATN04"),
+    // savannah
+    patternSpriteId("VEGATN03")
+    // default: grass pattern
+  ];
+}
+function daymarkColor(props, ct = "DAY") {
+  const raw = props.COLOUR ?? props.colour;
+  const code = Array.isArray(raw) ? Number(raw[0]) : typeof raw === "string" && raw.startsWith("[") ? Number(JSON.parse(raw)[0]) : Number(raw ?? 0);
+  switch (code) {
+    case 1:
+      return resolveColor("LITWT", ct);
+    case 3:
+      return resolveColor("LITRD", ct);
+    case 4:
+      return resolveColor("LITGN", ct);
+    case 6:
+      return resolveColor("LITYW", ct);
+    case 11:
+      return resolveColor("LITOR", ct);
+    default:
+      return resolveColor("LITGN", ct);
+  }
+}
+
 // src/atlas/palette-light.ts
 var HEX6 = /^#?([0-9a-f]{6})$/i;
 function channels(hex) {
@@ -5026,8 +5511,966 @@ function capLuminance(hex, ceiling) {
 }
 var NIGHT_INK = S52_NIGHT.CHBLK;
 var NIGHT_MUTED_INK = scaleLinearLight(S52_NIGHT.CHBLK, 0.43);
-
-// src/atlas/map-live.ts
+function einkMonoGrey(hex) {
+  const l = relativeLuminance(hex);
+  const g2 = EINK_MONO_GREYS;
+  const steps = [g2.INK, g2.DARK, g2.MID, g2.PAPER].map((c) => [c, relativeLuminance(c)]);
+  let best = steps[0];
+  for (const step of steps) if (Math.abs(step[1] - l) < Math.abs(best[1] - l)) best = step;
+  return best[0];
+}
+function einkNightGrey(hex) {
+  const l = relativeLuminance(hex);
+  const g2 = EINK_MONO_GREYS;
+  const steps = [g2.DARK, g2.MID, g2.PAPER].map((c) => [c, relativeLuminance(c)]);
+  let best = steps[0];
+  for (const step of steps) if (Math.abs(step[1] - l) < Math.abs(best[1] - l)) best = step;
+  return best[0];
+}
+
+// src/atlas/chrt-style.ts
+var CHRT_ICON_PREFIX = "chrt:";
+var CHRT_SDF_GLYPHS = /* @__PURE__ */ new Set([
+  "buoy-can",
+  "buoy-conical",
+  "buoy-spherical",
+  "buoy-pillar",
+  "buoy-spar",
+  "buoy-barrel",
+  "buoy-super",
+  "beacon-generic",
+  "beacon-tower",
+  "beacon-lattice",
+  "beacon-stake",
+  "beacon-cairn",
+  "light-flare",
+  "lightship",
+  "daymark-triangle",
+  "daymark-square"
+]);
+var CHRT_GLYPH_NAMES = new Set(Object.keys(CHRT_GLYPH_SVGS));
+var CHRT_ATON_COLORS = {
+  "1": "#F8FAFC",
+  // white
+  "2": "#101418",
+  // black
+  "3": "#E5484D",
+  // red
+  "4": "#30A46C",
+  // green
+  "5": "#3E63DD",
+  // blue
+  "6": "#FFC805",
+  // yellow
+  "7": "#8B9298",
+  // grey
+  "8": "#A66B3A",
+  // brown
+  "9": "#FFB224",
+  // amber
+  "10": "#7E4CCB",
+  // violet
+  "11": "#F76B15",
+  // orange
+  "12": "#D671C1"
+  // pink (magenta-ish)
+};
+var CHRT_UNKNOWN_TINT = "#8B9298";
+var HOUSE_BLACK = "#101418";
+function chrtHouseColor(dayHex, palette = "DAY") {
+  if (palette === "DAY" || palette === "EINK_COLOR") return dayHex;
+  if (palette === "EINK_MONO") return einkMonoGrey(dayHex);
+  if (palette === "EINK_NIGHT") return dayHex.toLowerCase() === HOUSE_BLACK.toLowerCase() || dayHex.toLowerCase() === "#000000" ? "#aaaaaa" : einkNightGrey(dayHex);
+  const isBlack = dayHex.toLowerCase() === HOUSE_BLACK.toLowerCase();
+  if (palette === "DUSK") {
+    return isBlack ? dayHex : capLuminance(dayHex, relativeLuminance(resolveColor("CHBLK", "DUSK")));
+  }
+  return isBlack ? NIGHT_INK : capLuminance(dayHex, relativeLuminance(NIGHT_MUTED_INK));
+}
+function themeChrtGlyph(svg3, palette = "DAY") {
+  if (palette === "DAY" || palette === "EINK_COLOR") return svg3;
+  return svg3.replace(
+    /(fill|stroke)="(#[0-9a-fA-F]{3}|#[0-9a-fA-F]{6})"/g,
+    (_m, attr, hex) => {
+      const six = hex.length === 4 ? `#${hex[1]}${hex[1]}${hex[2]}${hex[2]}${hex[3]}${hex[3]}` : hex;
+      return `${attr}="${chrtHouseColor(six, palette)}"`;
+    }
+  );
+}
+function chrtAtonTintExpression(palette = "DAY") {
+  const c = (code) => chrtHouseColor(CHRT_ATON_COLORS[code], palette);
+  return colourCodeCase(
+    [
+      ["3", c("3")],
+      ["4", c("4")],
+      ["6", c("6")],
+      ["11", c("11")],
+      ["9", c("9")],
+      ["5", c("5")],
+      ["1", c("1")],
+      ["2", c("2")],
+      ["8", c("8")],
+      ["10", c("10")],
+      ["12", c("12")],
+      ["7", c("7")]
+    ],
+    chrtHouseColor(CHRT_UNKNOWN_TINT, palette)
+  );
+}
+function chrtLightTintExpression(palette = "DAY") {
+  const c = (code) => chrtHouseColor(CHRT_ATON_COLORS[code], palette);
+  return colourCodeCase(
+    [
+      ["3", c("3")],
+      ["4", c("4")],
+      ["6", c("6")],
+      ["11", c("11")],
+      ["9", c("9")],
+      ["5", c("5")],
+      ["1", c("1")]
+    ],
+    c("1")
+  );
+}
+function scalar(attr) {
+  return ["coalesce", ["get", attr], ["get", attr.toLowerCase()], 0];
+}
+var g = (name) => `${CHRT_ICON_PREFIX}${name}`;
+function buoyBodyExpression() {
+  return [
+    "match",
+    scalar("BOYSHP"),
+    1,
+    g("buoy-conical"),
+    2,
+    g("buoy-can"),
+    3,
+    g("buoy-spherical"),
+    4,
+    g("buoy-pillar"),
+    5,
+    g("buoy-spar"),
+    6,
+    g("buoy-barrel"),
+    7,
+    g("buoy-super"),
+    8,
+    g("buoy-super"),
+    g("buoy-pillar")
+  ];
+}
+function beaconBodyExpression() {
+  return [
+    "match",
+    scalar("BCNSHP"),
+    1,
+    g("beacon-stake"),
+    2,
+    g("beacon-stake"),
+    3,
+    g("beacon-tower"),
+    4,
+    g("beacon-lattice"),
+    5,
+    g("beacon-stake"),
+    6,
+    g("beacon-cairn"),
+    g("beacon-generic")
+  ];
+}
+function cardinalExpression() {
+  return [
+    "match",
+    scalar("CATCAM"),
+    1,
+    g("cardinal-n"),
+    2,
+    g("cardinal-e"),
+    3,
+    g("cardinal-s"),
+    4,
+    g("cardinal-w"),
+    g("cardinal-n")
+  ];
+}
+var CHRT_ICON_EXPRESSIONS = {
+  BOYLAT: buoyBodyExpression,
+  BOYSPP: buoyBodyExpression,
+  BOYINB: buoyBodyExpression,
+  BOYCAR: cardinalExpression,
+  BOYISD: () => g("isolated-danger"),
+  BOYSAW: () => g("safe-water"),
+  BCNLAT: beaconBodyExpression,
+  BCNSPP: beaconBodyExpression,
+  BCNCAR: cardinalExpression,
+  BCNISD: () => g("isolated-danger"),
+  BCNSAW: () => g("safe-water"),
+  LIGHTS: () => g("light-flare"),
+  LITFLT: () => g("lightship"),
+  LITVES: () => g("lightship"),
+  FOGSIG: () => g("badge-sound"),
+  RTPBCN: () => g("badge-radar"),
+  RDOSTA: () => g("badge-radar"),
+  DAYMAR: () => [
+    "match",
+    scalar("TOPSHP"),
+    1,
+    g("daymark-triangle"),
+    2,
+    g("daymark-triangle"),
+    5,
+    g("daymark-triangle"),
+    g("daymark-square")
+  ]
+};
+var TINTED_CLASSES = /* @__PURE__ */ new Set([
+  "BOYLAT",
+  "BOYSPP",
+  "BOYINB",
+  "BCNLAT",
+  "BCNSPP",
+  "DAYMAR"
+]);
+var CHRT_HALO = { color: HOUSE_BLACK, width: 1 };
+var CHRT_LINE_DASH = {
+  CBLSUB: { color: "CHMGD", width: 0.8, dash: [6, 3] },
+  PIPSOL: { color: "PIPLN", width: 0.8, dash: [6, 3] }
+};
+function applyChrtSymbolSet(style, palette = "DAY") {
+  for (const layer of style.layers) {
+    if (layer.type === "line") {
+      const cls = layer.metadata?.["s52:objectClass"];
+      const dash = cls ? CHRT_LINE_DASH[cls] : void 0;
+      const paint2 = layer.paint ?? {};
+      if (dash && paint2["line-pattern"] != null) {
+        delete paint2["line-pattern"];
+        paint2["line-color"] = resolveColor(dash.color, palette);
+        paint2["line-width"] = dash.width;
+        paint2["line-dasharray"] = dash.dash;
+        layer.paint = paint2;
+      }
+      continue;
+    }
+    if (layer.type !== "symbol") continue;
+    const objectClass2 = layer.metadata?.["s52:objectClass"];
+    if (!objectClass2 || !CHRT_ICON_EXPRESSIONS[objectClass2]) continue;
+    const layout = layer.layout;
+    if (!layout || layout["icon-image"] == null) continue;
+    layout["icon-image"] = CHRT_ICON_EXPRESSIONS[objectClass2]();
+    const paint = layer.paint ?? {};
+    const haloColor = palette === "EINK_MONO" ? chrtHouseColor(HOUSE_BLACK, palette) : palette === "EINK_NIGHT" ? "#000000" : CHRT_HALO.color;
+    if (TINTED_CLASSES.has(objectClass2)) {
+      paint["icon-color"] = chrtAtonTintExpression(palette);
+      paint["icon-halo-color"] = haloColor;
+      paint["icon-halo-width"] = CHRT_HALO.width;
+    } else if (objectClass2 === "LIGHTS") {
+      paint["icon-color"] = chrtLightTintExpression(palette);
+      paint["icon-halo-color"] = haloColor;
+      paint["icon-halo-width"] = CHRT_HALO.width;
+    }
+    layer.paint = paint;
+  }
+  const metadata = style.metadata;
+  metadata["chrt:symbol-set"] = "chrt";
+  return style;
+}
+
+// src/atlas/base-layers.ts
+var NOCOVERAGE_PATTERN = "chrt:hatch-nocoverage";
+var UNCHARTED_PATTERN = "chrt:hatch-uncharted";
+function inlandWaterColor(palette) {
+  return (BASE_THEMES[palette] ?? BASE_THEMES.DAY).inlandWater;
+}
+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"
+  },
+  // ── E-ink: uncharted is DARK, never paper ─────────────────────────────
+  // On an e-ink chart, charted safe water is paper. Water outside coverage
+  // must never read as that, so it is the darkest fill on the page — the
+  // e-ink twin of DAY's dark carto — with the no-coverage crosshatch over it
+  // (invariant 5: the coverage portrayal survives). Land outside coverage
+  // keeps the chart's own land tone.
+  EINK_COLOR: {
+    earth: "#d8ccb0",
+    water: "#4f5a62",
+    river: "#4f5a62",
+    boundary: "#000000",
+    jurisdiction: "#f2e2b0",
+    inlandWater: "#c8d6e0",
+    // The house stripe, 3.4:1 on this rough water — strong enough for the
+    // 150 ppi colour layer.
+    inlandHatch: "#5B7383",
+    stateLine: "#555555",
+    stateLabel: "#000000",
+    stateHalo: "#ffffff",
+    inlandShore: "#555555",
+    inlandLabel: "#000000",
+    inlandHalo: "#ffffff"
+  },
+  // Mono: the same rule in the four greys. Uncharted water DARK under a MID
+  // crosshatch; land MID; rough inland water PAPER under the uncharted hatch.
+  EINK_MONO: {
+    earth: "#aaaaaa",
+    water: "#555555",
+    river: "#555555",
+    boundary: "#000000",
+    jurisdiction: "#aaaaaa",
+    inlandWater: "#ffffff",
+    inlandHatch: "#555555",
+    stateLine: "#555555",
+    stateLabel: "#000000",
+    stateHalo: "#ffffff",
+    inlandShore: "#555555",
+    inlandLabel: "#000000",
+    inlandHalo: "#ffffff"
+  },
+  // Night: the inverse. Water outside coverage is the black ground UNDER the
+  // light crosshatch — charted safe water is plain black, so the hatch is what
+  // tells them apart, here as everywhere. Land the DIM grey; labels the line
+  // grey on black.
+  EINK_NIGHT: {
+    earth: "#555555",
+    water: "#000000",
+    river: "#000000",
+    boundary: "#aaaaaa",
+    jurisdiction: "#555555",
+    inlandWater: "#000000",
+    inlandHatch: "#aaaaaa",
+    stateLine: "#aaaaaa",
+    stateLabel: "#aaaaaa",
+    stateHalo: "#000000",
+    inlandShore: "#aaaaaa",
+    inlandLabel: "#aaaaaa",
+    inlandHalo: "#000000"
+  }
+};
+function baseLayers(opts = {}) {
+  const palette = opts.palette ?? "DAY";
+  const T = BASE_THEMES[palette] ?? BASE_THEMES.DAY;
+  const src = opts.sourceId ?? BASE_REGION;
+  const L = (o) => o;
+  return [
+    // 1. Geography — the world as it is, in the quiet dark voice. The OCEAN
+    //    is a background, not a polygon: the archive ships land and lakes,
+    //    and "everything else is sea" is exactly what a background expresses
+    //    — geometry-free, gap-free at every antimeridian and pole. Without
+    //    it the sea outside coverage was bare S-52 NODTA, a light grey that
+    //    read as "charted ground" with a hatch on it.
+    L({
+      id: "chrtbase-ocean",
+      type: "background",
+      paint: { "background-color": T.water }
+    }),
+    L({
+      id: "chrtbase-earth",
+      type: "fill",
+      source: src,
+      "source-layer": "base_earth",
+      paint: { "fill-color": T.earth }
+    }),
+    L({
+      id: "chrtbase-water",
+      type: "fill",
+      source: src,
+      "source-layer": "base_water",
+      paint: { "fill-color": T.water }
+    }),
+    L({
+      id: "chrtbase-river",
+      type: "line",
+      source: src,
+      "source-layer": "base_river",
+      minzoom: 9,
+      paint: {
+        "line-color": T.river,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 9, 0.6, 14, 1.6]
+      }
+    }),
+    L({
+      id: "chrtbase-boundary",
+      type: "line",
+      source: src,
+      "source-layer": "base_boundary",
+      paint: { "line-color": T.boundary, "line-width": 0.6, "line-opacity": 0.8 }
+    }),
+    // 2. THE DEFAULT: no coverage, everywhere, as a geometry-free background.
+    //    Constant opacity by design — see the header. What kills it is being
+    //    painted OVER, never fading.
+    L({
+      id: "chrtbase-nocoverage",
+      type: "background",
+      paint: { "background-pattern": NOCOVERAGE_PATTERN, "background-opacity": 0.55 }
+    }),
+    // 3. The jurisdiction: countries whose charts CHRT carries go tan — the
+    //    same tan as CHRTland, so "land in our world" is ONE colour. Opaque,
+    //    so it takes the crosshatch off its ground entirely.
+    L({
+      id: "chrtbase-jurisdiction",
+      type: "fill",
+      source: src,
+      "source-layer": "jurisdiction",
+      paint: { "fill-color": T.jurisdiction }
+    }),
+    // 4. States — internal boundaries and names, inside the jurisdiction
+    //    only (owner decision 2026-08-28). A hairline a shade deeper than the
+    //    tan, and quiet letter-spaced caps that fade as harbour detail takes
+    //    over. The one deliberate exception to no-names-on-the-basemap:
+    //    ADMIN furniture, nothing else — see the fence test.
+    L({
+      id: "chrtbase-state-boundary",
+      type: "line",
+      source: src,
+      "source-layer": "state_boundary",
+      minzoom: 4,
+      paint: {
+        "line-color": T.stateLine,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 1],
+        "line-dasharray": [3, 2],
+        "line-opacity": 0.8
+      }
+    }),
+    // 5. Country borders, drawn to be HOISTED above the whole chart by the
+    //    generator (owner, 2026-08-31: "where there is charted land, can we
+    //    add country borders on top of everything? I want it clear where
+    //    there is a boarder."). Sourced from NE boundary_lines_land — land
+    //    borders only, never coastline — so riding on top cannot stroke a
+    //    coast. Dashed so it reads as an administrative line, not chart
+    //    linework.
+    L({
+      id: "chrtbase-country-boundary",
+      type: "line",
+      source: src,
+      "source-layer": "country_boundary",
+      paint: {
+        "line-color": T.boundary,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 3, 0.8, 8, 1.4, 12, 2.2],
+        "line-dasharray": [4, 2],
+        "line-opacity": 0.9
+      }
+    }),
+    L({
+      id: "chrtbase-state-label",
+      type: "symbol",
+      source: src,
+      "source-layer": "state_label",
+      minzoom: 4,
+      maxzoom: 10,
+      layout: {
+        "text-field": ["upcase", ["get", "name"]],
+        "text-font": ["Open Sans Regular"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 9, 8, 12],
+        "text-letter-spacing": 0.25,
+        "text-allow-overlap": false,
+        "text-padding": 8
+      },
+      paint: {
+        "text-color": T.stateLabel,
+        "text-halo-color": T.stateHalo,
+        "text-halo-width": 1.2,
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0.7, 8, 0.85, 10, 0.4]
+      }
+    })
+  ];
+}
+function baseInlandWaterLayers(opts = {}) {
+  const palette = opts.palette ?? "DAY";
+  const T = BASE_THEMES[palette] ?? BASE_THEMES.DAY;
+  const src = opts.sourceId ?? BASE_REGION;
+  const L = (o) => o;
+  const NE_TIER = ["!", ["has", "kind"]];
+  const PLANET_TIER = ["has", "kind"];
+  const HANDOVER = 9;
+  return [
+    // ── The fill pair, SPLIT BY TIER at the handover ────────────────────────
+    //
+    // Both tiers share `inland_water` (tile-join concatenates the same layer
+    // name), and an unsplit fill draws BOTH — which means the NE polygon is
+    // painted over the planet one at every zoom. That is not a cosmetic
+    // double-draw: NE 10m carries no interior rings, so its blob has no
+    // ISLANDS in it, and painting it over the planet's holed polygons buries
+    // every island in the lake under "uncharted water". Owner-reported at
+    // Winnipesaukee z11.7 ("there is land (and islands) being covered by the
+    // 'no chart here' boundary"), and measured: rendering the planet tier
+    // alone brings back the whole archipelago — Rattlesnake, Bear, Long
+    // Island, Diamond, the Barndoors — while the NE tier alone is a faceted
+    // blob whose edges bear no relation to the shoreline drawn beneath it.
+    //
+    // So each tier owns its own zoom range, the same handover the shoreline
+    // below uses. Known residue, measured over the whole archive: of the 141
+    // NE lakes we still carry, 138 have planet water beneath them; the
+    // exceptions are two unnamed western-Alaska tundra lakes and a 2e-5 deg²
+    // Lake Michigan sliver, which lose their rough fill above z9 because the
+    // planet has no `water` polygon there at all (checked against the raw
+    // pre-clip NDJSON — not a clip artefact).
+    L({
+      id: "chrtbase-inland-water",
+      type: "fill",
+      source: src,
+      "source-layer": "inland_water",
+      filter: NE_TIER,
+      maxzoom: HANDOVER,
+      paint: { "fill-color": T.inlandWater }
+    }),
+    L({
+      id: "chrtbase-inland-hatch",
+      type: "fill",
+      source: src,
+      "source-layer": "inland_water",
+      filter: NE_TIER,
+      maxzoom: HANDOVER,
+      paint: { "fill-pattern": UNCHARTED_PATTERN, "fill-opacity": 0.7 }
+    }),
+    L({
+      id: "chrtbase-inland-water-detail",
+      type: "fill",
+      source: src,
+      "source-layer": "inland_water",
+      filter: PLANET_TIER,
+      minzoom: HANDOVER,
+      paint: { "fill-color": T.inlandWater }
+    }),
+    L({
+      id: "chrtbase-inland-hatch-detail",
+      type: "fill",
+      source: src,
+      "source-layer": "inland_water",
+      filter: PLANET_TIER,
+      minzoom: HANDOVER,
+      paint: { "fill-pattern": UNCHARTED_PATTERN, "fill-opacity": 0.7 }
+    }),
+    // The rough shoreline (owner ask 2026-08-28). Drawn ABOVE the hatch so
+    // the edge stays crisp through the texture, and BELOW the charted-water
+    // repaint clones the generator splices in after it — so wherever the
+    // chart repaints its own water, the rough NE10m line yields to the
+    // chart's COALNE instead of double-striking it.
+    //
+    // NE-tier geometry ONLY (`kind` absent): the planet detail tier joins
+    // the same source-layer from z9 as MANY polygons whose chunk-clip seams
+    // rejoin invisibly as FILLS — but a line layer strokes every seam, and
+    // Winnipesaukee rendered as a mesh of internal edges. Planet features
+    // carry `kind` (the INLAND_KINDS filter's own field); NE's carry only
+    // `name`, so the absence of `kind` IS the tier discriminator.
+    L({
+      id: "chrtbase-inland-shore",
+      type: "line",
+      source: src,
+      "source-layer": "inland_water",
+      filter: NE_TIER,
+      // Hands the shoreline over to the planet tier at ITS floor. Both
+      // tiers live in `inland_water` from z9 up (tile-join concatenates the
+      // same layer name), and their FILLS merge invisibly — but two
+      // outlines do not: NE 10m generalises Winnipesaukee's shape, so its
+      // outline ran straight across the middle of the lake the planet had
+      // drawn correctly around. The coarse line is right only while it is
+      // the only shape we have.
+      maxzoom: HANDOVER,
+      paint: {
+        "line-color": T.inlandShore,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 1.1, 14, 1.6],
+        "line-opacity": 0.9
+      }
+    }),
+    // The PLANET tier's shoreline (owner ask 2026-08-31: "uncharted small
+    // lakes render with no outline"). It reads its own `inland_shore` layer,
+    // NOT `inland_water`, and that indirection is the whole fix: the mesh
+    // that forced the `!has kind` fence above is a CLIP artefact — an MVT
+    // feature arrives already cut to its own z10 tile, so stroking the
+    // polygon strokes every tile boundary it crosses. The build now walks
+    // those rings, drops the axis-aligned runs that sit on the read zoom's
+    // tile grid, and emits what is left as lines (measured on one New
+    // England chunk: 61 long axis-aligned mesh edges → 5, and the 5 survivors
+    // are 0.02–0.5 tiles off the grid, i.e. real straight water edges).
+    //
+    // Thinner and quieter than the NE line: this is finer geometry describing
+    // water nobody has surveyed, and approximate data should look
+    // approximate.
+    L({
+      id: "chrtbase-inland-shore-detail",
+      type: "line",
+      source: src,
+      "source-layer": "inland_shore",
+      minzoom: HANDOVER,
+      paint: {
+        "line-color": T.inlandShore,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 9, 0.5, 12, 0.9, 15, 1.2],
+        "line-opacity": 0.85
+      }
+    }),
+    // The lake's name (owner ask 2026-08-28) — the second scoped exception
+    // to no-names-on-the-basemap, after the states: WATER-BODY names only.
+    // No maxzoom: an uncharted lake keeps its name at every zoom; over
+    // charted lakes the chart's own SEAARE label takes over at detail zooms
+    // and collision culls the echo.
+    //
+    // The archive's `inland_water_label` anchors (v3+). v3 shipped ONE
+    // PointOnSurface anchor per lake, and a big lake's single anchor pans
+    // off-viewport — Winnipesaukee at z11.7 read nameless with its name two
+    // tiles west of the screen (owner-reported). Labelling the polygons
+    // instead is NOT the fix: tippecanoe's coalescing drops the NE polygon
+    // from some z11 tiles (measured: 11/619/747 carries only planet pieces),
+    // so a polygon-sourced label vanishes tile by tile. v4 therefore bakes a
+    // deterministic anchor GRID into big lakes — the paper-chart convention
+    // of repeating a name along a large water body — and this one layer
+    // renders however many anchors are in view; collision culls the rest.
+    // Planet-tier water-body NAMES (owner ask 2026-08-31: NE 10m names only
+    // 113 US lakes). Emitted BELOW the NE layer on purpose — MapLibre places
+    // symbols topmost-layer-first, so the big NE lake wins collision against
+    // the pond beside it, and both lose to the chart's own labels (every ENC
+    // class is emitted after this pair).
+    //
+    // The size threshold is OSM's own `min_zoom`, carried through the build:
+    // Lake Winnipesaukee reads 10, Squam Lake 12, so a pond simply is not in
+    // the filter until the user is close enough for it to be the answer to
+    // "what is that water". `["zoom"]` in a filter evaluates at integer zoom
+    // levels and removes the feature from placement entirely — verified
+    // against maplibre-gl-native rather than assumed, because a text-size-0
+    // gate would still claim a collision slot.
+    //
+    // The tiers are separate LAYERS, not a filtered split of one — see the
+    // builder for why: an archive that a not-yet-deployed style would
+    // mis-render cannot be promoted first, and this one has to be.
+    L({
+      id: "chrtbase-inland-label-detail",
+      type: "symbol",
+      source: src,
+      "source-layer": "inland_water_label_detail",
+      minzoom: HANDOVER,
+      filter: [">=", ["zoom"], ["get", "min_zoom"]],
+      layout: {
+        "text-field": ["get", "name"],
+        "text-font": ["Open Sans Regular"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 9, 9, 12, 10.5, 15, 11],
+        "text-max-width": 8,
+        "text-allow-overlap": false,
+        "text-padding": 6,
+        // Bigger water first within the tier — min_zoom IS the size rank.
+        "symbol-sort-key": ["get", "min_zoom"]
+      },
+      paint: {
+        "text-color": T.inlandLabel,
+        "text-halo-color": T.inlandHalo,
+        "text-halo-width": 1,
+        "text-opacity": 0.9
+      }
+    }),
+    L({
+      id: "chrtbase-inland-label",
+      type: "symbol",
+      source: src,
+      "source-layer": "inland_water_label",
+      minzoom: 5,
+      layout: {
+        "text-field": ["get", "name"],
+        "text-font": ["Open Sans Regular"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 5, 9.5, 10, 12],
+        "text-max-width": 7,
+        "text-allow-overlap": false,
+        // Zoom-scaled spacing for the anchor GRID: at z8.9 the 0.08-deg
+        // anchors sit ~54 px apart and a flat padding let six copies of
+        // "Lake Ontario" crowd one screen (owner-reported 2026-08-30).
+        // Wide collision boxes at low zoom thin the grid to the repeat-
+        // by-convention cadence; by z12 the anchors are ~850 px apart and
+        // the padding relaxes to normal.
+        "text-padding": ["interpolate", ["linear"], ["zoom"], 5, 80, 9, 64, 12, 16]
+      },
+      paint: {
+        "text-color": T.inlandLabel,
+        "text-halo-color": T.inlandHalo,
+        "text-halo-width": 1.1
+      }
+    })
+  ];
+}
+
+// src/atlas/eink-portrayal.ts
+var EINK_DOTS_PATTERN = `${CHRT_ICON_PREFIX}eink-dots`;
+var EINK_HATCH_PATTERN = `${CHRT_ICON_PREFIX}eink-hatch`;
+var EINK_DANGER_PATTERN = `${CHRT_ICON_PREFIX}eink-danger`;
+var EINK_LINE_SCALE = 1.5;
+var EINK_LINE_MIN_PX = 1;
+var EINK_TEXT_SCALE = 1.15;
+var EINK_HALO_MIN_PX = 1.5;
+var EINK_DANGER_ICON_SCALE = 1.35;
+var EINK_WASH_CUTOFF = 0.3;
+var EINK_SAFETY_CONTOUR_WIDTH = [2, 3.5];
+var EINK_DANGER_CLASSES = /* @__PURE__ */ new Set(["OBSTRN", "WRECKS", "UWTROC"]);
+var METRIC_CONTOUR_LADDER_M = [0, 2, 5, 10, 15, 20, 30, 50, 100, 200, 500, 1e3];
+var IMPERIAL_CONTOUR_LADDER_M = [
+  1.8,
+  3.6,
+  5.4,
+  9.1,
+  18.2,
+  27.4,
+  36.5,
+  54.8,
+  91.4,
+  182.8,
+  365.7,
+  914.4
+];
+function snapToLadder(safetyM, ladder) {
+  for (const rung of ladder) if (rung >= safetyM - 1e-6) return rung;
+  return null;
+}
+function safetyContourValues(safetyContourM) {
+  const s = effectiveSafetyContour(safetyContourM);
+  const out = [snapToLadder(s, METRIC_CONTOUR_LADDER_M), snapToLadder(s, IMPERIAL_CONTOUR_LADDER_M)];
+  return [...new Set(out.filter((v) => v !== null))];
+}
+function isExpr(v) {
+  return Array.isArray(v) && typeof v[0] === "string";
+}
+function scaleNumeric(v, k, min = 0) {
+  if (typeof v === "number") return Math.max(v * k, v > 0 ? min : 0);
+  if (!isExpr(v)) return v;
+  const op = v[0];
+  if (op === "interpolate" || op === "interpolate-hcl" || op === "interpolate-lab") {
+    const out = v.slice(0, 3);
+    for (let i = 3; i < v.length; i += 2) out.push(v[i], scaleNumeric(v[i + 1], k, min));
+    return out;
+  }
+  if (op === "step") {
+    const out = [op, v[1], scaleNumeric(v[2], k, min)];
+    for (let i = 3; i < v.length; i += 2) out.push(v[i], scaleNumeric(v[i + 1], k, min));
+    return out;
+  }
+  if (op === "literal") return v;
+  return ["max", ["*", v, k], min];
+}
+function objectClass(layer) {
+  const md = layer.metadata;
+  const c = md?.["s52:objectClass"];
+  return typeof c === "string" ? c : null;
+}
+function scaffoldId(prefix, baseId) {
+  return `${prefix}${baseId.replace(/-band(\d)/g, "-b$1")}`;
+}
+var DRVAL1 = ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1];
+var DRVAL2 = ["coalesce", ["get", "DRVAL2"], ["get", "drval2"], 0];
+var VALDCO = ["to-number", ["coalesce", ["get", "VALDCO"], ["get", "valdco"], -1], -1];
+function withFilter(base, extra) {
+  return base === void 0 ? extra : ["all", base, extra];
+}
+function applyEinkPortrayal(style, palette, opts = {}) {
+  if (palette !== "EINK_COLOR" && palette !== "EINK_MONO" && palette !== "EINK_NIGHT") return style;
+  const mono = isEinkGreyTable(palette);
+  const night = palette === "EINK_NIGHT";
+  const safetyInk = resolveColor("DEPSC", palette);
+  const groundInk = resolveColor("UIBCK", palette);
+  const safety = effectiveSafetyContour(opts.safetyContour ?? DEFAULT_SAFETY_CONTOUR_M);
+  const safetyValues = safetyContourValues(safety);
+  const out = [];
+  for (const original of style.layers) {
+    const id = original.id;
+    const type = original.type;
+    if (type === "hillshade" || id.startsWith("chrtland-fade-")) continue;
+    const layer = structuredClone(original);
+    const paint = layer.paint ??= {};
+    const layout = layer.layout;
+    const cls = objectClass(layer);
+    if (type === "line") {
+      if (paint["line-width"] !== void 0) {
+        paint["line-width"] = scaleNumeric(paint["line-width"], EINK_LINE_SCALE, EINK_LINE_MIN_PX);
+      } else {
+        paint["line-width"] = EINK_LINE_SCALE;
+      }
+      const o = paint["line-opacity"];
+      if (typeof o === "number" && o > 0 && o < 1) paint["line-opacity"] = 1;
+      if (paint["line-blur"] !== void 0) paint["line-blur"] = 0;
+    }
+    if (type === "fill") {
+      const o = paint["fill-opacity"];
+      if (typeof o === "number" && o > 0 && o < 1) {
+        if (cls && EINK_DANGER_CLASSES.has(cls)) {
+          paint["fill-pattern"] = EINK_DANGER_PATTERN;
+          paint["fill-opacity"] = 1;
+        } else {
+          paint["fill-opacity"] = o < EINK_WASH_CUTOFF ? 0 : 1;
+        }
+      }
+      if (paint["fill-antialias"] === void 0) paint["fill-antialias"] = true;
+    }
+    if (type === "background" && night && id === "chrt-background") {
+      paint["background-pattern"] = NOCOVERAGE_PATTERN;
+    }
+    if (type === "background") {
+      const o = paint["background-opacity"];
+      if (typeof o === "number" && o > 0 && o < 1) paint["background-opacity"] = 1;
+    }
+    if (type === "circle") {
+      const blur = paint["circle-blur"];
+      if (typeof blur === "number" && blur >= 0.5) {
+        paint["circle-opacity"] = 0;
+      } else {
+        if (blur !== void 0) paint["circle-blur"] = 0;
+        const o = paint["circle-opacity"];
+        if (typeof o === "number" && o > 0 && o < 1) paint["circle-opacity"] = 1;
+      }
+    }
+    if (type === "symbol") {
+      if (layout?.["text-field"] !== void 0) {
+        if (layout["text-size"] !== void 0) {
+          layout["text-size"] = scaleNumeric(layout["text-size"], EINK_TEXT_SCALE);
+        }
+        if (paint["text-opacity"] !== void 0) paint["text-opacity"] = 1;
+        if (typeof paint["text-halo-color"] === "string") paint["text-halo-color"] = groundInk;
+        const hw = paint["text-halo-width"];
+        paint["text-halo-width"] = typeof hw === "number" ? Math.max(hw, EINK_HALO_MIN_PX) : hw ?? EINK_HALO_MIN_PX;
+        if (paint["text-halo-blur"] !== void 0) paint["text-halo-blur"] = 0;
+      }
+      const io = paint["icon-opacity"];
+      if (typeof io === "number" && io > 0 && io < 1) paint["icon-opacity"] = 1;
+      if (cls && EINK_DANGER_CLASSES.has(cls) && layout?.["icon-image"] !== void 0) {
+        layout["icon-size"] = scaleNumeric(layout["icon-size"] ?? 1, EINK_DANGER_ICON_SCALE);
+      }
+    }
+    out.push(layer);
+    if (type === "fill" && cls === "DEPARE" && mono) {
+      const drying = ["all", ["<", DRVAL1, 0], ["<=", DRVAL2, 0]];
+      out.push({
+        ...structuredClone(original),
+        id: scaffoldId("chrt-eink-depth-of-", id),
+        filter: withFilter(original.filter, ["<", DRVAL1, safety]),
+        paint: {
+          "fill-pattern": ["case", drying, EINK_HATCH_PATTERN, EINK_DOTS_PATTERN]
+        }
+      });
+    }
+    if (type === "line" && cls === "DEPCNT") {
+      const isSafety = ["any", ...safetyValues.map((v) => ["<", ["abs", ["-", VALDCO, v]], 0.05])];
+      out.push({
+        ...structuredClone(original),
+        id: scaffoldId("chrt-eink-safety-of-", id),
+        filter: withFilter(original.filter, isSafety),
+        paint: {
+          "line-color": safetyInk,
+          "line-width": [
+            "interpolate",
+            ["linear"],
+            ["zoom"],
+            8,
+            EINK_SAFETY_CONTOUR_WIDTH[0],
+            14,
+            EINK_SAFETY_CONTOUR_WIDTH[1]
+          ]
+        },
+        layout: { "line-join": "round", "line-cap": "round" }
+      });
+    }
+  }
+  return {
+    ...style,
+    // No transitions: a property change is one repaint, never an animation.
+    ...{ transition: { duration: 0, delay: 0 } },
+    metadata: { ...style.metadata, "chrt:eink": night ? "night" : mono ? "mono" : "color" },
+    layers: out
+  };
+}
+
+// src/atlas/map-live.ts
 function isMapLive(map) {
   return map._removed !== true;
 }
@@ -5662,248 +7105,33 @@ function lineSpriteId(lineStyleName) {
 }
 function lineStylePaint(name) {
   const meta = S52_LINESTYLES[name];
-  if (!meta) {
-    throw new Error(
-      `Unknown S-52 linestyle "${name}". Known: ${Object.keys(S52_LINESTYLES).length} styles (regenerate with: bun run scripts/extract-opencpn-linestyles.ts)`
-    );
-  }
-  return {
-    "line-pattern": lineSpriteId(meta.name),
-    "line-width": houseWidth(meta)
-  };
-}
-function lineStylePaintCase(cases, fallback) {
-  const resolve = (name) => {
-    const meta = S52_LINESTYLES[name];
-    if (!meta) throw new Error(`Unknown S-52 linestyle "${name}"`);
-    return meta;
-  };
-  const fallbackMeta = resolve(fallback);
-  const pattern = ["case"];
-  const width = ["case"];
-  for (const [condition, name] of cases) {
-    const meta = resolve(name);
-    pattern.push(condition, lineSpriteId(meta.name));
-    width.push(condition, houseWidth(meta));
-  }
-  pattern.push(lineSpriteId(fallbackMeta.name));
-  width.push(houseWidth(fallbackMeta));
-  return { "line-pattern": pattern, "line-width": width };
-}
-
-// src/atlas/s52-pattern.ts
-var S52_PATTERN_SPRITE_PREFIX = "AP:";
-function patternSpriteId(patternName) {
-  return `${S52_PATTERN_SPRITE_PREFIX}${patternName}`;
-}
-
-// src/atlas/s52-conditional.ts
-var DEFAULT_SAFETY_CONTOUR_M = 10;
-var DEPARE_DEEP_CUT_M = 18.2;
-var DEPARE_SHALLOW_CUT_M = 2;
-function effectiveSafetyContour(safetyContourM) {
-  if (!Number.isFinite(safetyContourM)) return DEFAULT_SAFETY_CONTOUR_M;
-  return Math.min(Math.max(safetyContourM, DEPARE_SHALLOW_CUT_M), DEPARE_DEEP_CUT_M);
-}
-function depareColor(props, ct = "DAY", safetyContourM = DEFAULT_SAFETY_CONTOUR_M) {
-  const drval1 = Number(props.DRVAL1 ?? props.drval1 ?? -1);
-  const drval2 = Number(props.DRVAL2 ?? props.drval2 ?? drval1);
-  const safety = effectiveSafetyContour(safetyContourM);
-  if (drval1 < 0 && drval2 <= 0) return resolveColor("DEPIT", ct);
-  if (drval1 < DEPARE_SHALLOW_CUT_M) return resolveColor("DEPVS", ct);
-  if (drval1 < safety) return resolveColor("DEPMS", ct);
-  if (drval1 < DEPARE_DEEP_CUT_M) return resolveColor("DEPMD", ct);
-  return resolveColor("DEPDW", ct);
-}
-var DEPARE_FILL_BRANCH_TOKENS = ["DEPIT", "DEPVS", "DEPMS", "DEPMD"];
-var DEPARE_FILL_FALLBACK_TOKEN = "DEPDW";
-function depareFillExpression(ct = "DAY", safetyContourM = DEFAULT_SAFETY_CONTOUR_M) {
-  const safety = effectiveSafetyContour(safetyContourM);
-  const [it, vs, ms, md] = DEPARE_FILL_BRANCH_TOKENS;
-  return [
-    "case",
-    [
-      "all",
-      ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], 0],
-      ["<=", ["coalesce", ["get", "DRVAL2"], ["get", "drval2"], 0], 0]
-    ],
-    resolveColor(it, ct),
-    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], DEPARE_SHALLOW_CUT_M],
-    resolveColor(vs, ct),
-    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], safety],
-    resolveColor(ms, ct),
-    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], DEPARE_DEEP_CUT_M],
-    resolveColor(md, ct),
-    resolveColor(DEPARE_FILL_FALLBACK_TOKEN, ct)
-  ];
-}
-function listAttrString(attr) {
-  return ["to-string", ["coalesce", ["get", attr], ["get", attr.toLowerCase()], ""]];
-}
-function listAttrCase(attr, cases, fallback) {
-  const attrStr = listAttrString(attr);
-  const expr = ["case"];
-  for (const [code, value] of cases) {
-    expr.push([">=", ["index-of", `"${code}"`, attrStr], 0], value);
-  }
-  for (const [code, value] of cases) {
-    expr.push(["==", attrStr, code], value);
-  }
-  for (const [code, value] of cases) {
-    expr.push(["==", attrStr, `[${code}]`], value);
-  }
-  expr.push(fallback);
-  return expr;
-}
-function listAttrHas(attr, codes) {
-  const attrStr = listAttrString(attr);
-  const clauses = [];
-  for (const code of codes) {
-    clauses.push([">=", ["index-of", `"${code}"`, attrStr], 0]);
-    clauses.push(["==", attrStr, code]);
-    clauses.push(["==", attrStr, `[${code}]`]);
-  }
-  return ["any", ...clauses];
-}
-function colourCodeCase(cases, fallback) {
-  return listAttrCase("COLOUR", cases, fallback);
-}
-function lightColor(props, ct = "DAY") {
-  const raw = props.COLOUR ?? props.colour;
-  const code = Array.isArray(raw) ? Number(raw[0]) : typeof raw === "string" && raw.startsWith("[") ? Number(JSON.parse(raw)[0]) : Number(raw ?? 0);
-  switch (code) {
-    case 1:
-      return resolveColor("LITWT", ct);
-    case 3:
-      return resolveColor("LITRD", ct);
-    case 4:
-      return resolveColor("LITGN", ct);
-    case 5:
-      return resolveColor("LITBL", ct);
-    case 6:
-      return resolveColor("LITYW", ct);
-    case 11:
-      return resolveColor("LITOR", ct);
-    default:
-      return resolveColor("LITYW", ct);
-  }
-}
-function lightFillExpression(ct = "DAY") {
-  return colourCodeCase(
-    [
-      ["3", resolveColor("LITRD", ct)],
-      ["4", resolveColor("LITGN", ct)],
-      ["6", resolveColor("LITYW", ct)],
-      ["11", resolveColor("LITOR", ct)],
-      ["5", resolveColor("LITBL", ct)],
-      ["1", resolveColor("LITWT", ct)]
-    ],
-    resolveColor("LITYW", ct)
-  );
-}
-function lateralColor(props, ct = "DAY") {
-  const catlam = Number(props.CATLAM ?? props.catlam ?? 0);
-  if (catlam === 1) return resolveColor("LITRD", ct);
-  if (catlam === 2) return resolveColor("LITGN", ct);
-  return resolveColor("LITYW", ct);
-}
-function lateralFillExpression(ct = "DAY") {
-  return [
-    "match",
-    ["coalesce", ["get", "CATLAM"], ["get", "catlam"], 0],
-    1,
-    resolveColor("LITRD", ct),
-    2,
-    resolveColor("LITGN", ct),
-    resolveColor("LITYW", ct)
-  ];
-}
-function hazardColor(props, ct = "DAY") {
-  const watlev = Number(props.WATLEV ?? props.watlev ?? 0);
-  const valsou = props.VALSOU ?? props.valsou;
-  if (watlev === 1 || watlev === 2) return resolveColor("DNGHL", ct);
-  if (valsou != null && Number(valsou) < 2) return resolveColor("DNGHL", ct);
-  return resolveColor("RESBL", ct);
-}
-function hazardFillExpression(ct = "DAY") {
-  return [
-    "case",
-    [
-      "any",
-      ["==", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 1],
-      ["==", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 2]
-    ],
-    resolveColor("DNGHL", ct),
-    [
-      "all",
-      ["has", "VALSOU"],
-      ["<", ["get", "VALSOU"], 2]
-    ],
-    resolveColor("DNGHL", ct),
-    resolveColor("RESBL", ct)
-  ];
-}
-function vegatnPatternExpression() {
-  return [
-    "match",
-    ["coalesce", ["get", "CATVEG"], ["get", "catveg"], 0],
-    1,
-    patternSpriteId("VEGATN03"),
-    // grass
-    3,
-    patternSpriteId("VEGATN03"),
-    // bush
-    4,
-    patternSpriteId("VEGATN04"),
-    // deciduous wood
-    5,
-    patternSpriteId("VEGATN04"),
-    // coniferous wood
-    6,
-    patternSpriteId("VEGATN04"),
-    // wood (mixed)
-    7,
-    patternSpriteId("MARSHES1"),
-    // mangroves
-    10,
-    patternSpriteId("VEGATN03"),
-    // scrub
-    11,
-    patternSpriteId("VEGATN04"),
-    // tree
-    12,
-    patternSpriteId("VEGATN04"),
-    // evergreen
-    16,
-    patternSpriteId("MARSHES1"),
-    // swamp
-    17,
-    patternSpriteId("MARSHES1"),
-    // marsh
-    21,
-    patternSpriteId("VEGATN04"),
-    // savannah
-    patternSpriteId("VEGATN03")
-    // default: grass pattern
-  ];
-}
-function daymarkColor(props, ct = "DAY") {
-  const raw = props.COLOUR ?? props.colour;
-  const code = Array.isArray(raw) ? Number(raw[0]) : typeof raw === "string" && raw.startsWith("[") ? Number(JSON.parse(raw)[0]) : Number(raw ?? 0);
-  switch (code) {
-    case 1:
-      return resolveColor("LITWT", ct);
-    case 3:
-      return resolveColor("LITRD", ct);
-    case 4:
-      return resolveColor("LITGN", ct);
-    case 6:
-      return resolveColor("LITYW", ct);
-    case 11:
-      return resolveColor("LITOR", ct);
-    default:
-      return resolveColor("LITGN", ct);
+  if (!meta) {
+    throw new Error(
+      `Unknown S-52 linestyle "${name}". Known: ${Object.keys(S52_LINESTYLES).length} styles (regenerate with: bun run scripts/extract-opencpn-linestyles.ts)`
+    );
+  }
+  return {
+    "line-pattern": lineSpriteId(meta.name),
+    "line-width": houseWidth(meta)
+  };
+}
+function lineStylePaintCase(cases, fallback) {
+  const resolve = (name) => {
+    const meta = S52_LINESTYLES[name];
+    if (!meta) throw new Error(`Unknown S-52 linestyle "${name}"`);
+    return meta;
+  };
+  const fallbackMeta = resolve(fallback);
+  const pattern = ["case"];
+  const width = ["case"];
+  for (const [condition, name] of cases) {
+    const meta = resolve(name);
+    pattern.push(condition, lineSpriteId(meta.name));
+    width.push(condition, houseWidth(meta));
   }
+  pattern.push(lineSpriteId(fallbackMeta.name));
+  width.push(houseWidth(fallbackMeta));
+  return { "line-pattern": pattern, "line-width": width };
 }
 
 // src/atlas/s52-lookup.ts
@@ -19796,9 +21024,9 @@ function compileAtonExpression(lookup, mapSymbol = (name) => name) {
   expr.push(fallback);
   return expr;
 }
-function atonIconExpression(objectClass) {
-  const lookup = S52_ATON_LOOKUPS[objectClass];
-  if (!lookup) throw new Error(`s52-aton-expressions: no generated lookup for ${objectClass}`);
+function atonIconExpression(objectClass2) {
+  const lookup = S52_ATON_LOOKUPS[objectClass2];
+  if (!lookup) throw new Error(`s52-aton-expressions: no generated lookup for ${objectClass2}`);
   return compileAtonExpression(lookup);
 }
 function lightsIconExpression() {
@@ -22883,7 +24111,9 @@ var LABEL_TINT = {
 };
 function tintFor(tint, ct) {
   const day = LABEL_TINT[tint].day;
-  if (ct === "DAY") return day;
+  if (ct === "DAY" || ct === "EINK_COLOR") return day;
+  if (ct === "EINK_MONO") return einkMonoGrey(day);
+  if (ct === "EINK_NIGHT") return einkNightGrey(day);
   return capLuminance(day, relativeLuminance(resolveColor("CHBLK", ct)));
 }
 function nightText(tint) {
@@ -22894,10 +24124,14 @@ function nightText(tint) {
 }
 function onHalo(tint, ct) {
   if (ct === "NIGHT") return { textColor: nightText(tint), textHaloColor: NIGHT_KNOCKOUT };
+  if (ct === "EINK_NIGHT") return { textColor: EINK_MONO_GREYS.MID, textHaloColor: EINK_MONO_GREYS.INK };
+  if (isEinkColorTable(ct)) return { textColor: EINK_MONO_GREYS.INK, textHaloColor: EINK_MONO_GREYS.PAPER };
   return { textColor: DARK_BG, textHaloColor: tintFor(tint, ct) };
 }
 function onKnockout(tint, ct) {
   if (ct === "NIGHT") return { textColor: nightText(tint), textHaloColor: NIGHT_KNOCKOUT };
+  if (ct === "EINK_NIGHT") return { textColor: EINK_MONO_GREYS.MID, textHaloColor: EINK_MONO_GREYS.INK };
+  if (isEinkColorTable(ct)) return { textColor: EINK_MONO_GREYS.INK, textHaloColor: EINK_MONO_GREYS.PAPER };
   return { textColor: tintFor(tint, ct), textHaloColor: DARK_BG };
 }
 var NAV_AID_LABEL_TEXT_SIZE = [
@@ -27114,10 +28348,20 @@ var S101_NO_OFFICIAL_COUNTERPART = /* @__PURE__ */ new Set([
   "SISTAT02",
   "WATTUR01"
 ]);
+function s101EinkTable(einkS52, fallback) {
+  const out = {};
+  for (const [token, dayHex] of Object.entries(S101_DAY)) {
+    out[token] = einkS52[token] ?? fallback(dayHex);
+  }
+  return out;
+}
 var S101_TABLES = {
   DAY: S101_DAY,
   DUSK: S101_DUSK,
-  NIGHT: S101_NIGHT
+  NIGHT: S101_NIGHT,
+  EINK_COLOR: s101EinkTable(S52_EINK_COLOR, (hex) => hex),
+  EINK_MONO: s101EinkTable(S52_EINK_MONO, einkMonoGrey),
+  EINK_NIGHT: s101EinkTable(S52_EINK_NIGHT, einkNightGrey)
 };
 var warnedTokens = /* @__PURE__ */ new Set();
 function reportUnresolvedToken(token, table) {
@@ -27164,328 +28408,54 @@ function rewritePatternToS101(node, available) {
   if (typeof node === "string") {
     return available.has(node) ? `${S101_ICON_PREFIX}${node}` : node;
   }
-  if (Array.isArray(node)) return node.map((n) => rewritePatternToS101(n, available));
-  return node;
-}
-function collectLiterals(node, out) {
-  if (typeof node === "string") {
-    out.add(node);
-    return;
-  }
-  if (Array.isArray(node)) for (const n of node) collectLiterals(n, out);
-}
-function applyS101SymbolSet(style) {
-  const seen = { icon: /* @__PURE__ */ new Set(), fill: /* @__PURE__ */ new Set(), line: /* @__PURE__ */ new Set() };
-  for (const layer of style.layers) {
-    const layout = layer.layout;
-    const paint = layer.paint;
-    if (layer.type === "symbol" && layout && layout["icon-image"] != null) {
-      layout["icon-image"] = rewriteIconToS101(layout["icon-image"]);
-      collectLiterals(layout["icon-image"], seen.icon);
-    }
-    for (const bag of [layout, paint]) {
-      if (!bag) continue;
-      if (bag["fill-pattern"] != null) {
-        bag["fill-pattern"] = rewritePatternToS101(bag["fill-pattern"], S101_AREA_FILL_NAMES);
-        collectLiterals(bag["fill-pattern"], seen.fill);
-      }
-      if (bag["line-pattern"] != null) {
-        bag["line-pattern"] = rewritePatternToS101(bag["line-pattern"], S101_LINE_STYLE_NAMES);
-        collectLiterals(bag["line-pattern"], seen.line);
-      }
-    }
-  }
-  const official = (names) => [...names].filter((n) => n.startsWith(S101_ICON_PREFIX)).length;
-  const iconSubs = [...seen.icon].filter((n) => S101_NO_OFFICIAL_COUNTERPART.has(n)).length;
-  const patternSubs = (names) => [...names].filter((n) => /^(AP|LC):/.test(n)).length;
-  const coverage = {
-    pointSymbols: { official: official(seen.icon), s52Substitute: iconSubs },
-    areaFills: { official: official(seen.fill), s52Substitute: patternSubs(seen.fill) },
-    lineStyles: { official: official(seen.line), s52Substitute: patternSubs(seen.line) }
-  };
-  const metadata = style.metadata;
-  metadata["chrt:symbol-set"] = "s101";
-  metadata["chrt:s101-source-commit"] = S101_SOURCE_COMMIT;
-  metadata["chrt:s101-coverage"] = {
-    ...coverage,
-    /** True only when NOTHING in this document is an S-52 substitute. A
-     *  consumer that wants "S-101 or nothing" branches on this one boolean. */
-    complete: Object.values(coverage).every((c) => c.s52Substitute === 0)
-  };
-  return style;
-}
-
-// src/atlas/chrt-svgs-generated.ts
-var CHRT_GLYPH_SVGS = {
-  "badge-radar": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="19" r="2.6" fill="#D200D2"/><path d="M9 19a7 7 0 0 1 14 0M5 19a11 11 0 0 1 22 0" stroke="#D200D2" stroke-width="2.4" fill="none" stroke-linecap="round" stroke-dasharray="4 3"/></svg>',
-  "badge-sound": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="7" cy="16" r="2.2" fill="#D200D2"/><path d="M12 10a9 9 0 0 1 0 12M16.5 6.5a15 15 0 0 1 0 19M21 3a21 21 0 0 1 0 26" stroke="#D200D2" stroke-width="2.4" fill="none" stroke-linecap="round"/></svg>',
-  "beacon-cairn": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="11" r="4" fill="#fff"/><circle cx="11.5" cy="19" r="4.6" fill="#fff"/><circle cx="20.5" cy="19" r="4.6" fill="#fff"/><path d="M7 28h18" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "beacon-generic": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 25V12" stroke="#fff" stroke-width="2.6" stroke-linecap="round"/><path d="M16 4l6 8H10Z" fill="#fff"/><path d="M8 28h16M11 25h10" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "beacon-lattice": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M11 25 13 6h6l2 19M12 20h8M12.6 13h6.8M11 25l9-12M21 25l-9-12" stroke="#fff" stroke-width="1.8" stroke-linecap="round" fill="none"/><path d="M8 28h16" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "beacon-stake": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 25V6" stroke="#fff" stroke-width="2.8" stroke-linecap="round"/><path d="M9 28h14" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "beacon-tower": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M12 6h8l1.6 19H10.4Z" fill="#fff"/><path d="M10 6h12" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><path d="M8 28h16" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-barrel": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><rect x="7" y="13" width="18" height="11" rx="5.5" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-can": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M9 12h14v11a2 2 0 0 1-2 2H11a2 2 0 0 1-2-2Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-conical": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 8 24.5 25H7.5Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-pillar": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M13 6h6l1.4 19H11.6Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-spar": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M14.5 5h3l1 20h-5Z" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-spherical": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="17.5" r="8.5" fill="#fff"/><path d="M6 28h20" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "buoy-super": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M7 17h18l-2.5 8h-13Z" fill="#fff"/><path d="M16 17V8" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><circle cx="16" cy="6.5" r="2" fill="#fff"/><path d="M5 28h22" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "cardinal-e": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 1.5 20 6h-8Z" fill="#101418"/><path d="M16 11 12 6.5h8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "cardinal-n": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 1.5 20 6h-8Z" fill="#101418"/><path d="M16 6.5 20 11h-8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "cardinal-s": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 11 12 6.5h8Z" fill="#101418"/><path d="M16 6 12 1.5h8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "cardinal-w": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 6 12 1.5h8Z" fill="#101418"/><path d="M16 6.5 20 11h-8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "daymark-square": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><rect x="6" y="6" width="20" height="20" rx="1.5" fill="#fff"/></svg>',
-  "daymark-triangle": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 5 28 26H4Z" fill="#fff"/></svg>',
-  "hatch-nocoverage": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M-3 9 L9 -3 M-3 21 L21 -3 M3 27 L27 3 M15 27 L27 15" stroke="#8A97A0" stroke-width="0.8" fill="none"/><path d="M-3 15 L15 33 M-3 3 L21 27 M3 -3 L27 21 M15 -3 L27 9" stroke="#8A97A0" stroke-width="0.8" fill="none"/></svg>',
-  "hatch-uncharted": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M-3 9 L9 -3 M-3 21 L21 -3 M3 27 L27 3 M15 27 L27 15" stroke="#5B7383" stroke-width="0.65" fill="none"/></svg>',
-  "isolated-danger": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="3.5" r="2.4" fill="#101418"/><circle cx="16" cy="9.5" r="2.4" fill="#101418"/><path d="M13 13h6l1 12H12Z" fill="#101418"/><rect x="12.4" y="17.5" width="7.2" height="3.4" fill="#E5484D"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "light-flare": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="11" cy="11" r="3.2" fill="#fff"/><path d="M13.4 13.4 24 19.5a2.6 2.6 0 0 1-4.5 4.5L13.4 13.4Z" fill="#fff"/></svg>',
-  "lightship": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M6 20l3-5h14l3 5-3.5 4h-13Z" fill="#fff"/><path d="M16 15V8" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><circle cx="16" cy="6" r="2.2" fill="#fff"/><path d="M5 28h22" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
-  "safe-water": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="6" r="2.4" fill="#E5484D"/><circle cx="16" cy="17.5" r="8" fill="#F8FAFC"/><path d="M12.2 10.5a8 8 0 0 0 0 14M19.8 10.5a8 8 0 0 1 0 14" stroke="#E5484D" stroke-width="3" fill="none"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>'
-};
-
-// src/atlas/chrt-style.ts
-var CHRT_ICON_PREFIX = "chrt:";
-var CHRT_SDF_GLYPHS = /* @__PURE__ */ new Set([
-  "buoy-can",
-  "buoy-conical",
-  "buoy-spherical",
-  "buoy-pillar",
-  "buoy-spar",
-  "buoy-barrel",
-  "buoy-super",
-  "beacon-generic",
-  "beacon-tower",
-  "beacon-lattice",
-  "beacon-stake",
-  "beacon-cairn",
-  "light-flare",
-  "lightship",
-  "daymark-triangle",
-  "daymark-square"
-]);
-var CHRT_GLYPH_NAMES = new Set(Object.keys(CHRT_GLYPH_SVGS));
-var CHRT_ATON_COLORS = {
-  "1": "#F8FAFC",
-  // white
-  "2": "#101418",
-  // black
-  "3": "#E5484D",
-  // red
-  "4": "#30A46C",
-  // green
-  "5": "#3E63DD",
-  // blue
-  "6": "#FFC805",
-  // yellow
-  "7": "#8B9298",
-  // grey
-  "8": "#A66B3A",
-  // brown
-  "9": "#FFB224",
-  // amber
-  "10": "#7E4CCB",
-  // violet
-  "11": "#F76B15",
-  // orange
-  "12": "#D671C1"
-  // pink (magenta-ish)
-};
-var CHRT_UNKNOWN_TINT = "#8B9298";
-var HOUSE_BLACK = "#101418";
-function chrtHouseColor(dayHex, palette = "DAY") {
-  if (palette === "DAY") return dayHex;
-  const isBlack = dayHex.toLowerCase() === HOUSE_BLACK.toLowerCase();
-  if (palette === "DUSK") {
-    return isBlack ? dayHex : capLuminance(dayHex, relativeLuminance(resolveColor("CHBLK", "DUSK")));
-  }
-  return isBlack ? NIGHT_INK : capLuminance(dayHex, relativeLuminance(NIGHT_MUTED_INK));
-}
-function themeChrtGlyph(svg3, palette = "DAY") {
-  if (palette === "DAY") return svg3;
-  return svg3.replace(
-    /(fill|stroke)="(#[0-9a-fA-F]{3}|#[0-9a-fA-F]{6})"/g,
-    (_m, attr, hex) => {
-      const six = hex.length === 4 ? `#${hex[1]}${hex[1]}${hex[2]}${hex[2]}${hex[3]}${hex[3]}` : hex;
-      return `${attr}="${chrtHouseColor(six, palette)}"`;
-    }
-  );
-}
-function chrtAtonTintExpression(palette = "DAY") {
-  const c = (code) => chrtHouseColor(CHRT_ATON_COLORS[code], palette);
-  return colourCodeCase(
-    [
-      ["3", c("3")],
-      ["4", c("4")],
-      ["6", c("6")],
-      ["11", c("11")],
-      ["9", c("9")],
-      ["5", c("5")],
-      ["1", c("1")],
-      ["2", c("2")],
-      ["8", c("8")],
-      ["10", c("10")],
-      ["12", c("12")],
-      ["7", c("7")]
-    ],
-    chrtHouseColor(CHRT_UNKNOWN_TINT, palette)
-  );
-}
-function chrtLightTintExpression(palette = "DAY") {
-  const c = (code) => chrtHouseColor(CHRT_ATON_COLORS[code], palette);
-  return colourCodeCase(
-    [
-      ["3", c("3")],
-      ["4", c("4")],
-      ["6", c("6")],
-      ["11", c("11")],
-      ["9", c("9")],
-      ["5", c("5")],
-      ["1", c("1")]
-    ],
-    c("1")
-  );
-}
-function scalar(attr) {
-  return ["coalesce", ["get", attr], ["get", attr.toLowerCase()], 0];
-}
-var g = (name) => `${CHRT_ICON_PREFIX}${name}`;
-function buoyBodyExpression() {
-  return [
-    "match",
-    scalar("BOYSHP"),
-    1,
-    g("buoy-conical"),
-    2,
-    g("buoy-can"),
-    3,
-    g("buoy-spherical"),
-    4,
-    g("buoy-pillar"),
-    5,
-    g("buoy-spar"),
-    6,
-    g("buoy-barrel"),
-    7,
-    g("buoy-super"),
-    8,
-    g("buoy-super"),
-    g("buoy-pillar")
-  ];
-}
-function beaconBodyExpression() {
-  return [
-    "match",
-    scalar("BCNSHP"),
-    1,
-    g("beacon-stake"),
-    2,
-    g("beacon-stake"),
-    3,
-    g("beacon-tower"),
-    4,
-    g("beacon-lattice"),
-    5,
-    g("beacon-stake"),
-    6,
-    g("beacon-cairn"),
-    g("beacon-generic")
-  ];
+  if (Array.isArray(node)) return node.map((n) => rewritePatternToS101(n, available));
+  return node;
 }
-function cardinalExpression() {
-  return [
-    "match",
-    scalar("CATCAM"),
-    1,
-    g("cardinal-n"),
-    2,
-    g("cardinal-e"),
-    3,
-    g("cardinal-s"),
-    4,
-    g("cardinal-w"),
-    g("cardinal-n")
-  ];
+function collectLiterals(node, out) {
+  if (typeof node === "string") {
+    out.add(node);
+    return;
+  }
+  if (Array.isArray(node)) for (const n of node) collectLiterals(n, out);
 }
-var CHRT_ICON_EXPRESSIONS = {
-  BOYLAT: buoyBodyExpression,
-  BOYSPP: buoyBodyExpression,
-  BOYINB: buoyBodyExpression,
-  BOYCAR: cardinalExpression,
-  BOYISD: () => g("isolated-danger"),
-  BOYSAW: () => g("safe-water"),
-  BCNLAT: beaconBodyExpression,
-  BCNSPP: beaconBodyExpression,
-  BCNCAR: cardinalExpression,
-  BCNISD: () => g("isolated-danger"),
-  BCNSAW: () => g("safe-water"),
-  LIGHTS: () => g("light-flare"),
-  LITFLT: () => g("lightship"),
-  LITVES: () => g("lightship"),
-  FOGSIG: () => g("badge-sound"),
-  RTPBCN: () => g("badge-radar"),
-  RDOSTA: () => g("badge-radar"),
-  DAYMAR: () => [
-    "match",
-    scalar("TOPSHP"),
-    1,
-    g("daymark-triangle"),
-    2,
-    g("daymark-triangle"),
-    5,
-    g("daymark-triangle"),
-    g("daymark-square")
-  ]
-};
-var TINTED_CLASSES = /* @__PURE__ */ new Set([
-  "BOYLAT",
-  "BOYSPP",
-  "BOYINB",
-  "BCNLAT",
-  "BCNSPP",
-  "DAYMAR"
-]);
-var CHRT_HALO = { color: HOUSE_BLACK, width: 1 };
-var CHRT_LINE_DASH = {
-  CBLSUB: { color: "CHMGD", width: 0.8, dash: [6, 3] },
-  PIPSOL: { color: "PIPLN", width: 0.8, dash: [6, 3] }
-};
-function applyChrtSymbolSet(style, palette = "DAY") {
+function applyS101SymbolSet(style) {
+  const seen = { icon: /* @__PURE__ */ new Set(), fill: /* @__PURE__ */ new Set(), line: /* @__PURE__ */ new Set() };
   for (const layer of style.layers) {
-    if (layer.type === "line") {
-      const cls = layer.metadata?.["s52:objectClass"];
-      const dash = cls ? CHRT_LINE_DASH[cls] : void 0;
-      const paint2 = layer.paint ?? {};
-      if (dash && paint2["line-pattern"] != null) {
-        delete paint2["line-pattern"];
-        paint2["line-color"] = resolveColor(dash.color, palette);
-        paint2["line-width"] = dash.width;
-        paint2["line-dasharray"] = dash.dash;
-        layer.paint = paint2;
-      }
-      continue;
-    }
-    if (layer.type !== "symbol") continue;
-    const objectClass = layer.metadata?.["s52:objectClass"];
-    if (!objectClass || !CHRT_ICON_EXPRESSIONS[objectClass]) continue;
     const layout = layer.layout;
-    if (!layout || layout["icon-image"] == null) continue;
-    layout["icon-image"] = CHRT_ICON_EXPRESSIONS[objectClass]();
-    const paint = layer.paint ?? {};
-    if (TINTED_CLASSES.has(objectClass)) {
-      paint["icon-color"] = chrtAtonTintExpression(palette);
-      paint["icon-halo-color"] = CHRT_HALO.color;
-      paint["icon-halo-width"] = CHRT_HALO.width;
-    } else if (objectClass === "LIGHTS") {
-      paint["icon-color"] = chrtLightTintExpression(palette);
-      paint["icon-halo-color"] = CHRT_HALO.color;
-      paint["icon-halo-width"] = CHRT_HALO.width;
+    const paint = layer.paint;
+    if (layer.type === "symbol" && layout && layout["icon-image"] != null) {
+      layout["icon-image"] = rewriteIconToS101(layout["icon-image"]);
+      collectLiterals(layout["icon-image"], seen.icon);
+    }
+    for (const bag of [layout, paint]) {
+      if (!bag) continue;
+      if (bag["fill-pattern"] != null) {
+        bag["fill-pattern"] = rewritePatternToS101(bag["fill-pattern"], S101_AREA_FILL_NAMES);
+        collectLiterals(bag["fill-pattern"], seen.fill);
+      }
+      if (bag["line-pattern"] != null) {
+        bag["line-pattern"] = rewritePatternToS101(bag["line-pattern"], S101_LINE_STYLE_NAMES);
+        collectLiterals(bag["line-pattern"], seen.line);
+      }
     }
-    layer.paint = paint;
   }
+  const official = (names) => [...names].filter((n) => n.startsWith(S101_ICON_PREFIX)).length;
+  const iconSubs = [...seen.icon].filter((n) => S101_NO_OFFICIAL_COUNTERPART.has(n)).length;
+  const patternSubs = (names) => [...names].filter((n) => /^(AP|LC):/.test(n)).length;
+  const coverage = {
+    pointSymbols: { official: official(seen.icon), s52Substitute: iconSubs },
+    areaFills: { official: official(seen.fill), s52Substitute: patternSubs(seen.fill) },
+    lineStyles: { official: official(seen.line), s52Substitute: patternSubs(seen.line) }
+  };
   const metadata = style.metadata;
-  metadata["chrt:symbol-set"] = "chrt";
+  metadata["chrt:symbol-set"] = "s101";
+  metadata["chrt:s101-source-commit"] = S101_SOURCE_COMMIT;
+  metadata["chrt:s101-coverage"] = {
+    ...coverage,
+    /** True only when NOTHING in this document is an S-52 substitute. A
+     *  consumer that wants "S-101 or nothing" branches on this one boolean. */
+    complete: Object.values(coverage).every((c) => c.s52Substitute === 0)
+  };
   return style;
 }
 
@@ -27642,9 +28612,9 @@ var RASTER_ATON_CLASSES = Object.keys(
   if (!s52) return true;
   return JSON.stringify({ r: paper.rows, d: paper.defaultSymbol }) !== JSON.stringify({ r: s52.rows, d: s52.defaultSymbol });
 });
-function rasterAtonIconExpression(objectClass) {
-  const lookup = S52_ATON_LOOKUPS_PAPER[objectClass];
-  if (!lookup) throw new Error(`raster-style: no paper lookup for ${objectClass}`);
+function rasterAtonIconExpression(objectClass2) {
+  const lookup = S52_ATON_LOOKUPS_PAPER[objectClass2];
+  if (!lookup) throw new Error(`raster-style: no paper lookup for ${objectClass2}`);
   return compileAtonExpression(lookup, resolveRasterImage);
 }
 function getRasterSvg(name, table = "DAY") {
@@ -27658,9 +28628,9 @@ function applyRasterSymbolSet(style) {
     const layout = layer.layout;
     if (!layout || layout["icon-image"] == null) continue;
     const metadata2 = layer.metadata;
-    const objectClass = metadata2?.["s52:objectClass"];
-    if (typeof objectClass !== "string" || !classes.has(objectClass)) continue;
-    layout["icon-image"] = rasterAtonIconExpression(objectClass);
+    const objectClass2 = metadata2?.["s52:objectClass"];
+    if (typeof objectClass2 !== "string" || !classes.has(objectClass2)) continue;
+    layout["icon-image"] = rasterAtonIconExpression(objectClass2);
   }
   const metadata = style.metadata;
   metadata["chrt:symbol-set"] = "raster";
@@ -27692,19 +28662,19 @@ function parseSymbolFamily(raw) {
   const lower = raw.toLowerCase();
   return SYMBOL_FAMILIES.find((f) => f === lower) ?? null;
 }
-function iconExpressionForFamily(objectClass, family) {
-  const s52 = getIconExpression(objectClass);
+function iconExpressionForFamily(objectClass2, family) {
+  const s52 = getIconExpression(objectClass2);
   switch (family) {
     case "s52":
       return s52;
     case "s101":
       return rewriteIconToS101(s52);
     case "chrt": {
-      const build = CHRT_ICON_EXPRESSIONS[objectClass];
+      const build = CHRT_ICON_EXPRESSIONS[objectClass2];
       return build ? build() : s52;
     }
     case "raster":
-      return RASTER_ATON_CLASSES.includes(objectClass) ? rasterAtonIconExpression(objectClass) : s52;
+      return RASTER_ATON_CLASSES.includes(objectClass2) ? rasterAtonIconExpression(objectClass2) : s52;
   }
 }
 
@@ -27752,16 +28722,16 @@ var LARGE = {
   WRECKS: HAZARD_DEPTH
 };
 var LARGE_SOUNDING_PADDING_PX = 3.5;
-function applyDepthLabelSize(objectClass, layer, size) {
+function applyDepthLabelSize(objectClass2, layer, size) {
   if (size !== "large") return layer;
-  const large = LARGE[objectClass];
+  const large = LARGE[objectClass2];
   if (large === void 0) return layer;
   const layout = {
     ...layer.layout ?? {},
     "text-size": large.textSize,
     "text-font": [...large.font]
   };
-  if (objectClass === "SOUNDG") layout["text-padding"] = LARGE_SOUNDING_PADDING_PX;
+  if (objectClass2 === "SOUNDG") layout["text-padding"] = LARGE_SOUNDING_PADDING_PX;
   return {
     ...layer,
     layout,
@@ -27958,47 +28928,47 @@ function buildLightLabelExpression() {
   ];
   return ["concat", litchrExpr, siggrpExpr, colourExpr, sigperExpr, valnmrExpr];
 }
-function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts = {}) {
-  if (!S52_LOOKUP[objectClass]) return [];
-  const entry = S52_LOOKUP[objectClass];
+function buildLayersForClass(objectClass2, ct, sourceId = DEFAULT_REGION, opts = {}) {
+  if (!S52_LOOKUP[objectClass2]) return [];
+  const entry = S52_LOOKUP[objectClass2];
   const layers = [];
-  const geomTypes = getGeomTypesForClass(objectClass, entry?.style.type);
+  const geomTypes = getGeomTypesForClass(objectClass2, entry?.style.type);
   for (const geomType of geomTypes) {
-    const resolved = resolveStyle(objectClass, geomType, ct, { safetyContour: opts.safetyContour });
-    const layerId = `s52-${objectClass}-${resolved.type}`;
+    const resolved = resolveStyle(objectClass2, geomType, ct, { safetyContour: opts.safetyContour });
+    const layerId = `s52-${objectClass2}-${resolved.type}`;
     const layer = {
       id: layerId,
       type: resolved.type,
       source: sourceId,
-      "source-layer": objectClass,
+      "source-layer": objectClass2,
       paint: resolved.paint,
       metadata: {
-        "s52:objectClass": objectClass,
+        "s52:objectClass": objectClass2,
         "s52:displayCategory": entry?.displayCategory ?? "OTHER",
         "s52:category": entry?.category ?? "Meta"
       }
     };
-    if (resolved.type === "line" && LINE_FROM_POLYGON_LAYERS.has(objectClass)) {
+    if (resolved.type === "line" && LINE_FROM_POLYGON_LAYERS.has(objectClass2)) {
       layer.filter = GEOM_FILTERS.fill;
     } else if (GEOM_FILTERS[resolved.type]) {
       layer.filter = GEOM_FILTERS[resolved.type];
     }
-    if (SCAMIN_DECLUTTER_CLASSES.has(objectClass)) {
+    if (SCAMIN_DECLUTTER_CLASSES.has(objectClass2)) {
       layer.filter = layer.filter ? ["all", layer.filter, scaminZoomGateFilter()] : ["all", scaminZoomGateFilter()];
     }
     if (resolved.minzoom) {
       layer.minzoom = resolved.minzoom;
     }
-    if (resolved.type === "fill" && OPAQUE_FILLS.has(objectClass)) {
+    if (resolved.type === "fill" && OPAQUE_FILLS.has(objectClass2)) {
       layer.paint["fill-opacity"] = 1;
     }
-    if (resolved.type === "line" && ZOOM_SCALED_LINES2[objectClass]) {
-      const [z1, w1, z2, w2] = ZOOM_SCALED_LINES2[objectClass];
+    if (resolved.type === "line" && ZOOM_SCALED_LINES2[objectClass2]) {
+      const [z1, w1, z2, w2] = ZOOM_SCALED_LINES2[objectClass2];
       layer.paint["line-width"] = ["interpolate", ["linear"], ["zoom"], z1, w1, z2, w2];
     }
     if (resolved.type === "symbol") {
-      const iconExpr = getIconExpression(objectClass);
-      const childOffset = CHILD_ICON_OFFSETS[objectClass];
+      const iconExpr = getIconExpression(objectClass2);
+      const childOffset = CHILD_ICON_OFFSETS[objectClass2];
       const isSafetyCritical = SAFETY_GROUPS.has(entry?.viewingGroup ?? 0);
       const safetyCriticalIconSize = [
         "interpolate",
@@ -28121,7 +29091,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
           ]
         };
       }
-      if (objectClass === "LIGHTS") {
+      if (objectClass2 === "LIGHTS") {
         layer.layout = {
           ...layer.layout,
           "icon-allow-overlap": true,
@@ -28163,14 +29133,14 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
     } else if (resolved.layout) {
       layer.layout = resolved.layout;
     }
-    if (objectClass === "LNDMRK" && resolved.type === "symbol") {
+    if (objectClass2 === "LNDMRK" && resolved.type === "symbol") {
       const baseFilterParts = layer.filter && layer.filter[0] === "all" ? layer.filter.slice(1) : layer.filter ? [layer.filter] : [];
       const isWind = listAttrHas("CATLMK", ["18", "19"]);
       const isLighthouse = listAttrHas("CATLMK", ["17"]);
       const scaminFloor = scaminToMinZoom(entry?.scamin);
       const windLayer = {
         ...layer,
-        id: `s52-${objectClass}-wind-symbol`,
+        id: `s52-${objectClass2}-wind-symbol`,
         filter: ["all", ...baseFilterParts, isWind],
         // Explicit, not inherited: turbines share exact coordinates with
         // their aviation-light LIGHTS feature; without allow-overlap the
@@ -28183,7 +29153,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
       delete windLayer.minzoom;
       const lighthouseLayer = {
         ...layer,
-        id: `s52-${objectClass}-lighthouse-symbol`,
+        id: `s52-${objectClass2}-lighthouse-symbol`,
         filter: ["all", ...baseFilterParts, isLighthouse, ["!", isWind]],
         layout: {
           ...layer.layout ?? {},
@@ -28194,7 +29164,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
       delete lighthouseLayer.minzoom;
       const otherLayer = {
         ...layer,
-        id: `s52-${objectClass}-other-symbol`,
+        id: `s52-${objectClass2}-other-symbol`,
         filter: ["all", ...baseFilterParts, ["!", isWind], ["!", isLighthouse]]
       };
       if (scaminFloor !== void 0) {
@@ -28209,10 +29179,10 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
       const valsouNum = ["to-number", ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 999], 999];
       const watlevNum = ["to-number", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 0];
       layers.push({
-        id: `s52-${objectClass}-danger-ring`,
+        id: `s52-${objectClass2}-danger-ring`,
         type: "symbol",
         source: sourceId,
-        "source-layer": objectClass,
+        "source-layer": objectClass2,
         filter: [
           "all",
           GEOM_FILTERS.symbol,
@@ -28245,48 +29215,48 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         },
         paint: {},
         minzoom: 13,
-        metadata: { "s52:objectClass": objectClass, "s52:role": "isolated-danger-ring" }
+        metadata: { "s52:objectClass": objectClass2, "s52:role": "isolated-danger-ring" }
       });
     }
-    if (resolved.type === "fill" && FILL_OUTLINE_LAYERS.has(objectClass)) {
-      const outlineColor = objectClass === "DEPARE" ? resolveColor("CHGRD", ct) : resolveColor("CHGRF", ct);
+    if (resolved.type === "fill" && FILL_OUTLINE_LAYERS.has(objectClass2)) {
+      const outlineColor = objectClass2 === "DEPARE" ? resolveColor("CHGRD", ct) : resolveColor("CHGRF", ct);
       layers.push({
-        id: `s52-${objectClass}-outline`,
+        id: `s52-${objectClass2}-outline`,
         type: "line",
         source: sourceId,
-        "source-layer": objectClass,
+        "source-layer": objectClass2,
         filter: GEOM_FILTERS.fill,
         paint: {
           "line-color": outlineColor,
           "line-width": 0.3,
           "line-opacity": 0.4
         },
-        metadata: { "s52:objectClass": objectClass, "s52:role": "outline" }
+        metadata: { "s52:objectClass": objectClass2, "s52:role": "outline" }
       });
     }
-    if (resolved.type === "fill" && REGULATED_AREA_BOUNDARY_LAYERS[objectClass]) {
-      const lineStyle = REGULATED_AREA_BOUNDARY_LINESTYLES[objectClass];
+    if (resolved.type === "fill" && REGULATED_AREA_BOUNDARY_LAYERS[objectClass2]) {
+      const lineStyle = REGULATED_AREA_BOUNDARY_LINESTYLES[objectClass2];
       const boundaryPaint = lineStyle ? lineStylePaint(lineStyle) : {
-        "line-color": resolveColor(REGULATED_AREA_BOUNDARY_LAYERS[objectClass], ct),
+        "line-color": resolveColor(REGULATED_AREA_BOUNDARY_LAYERS[objectClass2], ct),
         "line-width": 1,
         "line-dasharray": [4, 2],
         "line-opacity": 0.85
       };
       layers.push({
-        id: `s52-${objectClass}-boundary`,
+        id: `s52-${objectClass2}-boundary`,
         type: "line",
         source: sourceId,
-        "source-layer": objectClass,
+        "source-layer": objectClass2,
         filter: GEOM_FILTERS.fill,
         paint: boundaryPaint,
         metadata: {
-          "s52:objectClass": objectClass,
+          "s52:objectClass": objectClass2,
           "s52:role": "boundary",
           ...lineStyle ? { "s52:lineStyle": lineStyle } : {}
         }
       });
     }
-    if (objectClass === "ACHARE" && resolved.type === "fill") {
+    if (objectClass2 === "ACHARE" && resolved.type === "fill") {
       layers.push({
         id: "s52-ACHARE-boundary",
         type: "line",
@@ -28302,7 +29272,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "ACHARE", "s52:role": "boundary" }
       });
     }
-    if (objectClass === "DRGARE" && resolved.type === "fill") {
+    if (objectClass2 === "DRGARE" && resolved.type === "fill") {
       layers.push({
         id: "s52-DRGARE-boundary",
         type: "line",
@@ -28318,7 +29288,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "DRGARE", "s52:role": "boundary" }
       });
     }
-    if (objectClass === "ACHARE" && resolved.type === "fill") {
+    if (objectClass2 === "ACHARE" && resolved.type === "fill") {
       layers.push({
         id: "s52-ACHARE-anchor-icon",
         type: "symbol",
@@ -28347,7 +29317,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "ACHARE", "s52:role": "centroid-icon" }
       });
     }
-    if (objectClass === "LNDARE" && resolved.type === "fill") {
+    if (objectClass2 === "LNDARE" && resolved.type === "fill") {
       layers.push({
         id: `s52-LNDARE-point`,
         type: "circle",
@@ -28363,7 +29333,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "LNDARE", "s52:role": "point" }
       });
     }
-    if (objectClass === "LNDARE" && resolved.type === "fill") {
+    if (objectClass2 === "LNDARE" && resolved.type === "fill") {
       layers.push({
         id: `s52-LNDARE-line`,
         type: "line",
@@ -28377,7 +29347,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "LNDARE", "s52:role": "line" }
       });
     }
-    if (objectClass === "BUAARE" && resolved.type === "fill") {
+    if (objectClass2 === "BUAARE" && resolved.type === "fill") {
       layers.push({
         id: `s52-BUAARE-point`,
         type: "circle",
@@ -28393,7 +29363,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "BUAARE", "s52:role": "point" }
       });
     }
-    if (objectClass === "RIVERS" && resolved.type === "fill") {
+    if (objectClass2 === "RIVERS" && resolved.type === "fill") {
       layers.push({
         id: `s52-RIVERS-line`,
         type: "line",
@@ -28407,7 +29377,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "RIVERS", "s52:role": "line" }
       });
     }
-    if (objectClass === "BUISGL" && resolved.type === "circle") {
+    if (objectClass2 === "BUISGL" && resolved.type === "circle") {
       layers.push({
         id: `s52-BUISGL-polygon`,
         type: "fill",
@@ -28433,7 +29403,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "BUISGL", "s52:role": "polygon-outline" }
       });
     }
-    if (objectClass === "BRIDGE" && resolved.type === "line") {
+    if (objectClass2 === "BRIDGE" && resolved.type === "line") {
       layers.push({
         id: `s52-BRIDGE-polygon`,
         type: "fill",
@@ -28459,7 +29429,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "BRIDGE", "s52:role": "polygon-outline" }
       });
     }
-    if (objectClass === "PYLONS" && resolved.type === "fill") {
+    if (objectClass2 === "PYLONS" && resolved.type === "fill") {
       layers.push({
         id: `s52-PYLONS-point`,
         type: "circle",
@@ -28475,7 +29445,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "PYLONS", "s52:role": "point" }
       });
     }
-    if (objectClass === "WEDKLP" && resolved.type === "fill") {
+    if (objectClass2 === "WEDKLP" && resolved.type === "fill") {
       layers.push({
         id: `s52-WEDKLP-point`,
         type: "circle",
@@ -28492,7 +29462,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "WEDKLP", "s52:role": "point" }
       });
     }
-    if (objectClass === "SLOGRD" && resolved.type === "fill") {
+    if (objectClass2 === "SLOGRD" && resolved.type === "fill") {
       layers.push({
         id: `s52-SLOGRD-point`,
         type: "circle",
@@ -28509,7 +29479,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "SLOGRD", "s52:role": "point" }
       });
     }
-    if (objectClass === "RUNWAY" && resolved.type === "fill") {
+    if (objectClass2 === "RUNWAY" && resolved.type === "fill") {
       layers.push({
         id: `s52-RUNWAY-line`,
         type: "line",
@@ -28523,7 +29493,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "RUNWAY", "s52:role": "line" }
       });
     }
-    if (objectClass === "FORSTC" && resolved.type === "fill") {
+    if (objectClass2 === "FORSTC" && resolved.type === "fill") {
       layers.push({
         id: `s52-FORSTC-line`,
         type: "line",
@@ -28537,7 +29507,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "FORSTC", "s52:role": "line" }
       });
     }
-    if (objectClass === "FSHFAC" && resolved.type === "fill") {
+    if (objectClass2 === "FSHFAC" && resolved.type === "fill") {
       layers.push({
         id: `s52-FSHFAC-point`,
         type: "circle",
@@ -28553,7 +29523,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "FSHFAC", "s52:role": "point" }
       });
     }
-    if (objectClass === "OBSTRN" && resolved.type === "symbol") {
+    if (objectClass2 === "OBSTRN" && resolved.type === "symbol") {
       layers.push({
         id: `s52-OBSTRN-polygon`,
         type: "fill",
@@ -28593,7 +29563,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "OBSTRN", "s52:role": "line" }
       });
     }
-    if (objectClass === "SLCONS" && resolved.type === "line") {
+    if (objectClass2 === "SLCONS" && resolved.type === "line") {
       layers.push({
         id: `s52-SLCONS-polygon`,
         type: "fill",
@@ -28633,7 +29603,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "SLCONS", "s52:role": "point" }
       });
     }
-    if (objectClass === "PRDARE" && resolved.type === "line") {
+    if (objectClass2 === "PRDARE" && resolved.type === "line") {
       layers.push({
         id: `s52-PRDARE-point`,
         type: "circle",
@@ -28650,7 +29620,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "PRDARE", "s52:role": "point" }
       });
     }
-    if (objectClass === "CTNARE" && resolved.type === "line") {
+    if (objectClass2 === "CTNARE" && resolved.type === "line") {
       layers.push({
         id: `s52-CTNARE-point`,
         type: "circle",
@@ -28666,7 +29636,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "CTNARE", "s52:role": "point" }
       });
     }
-    if (objectClass === "PONTON" && resolved.type === "line") {
+    if (objectClass2 === "PONTON" && resolved.type === "line") {
       layers.push({
         id: `s52-PONTON-polygon`,
         type: "fill",
@@ -28692,7 +29662,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "PONTON", "s52:role": "polygon-outline" }
       });
     }
-    if (objectClass === "WRECKS" && resolved.type === "symbol") {
+    if (objectClass2 === "WRECKS" && resolved.type === "symbol") {
       layers.push({
         id: `s52-WRECKS-polygon`,
         type: "fill",
@@ -28706,1179 +29676,729 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "WRECKS", "s52:role": "polygon" }
       });
       layers.push({
-        id: `s52-WRECKS-polygon-outline`,
-        type: "line",
-        source: sourceId,
-        "source-layer": "WRECKS",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "line-color": resolveColor("CHBLK", ct),
-          "line-width": 1,
-          "line-dasharray": [3, 2]
-        },
-        metadata: { "s52:objectClass": "WRECKS", "s52:role": "polygon-outline" }
-      });
-    }
-    if (objectClass === "WATTUR" && resolved.type === "symbol") {
-      layers.push({
-        id: `s52-WATTUR-polygon`,
-        type: "fill",
-        source: sourceId,
-        "source-layer": "WATTUR",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "fill-color": resolveColor("CHBLK", ct),
-          "fill-opacity": 0.05
-        },
-        metadata: { "s52:objectClass": "WATTUR", "s52:role": "polygon" }
-      });
-    }
-    if (objectClass === "MAGVAR" && resolved.type === "line") {
-      layers.push({
-        id: "s52-MAGVAR-point",
-        type: "circle",
-        source: sourceId,
-        "source-layer": "MAGVAR",
-        filter: GEOM_FILTERS.circle,
-        paint: {
-          "circle-color": resolveColor("CHMGD", ct),
-          "circle-radius": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 2],
-          "circle-stroke-color": resolveColor("CHBLK", ct),
-          "circle-stroke-width": 0.4,
-          "circle-opacity": 0.4
-        },
-        metadata: { "s52:objectClass": "MAGVAR", "s52:role": "point" }
-      });
-    }
-    if (objectClass === "DMPGRD" && resolved.type === "fill") {
-      layers.push({
-        id: `s52-DMPGRD-point`,
-        type: "circle",
-        source: sourceId,
-        "source-layer": "DMPGRD",
-        filter: GEOM_FILTERS.circle,
-        paint: {
-          "circle-color": resolveColor("LITYW", ct),
-          "circle-radius": ["interpolate", ["linear"], ["zoom"], 10, 1.5, 14, 2.5, 17, 3.6],
-          "circle-stroke-color": resolveColor("CHBLK", ct),
-          "circle-stroke-width": 0.5,
-          "circle-opacity": 0.7
-        },
-        metadata: { "s52:objectClass": "DMPGRD", "s52:role": "point" }
-      });
-    }
-    if (objectClass === "DAMCON" && resolved.type === "line") {
-      layers.push({
-        id: `s52-DAMCON-polygon`,
-        type: "fill",
-        source: sourceId,
-        "source-layer": "DAMCON",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "fill-color": resolveColor("CHBRN", ct),
-          "fill-opacity": 0.4
-        },
-        metadata: { "s52:objectClass": "DAMCON", "s52:role": "polygon" }
-      });
-      layers.push({
-        id: `s52-DAMCON-polygon-outline`,
-        type: "line",
-        source: sourceId,
-        "source-layer": "DAMCON",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "line-color": resolveColor("CHBLK", ct),
-          "line-width": 0.6
-        },
-        metadata: { "s52:objectClass": "DAMCON", "s52:role": "outline" }
-      });
-    }
-    if (objectClass === "GATCON" && resolved.type === "line") {
-      layers.push({
-        id: `s52-GATCON-polygon`,
-        type: "fill",
-        source: sourceId,
-        "source-layer": "GATCON",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "fill-color": resolveColor("CHBRN", ct),
-          "fill-opacity": 0.4
-        },
-        metadata: { "s52:objectClass": "GATCON", "s52:role": "polygon" }
-      });
-      layers.push({
-        id: `s52-GATCON-polygon-outline`,
-        type: "line",
-        source: sourceId,
-        "source-layer": "GATCON",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "line-color": resolveColor("CHBLK", ct),
-          "line-width": 0.6
-        },
-        metadata: { "s52:objectClass": "GATCON", "s52:role": "outline" }
-      });
-    }
-    if (objectClass === "CANALS" && resolved.type === "line") {
-      layers.push({
-        id: `s52-CANALS-polygon`,
-        type: "fill",
-        source: sourceId,
-        "source-layer": "CANALS",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "fill-color": resolveColor("DEPMS", ct),
-          "fill-opacity": 0.5
-        },
-        metadata: { "s52:objectClass": "CANALS", "s52:role": "polygon" }
-      });
-    }
-    if (objectClass === "PILBOP" && resolved.type === "symbol") {
-      layers.push({
-        id: `s52-PILBOP-polygon`,
-        type: "fill",
-        source: sourceId,
-        "source-layer": "PILBOP",
-        filter: GEOM_FILTERS.fill,
-        paint: {
-          "fill-color": resolveColor("CHMGD", ct),
-          "fill-opacity": 0.1
-        },
-        metadata: { "s52:objectClass": "PILBOP", "s52:role": "polygon" }
-      });
-      layers.push({
-        id: `s52-PILBOP-polygon-outline`,
+        id: `s52-WRECKS-polygon-outline`,
         type: "line",
         source: sourceId,
-        "source-layer": "PILBOP",
+        "source-layer": "WRECKS",
         filter: GEOM_FILTERS.fill,
         paint: {
-          "line-color": resolveColor("CHMGD", ct),
-          "line-width": 0.8,
-          "line-dasharray": [4, 2]
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 1,
+          "line-dasharray": [3, 2]
         },
-        metadata: { "s52:objectClass": "PILBOP", "s52:role": "outline" }
+        metadata: { "s52:objectClass": "WRECKS", "s52:role": "polygon-outline" }
       });
     }
-    if (objectClass === "HRBFAC" && resolved.type === "circle") {
+    if (objectClass2 === "WATTUR" && resolved.type === "symbol") {
       layers.push({
-        id: `s52-HRBFAC-polygon`,
+        id: `s52-WATTUR-polygon`,
         type: "fill",
         source: sourceId,
-        "source-layer": "HRBFAC",
+        "source-layer": "WATTUR",
         filter: GEOM_FILTERS.fill,
         paint: {
-          "fill-color": resolveColor("TRFCD", ct),
-          "fill-opacity": 0.15
+          "fill-color": resolveColor("CHBLK", ct),
+          "fill-opacity": 0.05
         },
-        metadata: { "s52:objectClass": "HRBFAC", "s52:role": "polygon" }
+        metadata: { "s52:objectClass": "WATTUR", "s52:role": "polygon" }
       });
     }
-    if (objectClass === "MARCUL" && resolved.type === "fill") {
+    if (objectClass2 === "MAGVAR" && resolved.type === "line") {
       layers.push({
-        id: `s52-MARCUL-point`,
+        id: "s52-MAGVAR-point",
         type: "circle",
         source: sourceId,
-        "source-layer": "MARCUL",
+        "source-layer": "MAGVAR",
         filter: GEOM_FILTERS.circle,
         paint: {
-          "circle-color": resolveColor("CHBRN", ct),
-          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.2, 14, 1.8, 17, 2.6],
+          "circle-color": resolveColor("CHMGD", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 2],
           "circle-stroke-color": resolveColor("CHBLK", ct),
           "circle-stroke-width": 0.4,
-          "circle-opacity": 0.6
+          "circle-opacity": 0.4
         },
-        metadata: { "s52:objectClass": "MARCUL", "s52:role": "point" }
+        metadata: { "s52:objectClass": "MAGVAR", "s52:role": "point" }
       });
+    }
+    if (objectClass2 === "DMPGRD" && resolved.type === "fill") {
       layers.push({
-        id: `s52-MARCUL-line`,
-        type: "line",
+        id: `s52-DMPGRD-point`,
+        type: "circle",
         source: sourceId,
-        "source-layer": "MARCUL",
-        filter: GEOM_FILTERS.line,
+        "source-layer": "DMPGRD",
+        filter: GEOM_FILTERS.circle,
         paint: {
-          "line-color": resolveColor("CHBLK", ct),
-          "line-width": 0.5,
-          "line-dasharray": [2, 2]
+          "circle-color": resolveColor("LITYW", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 10, 1.5, 14, 2.5, 17, 3.6],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.5,
+          "circle-opacity": 0.7
         },
-        metadata: { "s52:objectClass": "MARCUL", "s52:role": "line" }
+        metadata: { "s52:objectClass": "DMPGRD", "s52:role": "point" }
       });
     }
-    if (objectClass === "RECTRC" && resolved.type === "line") {
+    if (objectClass2 === "DAMCON" && resolved.type === "line") {
       layers.push({
-        id: `s52-RECTRC-polygon`,
+        id: `s52-DAMCON-polygon`,
         type: "fill",
         source: sourceId,
-        "source-layer": "RECTRC",
+        "source-layer": "DAMCON",
         filter: GEOM_FILTERS.fill,
         paint: {
-          "fill-color": resolveColor("TRFCD", ct),
-          "fill-opacity": 0.05
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.4
         },
-        metadata: { "s52:objectClass": "RECTRC", "s52:role": "polygon" }
+        metadata: { "s52:objectClass": "DAMCON", "s52:role": "polygon" }
       });
-    }
-    if (objectClass === "PONTON" && resolved.type === "fill") {
       layers.push({
-        id: `s52-PONTON-line`,
+        id: `s52-DAMCON-polygon-outline`,
         type: "line",
         source: sourceId,
-        "source-layer": "PONTON",
-        filter: GEOM_FILTERS.line,
+        "source-layer": "DAMCON",
+        filter: GEOM_FILTERS.fill,
         paint: {
-          "line-color": resolveColor("CHGRF", ct),
-          "line-width": 1.5
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.6
         },
-        metadata: { "s52:objectClass": "PONTON", "s52:role": "line" }
+        metadata: { "s52:objectClass": "DAMCON", "s52:role": "outline" }
       });
     }
-    if (objectClass === "SILTNK" && resolved.type === "symbol") {
+    if (objectClass2 === "GATCON" && resolved.type === "line") {
       layers.push({
-        id: `s52-SILTNK-symbol-polygon`,
-        type: "symbol",
+        id: `s52-GATCON-polygon`,
+        type: "fill",
         source: sourceId,
-        "source-layer": "SILTNK",
+        "source-layer": "GATCON",
         filter: GEOM_FILTERS.fill,
-        layout: {
-          "icon-image": "TNKCON02",
-          "icon-size": 0.6,
-          "icon-allow-overlap": true,
-          "icon-ignore-placement": false,
-          "symbol-placement": "point"
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.4
         },
-        paint: {},
-        metadata: { "s52:objectClass": "SILTNK", "s52:role": "symbol-polygon" }
+        metadata: { "s52:objectClass": "GATCON", "s52:role": "polygon" }
       });
-    }
-    if (objectClass === "ACHBRT" && resolved.type === "symbol") {
       layers.push({
-        id: `s52-ACHBRT-symbol-polygon`,
-        type: "symbol",
+        id: `s52-GATCON-polygon-outline`,
+        type: "line",
         source: sourceId,
-        "source-layer": "ACHBRT",
+        "source-layer": "GATCON",
         filter: GEOM_FILTERS.fill,
-        layout: {
-          "icon-image": "ACHARE02",
-          "icon-size": 0.5,
-          "icon-allow-overlap": true,
-          "icon-ignore-placement": false,
-          "symbol-placement": "point"
-        },
-        paint: {},
-        metadata: { "s52:objectClass": "ACHBRT", "s52:role": "symbol-polygon" }
-      });
-    }
-    if (objectClass === "BERTHS" && resolved.type === "line") {
-      layers.push({
-        id: `s52-BERTHS-circle`,
-        type: "circle",
-        source: sourceId,
-        "source-layer": "BERTHS",
-        filter: GEOM_FILTERS.circle,
         paint: {
-          "circle-color": resolveColor("CHBLK", ct),
-          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.5, 14, 2.2, 17, 3],
-          "circle-stroke-color": resolveColor("CHBLK", ct),
-          "circle-stroke-width": 0.5
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.6
         },
-        metadata: { "s52:objectClass": "BERTHS", "s52:role": "point" }
+        metadata: { "s52:objectClass": "GATCON", "s52:role": "outline" }
       });
     }
-    if (objectClass === "TUNNEL" && resolved.type === "line") {
+    if (objectClass2 === "CANALS" && resolved.type === "line") {
       layers.push({
-        // NOT `s52-TUNNEL-line` — that id is already taken by the main layer
-        // (`s52-${objectClass}-${resolved.type}`), and duplicate layer ids
-        // are a Mapbox style-spec violation (caught by style-integrity.test).
-        id: `s52-TUNNEL-linestring`,
-        type: "line",
+        id: `s52-CANALS-polygon`,
+        type: "fill",
         source: sourceId,
-        "source-layer": "TUNNEL",
-        filter: GEOM_FILTERS.line,
+        "source-layer": "CANALS",
+        filter: GEOM_FILTERS.fill,
         paint: {
-          "line-color": resolveColor("CHGRD", ct),
-          "line-width": 1,
-          "line-dasharray": [2, 2]
+          "fill-color": resolveColor("DEPMS", ct),
+          "fill-opacity": 0.5
         },
-        metadata: { "s52:objectClass": "TUNNEL", "s52:role": "line" }
-      });
-    }
-  }
-  return layers;
-}
-function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION, depthUnits = "meters", labelOpts = {}) {
-  if (!LABELED_LAYERS.has(objectClass)) return null;
-  const config = getLabelConfig(objectClass, {
-    colorTable: ct,
-    safetyContour: labelOpts.safetyContour,
-    twoShadeSoundings: labelOpts.twoShadeSoundings,
-    soundingFontWeight: labelOpts.soundingFontWeight
-  });
-  if (!config) return null;
-  let textField = config.textField;
-  if (objectClass === "LIGHTS") {
-    textField = buildLightLabelExpression();
-  }
-  if (typeof textField !== "string" && Array.isArray(textField)) {
-    const flat = JSON.stringify(textField);
-    if (flat.includes("_navAidLabel")) {
-      textField = buildNavAidLabelExpression();
-    }
-  }
-  if (depthUnits === "feet") {
-    if (objectClass === "SOUNDG") {
-      textField = [
-        "concat",
-        [
-          "round",
-          [
-            "*",
-            [
-              "to-number",
-              ["coalesce", ["get", "depth"], ["get", "DEPTH"], ["get", "VALSOU"]],
-              0
-            ],
-            3.28084
-          ]
-        ],
-        ""
-      ];
-    } else if (objectClass === "DEPCNT") {
-      textField = [
-        "concat",
-        ["round", ["*", ["to-number", ["get", "VALDCO"]], 3.28084]],
-        "ft"
-      ];
-    } else if (objectClass === "UWTROC" || objectClass === "OBSTRN" || objectClass === "WRECKS") {
-      const valsouFt = [
-        "to-number",
-        ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 0],
-        0
-      ];
-      textField = [
-        "case",
-        [">", valsouFt, 0],
-        ["concat", ["to-string", ["round", ["*", valsouFt, 3.28084]]], "ft"],
-        ""
-      ];
-    }
-  }
-  const labelPriority = getLabelPriority(objectClass);
-  const layer = {
-    id: `s52-${objectClass}-label`,
-    type: "symbol",
-    source: sourceId,
-    "source-layer": objectClass,
-    filter: GEOM_FILTERS.symbol,
-    layout: {
-      "text-field": textField,
-      "text-size": config.textSize,
-      "text-font": config.textFont ?? ["Open Sans Regular"],
-      "text-offset": config.textOffset,
-      "text-anchor": "top",
-      "text-allow-overlap": false,
-      "text-optional": true,
-      "text-padding": 4,
-      "symbol-sort-key": labelPriority * 1e3,
-      ...config.layout ?? {}
-    },
-    paint: {
-      "text-color": config.textColor,
-      "text-halo-color": config.textHaloColor,
-      "text-halo-width": config.textHaloWidth
-    },
-    metadata: {
-      "s52:objectClass": objectClass,
-      "chrt:labelPriority": labelPriority
-    }
-  };
-  if (config.minzoom) {
-    layer.minzoom = config.minzoom;
-  }
-  if (objectClass === "DEPCNT") {
-    layer.filter = GEOM_FILTERS.line;
-  }
-  if (objectClass === "CBLOHD" || objectClass === "PIPOHD") {
-    layer.filter = GEOM_FILTERS.line;
-  }
-  if (objectClass === "SBDARE") {
-    delete layer.filter;
-  }
-  if (objectClass === "MAGVAR") {
-    delete layer.filter;
-  }
-  if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-    layer.filter = LABEL_ANCHOR_FILTER;
-  }
-  return applyDepthLabelSize(objectClass, layer, labelOpts.depthLabelSize);
-}
-function getGeomTypesForClass(objectClass, defaultType) {
-  if (SYMBOL_MAP[objectClass] && defaultType === "symbol") {
-    return ["symbol"];
-  }
-  if (objectClass === "SOUNDG") {
-    return ["circle"];
-  }
-  if (defaultType) {
-    return [defaultType];
-  }
-  return ["circle"];
-}
-function getOrderedClasses() {
-  const ordered = [...S52_DRAW_ORDER];
-  for (const key of Object.keys(S52_LOOKUP)) {
-    if (!ordered.includes(key)) {
-      const insertIdx = ordered.indexOf("SOUNDG");
-      if (insertIdx >= 0) {
-        ordered.splice(insertIdx, 0, key);
-      } else {
-        ordered.push(key);
-      }
+        metadata: { "s52:objectClass": "CANALS", "s52:role": "polygon" }
+      });
     }
-  }
-  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" }
+    if (objectClass2 === "PILBOP" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-PILBOP-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "PILBOP",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHMGD", ct),
+          "fill-opacity": 0.1
+        },
+        metadata: { "s52:objectClass": "PILBOP", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-PILBOP-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "PILBOP",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHMGD", ct),
+          "line-width": 0.8,
+          "line-dasharray": [4, 2]
+        },
+        metadata: { "s52:objectClass": "PILBOP", "s52:role": "outline" }
+      });
+    }
+    if (objectClass2 === "HRBFAC" && resolved.type === "circle") {
+      layers.push({
+        id: `s52-HRBFAC-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "HRBFAC",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("TRFCD", ct),
+          "fill-opacity": 0.15
+        },
+        metadata: { "s52:objectClass": "HRBFAC", "s52:role": "polygon" }
+      });
+    }
+    if (objectClass2 === "MARCUL" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-MARCUL-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "MARCUL",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBRN", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.2, 14, 1.8, 17, 2.6],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.4,
+          "circle-opacity": 0.6
+        },
+        metadata: { "s52:objectClass": "MARCUL", "s52:role": "point" }
+      });
+      layers.push({
+        id: `s52-MARCUL-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "MARCUL",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.5,
+          "line-dasharray": [2, 2]
+        },
+        metadata: { "s52:objectClass": "MARCUL", "s52:role": "line" }
+      });
+    }
+    if (objectClass2 === "RECTRC" && resolved.type === "line") {
+      layers.push({
+        id: `s52-RECTRC-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "RECTRC",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("TRFCD", ct),
+          "fill-opacity": 0.05
+        },
+        metadata: { "s52:objectClass": "RECTRC", "s52:role": "polygon" }
+      });
+    }
+    if (objectClass2 === "PONTON" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-PONTON-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "PONTON",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHGRF", ct),
+          "line-width": 1.5
+        },
+        metadata: { "s52:objectClass": "PONTON", "s52:role": "line" }
+      });
+    }
+    if (objectClass2 === "SILTNK" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-SILTNK-symbol-polygon`,
+        type: "symbol",
+        source: sourceId,
+        "source-layer": "SILTNK",
+        filter: GEOM_FILTERS.fill,
+        layout: {
+          "icon-image": "TNKCON02",
+          "icon-size": 0.6,
+          "icon-allow-overlap": true,
+          "icon-ignore-placement": false,
+          "symbol-placement": "point"
+        },
+        paint: {},
+        metadata: { "s52:objectClass": "SILTNK", "s52:role": "symbol-polygon" }
+      });
+    }
+    if (objectClass2 === "ACHBRT" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-ACHBRT-symbol-polygon`,
+        type: "symbol",
+        source: sourceId,
+        "source-layer": "ACHBRT",
+        filter: GEOM_FILTERS.fill,
+        layout: {
+          "icon-image": "ACHARE02",
+          "icon-size": 0.5,
+          "icon-allow-overlap": true,
+          "icon-ignore-placement": false,
+          "symbol-placement": "point"
+        },
+        paint: {},
+        metadata: { "s52:objectClass": "ACHBRT", "s52:role": "symbol-polygon" }
+      });
+    }
+    if (objectClass2 === "BERTHS" && resolved.type === "line") {
+      layers.push({
+        id: `s52-BERTHS-circle`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "BERTHS",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBLK", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.5, 14, 2.2, 17, 3],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.5
+        },
+        metadata: { "s52:objectClass": "BERTHS", "s52:role": "point" }
+      });
+    }
+    if (objectClass2 === "TUNNEL" && resolved.type === "line") {
+      layers.push({
+        // NOT `s52-TUNNEL-line` — that id is already taken by the main layer
+        // (`s52-${objectClass}-${resolved.type}`), and duplicate layer ids
+        // are a Mapbox style-spec violation (caught by style-integrity.test).
+        id: `s52-TUNNEL-linestring`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "TUNNEL",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHGRD", ct),
+          "line-width": 1,
+          "line-dasharray": [2, 2]
+        },
+        metadata: { "s52:objectClass": "TUNNEL", "s52:role": "line" }
+      });
     }
-  ];
-}
-
-// src/atlas/band-priority.ts
-var BAND_PRIORITY_RANGES = {
-  "1": { minzoom: 0 },
-  "2": { minzoom: 5 },
-  "3": { minzoom: 7 },
-  "4": { minzoom: 9 },
-  "5": { minzoom: 11 },
-  "6": { minzoom: 11 }
-};
-var BAND_DATA_MINZOOM = {
-  "1": 0,
-  "2": 5,
-  "3": 7,
-  "4": 9,
-  "5": 11,
-  "6": 13
-};
-function dominatedVariantMaxzoom(D) {
-  return Math.max(BAND_PRIORITY_RANGES[D].minzoom, BAND_DATA_MINZOOM[D]);
-}
-var DOMINANCE_EXEMPT_FILL_CLASSES = /* @__PURE__ */ new Set([
-  "LNDARE",
-  "DEPARE",
-  "UNSARE",
-  "LAKARE",
-  "DRGARE",
-  "SEAARE"
-]);
-function isExemptOpaqueFill(layer) {
-  if (layer.type !== "fill") return false;
-  for (const cls of DOMINANCE_EXEMPT_FILL_CLASSES) {
-    if (layer.id.startsWith(`s52-${cls}-`)) return true;
-  }
-  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",
-  "3"
-]);
-function bandVariantMinzoom(layer, B) {
-  const classMinzoom = layer.minzoom ?? 0;
-  if (isGroundFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
-    return 0;
-  }
-  if (isGroundFill(layer)) {
-    return BAND_PRIORITY_RANGES[B].minzoom;
-  }
-  return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
-}
-var GENERALISED_AREA_FILL_CLASSES = /* @__PURE__ */ new Set([
-  "BUAARE",
-  // 2026-08-28, New York Harbor: the "New York Marine Inspection Zone and
-  // Captain of the Port Zone" RESARE exists at bands 2/3 as a generalized
-  // shore-hugging polygon whose point-sampled dominance tag MISSED (the
-  // Providence-BUAARE failure mode), so its magenta dashed boundary drew
-  // OFFSET over the band-5 detail at z11.5 — read in the field as "a
-  // magenta shoreline bleeding down from a less coarse band". The same
-  // tile carried untagged band-2 ADMARE and CTNARE giants in the same
-  // state. All three are area classes whose coarse-band boundaries hug
-  // shorelines and whose fine-band copies are authoritative.
-  "RESARE",
-  "CTNARE",
-  "ADMARE"
-]);
-var GENERALISED_AREA_MAX_BAND = 3;
-function generalisedAreaCeiling(layer, B) {
-  if (layer.type !== "fill" && layer.type !== "line") return null;
-  if (parseInt(B, 10) > GENERALISED_AREA_MAX_BAND) return null;
-  for (const cls of GENERALISED_AREA_FILL_CLASSES) {
-    if (layer.id.startsWith(`s52-${cls}-`)) return BAND_PRIORITY_RANGES["5"].minzoom;
-  }
-  return null;
-}
-var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
-var CHART_BAND_CODES = {
-  Overview: ["1"],
-  General: ["2"],
-  Coastal: ["3"],
-  Approach: ["4"],
-  Harbor: ["5", "6"]
-};
-var CHART_CASCADE_CODES = {
-  Overview: ["1"],
-  General: ["1", "2"],
-  Coastal: ["1", "2", "3"],
-  Approach: ["1", "2", "3", "4"],
-  Harbor: ["1", "2", "3", "4", "5", "6"]
-};
-var CHRT_STYLE_MODES = [
-  "continuous",
-  ...Object.keys(CHART_BAND_CODES).map(
-    (band) => `chart:${band}`
-  )
-];
-function normalizeStyleMode(raw) {
-  if (raw === null || raw === void 0 || raw === "") return "continuous";
-  const lower = raw.toLowerCase();
-  return CHRT_STYLE_MODES.find((mode) => mode.toLowerCase() === lower) ?? null;
-}
-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];
-  const chars = [...new Set(list.flatMap((c) => cellBandCharacters(c)))];
-  if (chars.length === 1) {
-    return ["==", cellBandExpr, chars[0]];
   }
-  return ["in", cellBandExpr, ["literal", chars]];
+  return layers;
 }
-function combineWithBandFilter(baseFilter, bandFilter) {
-  if (!baseFilter) return bandFilter;
-  if (baseFilter[0] === "all") {
-    return ["all", ...baseFilter.slice(1), bandFilter];
+function buildLabelLayer2(objectClass2, ct, sourceId = DEFAULT_REGION, depthUnits = "meters", labelOpts = {}) {
+  if (!LABELED_LAYERS.has(objectClass2)) return null;
+  const config = getLabelConfig(objectClass2, {
+    colorTable: ct,
+    safetyContour: labelOpts.safetyContour,
+    twoShadeSoundings: labelOpts.twoShadeSoundings,
+    soundingFontWeight: labelOpts.soundingFontWeight
+  });
+  if (!config) return null;
+  let textField = config.textField;
+  if (objectClass2 === "LIGHTS") {
+    textField = buildLightLabelExpression();
   }
-  return ["all", baseFilter, bandFilter];
-}
-var NOT_DOMINATED_FILTER = [
-  "all",
-  ["!", ["has", "_dominated_by_min"]],
-  ["!=", ["get", "_dominated"], true]
-];
-function dominatedByMinFilter(D) {
-  const dInt = parseInt(D, 10);
-  if (D === "6") {
-    return [
-      "any",
-      ["==", ["get", "_dominated_by_min"], dInt],
-      ["==", ["get", "_dominated"], true]
-    ];
+  if (typeof textField !== "string" && Array.isArray(textField)) {
+    const flat = JSON.stringify(textField);
+    if (flat.includes("_navAidLabel")) {
+      textField = buildNavAidLabelExpression();
+    }
   }
-  return ["==", ["get", "_dominated_by_min"], dInt];
-}
-function withinBboxFilter(bbox) {
-  const [w, s] = bbox.sw;
-  const [e, n] = bbox.ne;
-  return [
-    "within",
-    {
-      type: "Polygon",
-      coordinates: [
+  if (depthUnits === "feet") {
+    if (objectClass2 === "SOUNDG") {
+      textField = [
+        "concat",
         [
-          [w, s],
-          [e, s],
-          [e, n],
-          [w, n],
-          [w, s]
-        ]
-      ]
+          "round",
+          [
+            "*",
+            [
+              "to-number",
+              ["coalesce", ["get", "depth"], ["get", "DEPTH"], ["get", "VALSOU"]],
+              0
+            ],
+            3.28084
+          ]
+        ],
+        ""
+      ];
+    } else if (objectClass2 === "DEPCNT") {
+      textField = [
+        "concat",
+        ["round", ["*", ["to-number", ["get", "VALDCO"]], 3.28084]],
+        "ft"
+      ];
+    } else if (objectClass2 === "UWTROC" || objectClass2 === "OBSTRN" || objectClass2 === "WRECKS") {
+      const valsouFt = [
+        "to-number",
+        ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 0],
+        0
+      ];
+      textField = [
+        "case",
+        [">", valsouFt, 0],
+        ["concat", ["to-string", ["round", ["*", valsouFt, 3.28084]]], "ft"],
+        ""
+      ];
+    }
+  }
+  const labelPriority = getLabelPriority(objectClass2);
+  const layer = {
+    id: `s52-${objectClass2}-label`,
+    type: "symbol",
+    source: sourceId,
+    "source-layer": objectClass2,
+    filter: GEOM_FILTERS.symbol,
+    layout: {
+      "text-field": textField,
+      "text-size": config.textSize,
+      "text-font": config.textFont ?? ["Open Sans Regular"],
+      "text-offset": config.textOffset,
+      "text-anchor": "top",
+      "text-allow-overlap": false,
+      "text-optional": true,
+      "text-padding": 4,
+      "symbol-sort-key": labelPriority * 1e3,
+      ...config.layout ?? {}
+    },
+    paint: {
+      "text-color": config.textColor,
+      "text-halo-color": config.textHaloColor,
+      "text-halo-width": config.textHaloWidth
+    },
+    metadata: {
+      "s52:objectClass": objectClass2,
+      "chrt:labelPriority": labelPriority
     }
-  ];
-}
-function worldMinusBboxPolygon(bbox) {
-  const [w, s] = bbox.sw;
-  const [e, n] = bbox.ne;
-  return {
-    type: "Polygon",
-    coordinates: [
-      [
-        [-180, -85],
-        [180, -85],
-        [180, 85],
-        [-180, 85],
-        [-180, -85]
-      ],
-      // Inner ring (hole) — winding opposite to outer ring per GeoJSON
-      // spec. MapLibre is permissive but we follow strict winding.
-      [
-        [w, s],
-        [w, n],
-        [e, n],
-        [e, s],
-        [w, s]
-      ]
-    ]
   };
+  if (config.minzoom) {
+    layer.minzoom = config.minzoom;
+  }
+  if (objectClass2 === "DEPCNT") {
+    layer.filter = GEOM_FILTERS.line;
+  }
+  if (objectClass2 === "CBLOHD" || objectClass2 === "PIPOHD") {
+    layer.filter = GEOM_FILTERS.line;
+  }
+  if (objectClass2 === "SBDARE") {
+    delete layer.filter;
+  }
+  if (objectClass2 === "MAGVAR") {
+    delete layer.filter;
+  }
+  if (getLabelBehavior(objectClass2) === "orientation-cross-band") {
+    layer.filter = LABEL_ANCHOR_FILTER;
+  }
+  return applyDepthLabelSize(objectClass2, layer, labelOpts.depthLabelSize);
 }
-
-// src/atlas/base-layers.ts
-var NOCOVERAGE_PATTERN = "chrt:hatch-nocoverage";
-var UNCHARTED_PATTERN = "chrt:hatch-uncharted";
-function inlandWaterColor(palette) {
-  return (BASE_THEMES[palette] ?? BASE_THEMES.DAY).inlandWater;
-}
-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"
+function getGeomTypesForClass(objectClass2, defaultType) {
+  if (SYMBOL_MAP[objectClass2] && defaultType === "symbol") {
+    return ["symbol"];
   }
-};
-function baseLayers(opts = {}) {
-  const palette = opts.palette ?? "DAY";
-  const T = BASE_THEMES[palette] ?? BASE_THEMES.DAY;
-  const src = opts.sourceId ?? BASE_REGION;
-  const L = (o) => o;
-  return [
-    // 1. Geography — the world as it is, in the quiet dark voice. The OCEAN
-    //    is a background, not a polygon: the archive ships land and lakes,
-    //    and "everything else is sea" is exactly what a background expresses
-    //    — geometry-free, gap-free at every antimeridian and pole. Without
-    //    it the sea outside coverage was bare S-52 NODTA, a light grey that
-    //    read as "charted ground" with a hatch on it.
-    L({
-      id: "chrtbase-ocean",
-      type: "background",
-      paint: { "background-color": T.water }
-    }),
-    L({
-      id: "chrtbase-earth",
-      type: "fill",
-      source: src,
-      "source-layer": "base_earth",
-      paint: { "fill-color": T.earth }
-    }),
-    L({
-      id: "chrtbase-water",
-      type: "fill",
-      source: src,
-      "source-layer": "base_water",
-      paint: { "fill-color": T.water }
-    }),
-    L({
-      id: "chrtbase-river",
-      type: "line",
-      source: src,
-      "source-layer": "base_river",
-      minzoom: 9,
-      paint: {
-        "line-color": T.river,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 9, 0.6, 14, 1.6]
-      }
-    }),
-    L({
-      id: "chrtbase-boundary",
-      type: "line",
-      source: src,
-      "source-layer": "base_boundary",
-      paint: { "line-color": T.boundary, "line-width": 0.6, "line-opacity": 0.8 }
-    }),
-    // 2. THE DEFAULT: no coverage, everywhere, as a geometry-free background.
-    //    Constant opacity by design — see the header. What kills it is being
-    //    painted OVER, never fading.
-    L({
-      id: "chrtbase-nocoverage",
-      type: "background",
-      paint: { "background-pattern": NOCOVERAGE_PATTERN, "background-opacity": 0.55 }
-    }),
-    // 3. The jurisdiction: countries whose charts CHRT carries go tan — the
-    //    same tan as CHRTland, so "land in our world" is ONE colour. Opaque,
-    //    so it takes the crosshatch off its ground entirely.
-    L({
-      id: "chrtbase-jurisdiction",
-      type: "fill",
-      source: src,
-      "source-layer": "jurisdiction",
-      paint: { "fill-color": T.jurisdiction }
-    }),
-    // 4. States — internal boundaries and names, inside the jurisdiction
-    //    only (owner decision 2026-08-28). A hairline a shade deeper than the
-    //    tan, and quiet letter-spaced caps that fade as harbour detail takes
-    //    over. The one deliberate exception to no-names-on-the-basemap:
-    //    ADMIN furniture, nothing else — see the fence test.
-    L({
-      id: "chrtbase-state-boundary",
-      type: "line",
-      source: src,
-      "source-layer": "state_boundary",
-      minzoom: 4,
-      paint: {
-        "line-color": T.stateLine,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 1],
-        "line-dasharray": [3, 2],
-        "line-opacity": 0.8
-      }
-    }),
-    // 5. Country borders, drawn to be HOISTED above the whole chart by the
-    //    generator (owner, 2026-08-31: "where there is charted land, can we
-    //    add country borders on top of everything? I want it clear where
-    //    there is a boarder."). Sourced from NE boundary_lines_land — land
-    //    borders only, never coastline — so riding on top cannot stroke a
-    //    coast. Dashed so it reads as an administrative line, not chart
-    //    linework.
-    L({
-      id: "chrtbase-country-boundary",
-      type: "line",
-      source: src,
-      "source-layer": "country_boundary",
-      paint: {
-        "line-color": T.boundary,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 3, 0.8, 8, 1.4, 12, 2.2],
-        "line-dasharray": [4, 2],
-        "line-opacity": 0.9
-      }
-    }),
-    L({
-      id: "chrtbase-state-label",
-      type: "symbol",
-      source: src,
-      "source-layer": "state_label",
-      minzoom: 4,
-      maxzoom: 10,
-      layout: {
-        "text-field": ["upcase", ["get", "name"]],
-        "text-font": ["Open Sans Regular"],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 9, 8, 12],
-        "text-letter-spacing": 0.25,
-        "text-allow-overlap": false,
-        "text-padding": 8
-      },
-      paint: {
-        "text-color": T.stateLabel,
-        "text-halo-color": T.stateHalo,
-        "text-halo-width": 1.2,
-        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0.7, 8, 0.85, 10, 0.4]
+  if (objectClass2 === "SOUNDG") {
+    return ["circle"];
+  }
+  if (defaultType) {
+    return [defaultType];
+  }
+  return ["circle"];
+}
+function getOrderedClasses() {
+  const ordered = [...S52_DRAW_ORDER];
+  for (const key of Object.keys(S52_LOOKUP)) {
+    if (!ordered.includes(key)) {
+      const insertIdx = ordered.indexOf("SOUNDG");
+      if (insertIdx >= 0) {
+        ordered.splice(insertIdx, 0, key);
+      } else {
+        ordered.push(key);
       }
-    })
-  ];
+    }
+  }
+  return ordered;
 }
-function baseInlandWaterLayers(opts = {}) {
-  const palette = opts.palette ?? "DAY";
-  const T = BASE_THEMES[palette] ?? BASE_THEMES.DAY;
-  const src = opts.sourceId ?? BASE_REGION;
-  const L = (o) => o;
-  const NE_TIER = ["!", ["has", "kind"]];
-  const PLANET_TIER = ["has", "kind"];
-  const HANDOVER = 9;
+
+// 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 [
-    // ── The fill pair, SPLIT BY TIER at the handover ────────────────────────
-    //
-    // Both tiers share `inland_water` (tile-join concatenates the same layer
-    // name), and an unsplit fill draws BOTH — which means the NE polygon is
-    // painted over the planet one at every zoom. That is not a cosmetic
-    // double-draw: NE 10m carries no interior rings, so its blob has no
-    // ISLANDS in it, and painting it over the planet's holed polygons buries
-    // every island in the lake under "uncharted water". Owner-reported at
-    // Winnipesaukee z11.7 ("there is land (and islands) being covered by the
-    // 'no chart here' boundary"), and measured: rendering the planet tier
-    // alone brings back the whole archipelago — Rattlesnake, Bear, Long
-    // Island, Diamond, the Barndoors — while the NE tier alone is a faceted
-    // blob whose edges bear no relation to the shoreline drawn beneath it.
-    //
-    // So each tier owns its own zoom range, the same handover the shoreline
-    // below uses. Known residue, measured over the whole archive: of the 141
-    // NE lakes we still carry, 138 have planet water beneath them; the
-    // exceptions are two unnamed western-Alaska tundra lakes and a 2e-5 deg²
-    // Lake Michigan sliver, which lose their rough fill above z9 because the
-    // planet has no `water` polygon there at all (checked against the raw
-    // pre-clip NDJSON — not a clip artefact).
-    L({
-      id: "chrtbase-inland-water",
-      type: "fill",
-      source: src,
-      "source-layer": "inland_water",
-      filter: NE_TIER,
-      maxzoom: HANDOVER,
-      paint: { "fill-color": T.inlandWater }
-    }),
-    L({
-      id: "chrtbase-inland-hatch",
-      type: "fill",
-      source: src,
-      "source-layer": "inland_water",
-      filter: NE_TIER,
-      maxzoom: HANDOVER,
-      paint: { "fill-pattern": UNCHARTED_PATTERN, "fill-opacity": 0.7 }
-    }),
-    L({
-      id: "chrtbase-inland-water-detail",
-      type: "fill",
-      source: src,
-      "source-layer": "inland_water",
-      filter: PLANET_TIER,
-      minzoom: HANDOVER,
-      paint: { "fill-color": T.inlandWater }
-    }),
-    L({
-      id: "chrtbase-inland-hatch-detail",
-      type: "fill",
-      source: src,
-      "source-layer": "inland_water",
-      filter: PLANET_TIER,
-      minzoom: HANDOVER,
-      paint: { "fill-pattern": UNCHARTED_PATTERN, "fill-opacity": 0.7 }
-    }),
-    // The rough shoreline (owner ask 2026-08-28). Drawn ABOVE the hatch so
-    // the edge stays crisp through the texture, and BELOW the charted-water
-    // repaint clones the generator splices in after it — so wherever the
-    // chart repaints its own water, the rough NE10m line yields to the
-    // chart's COALNE instead of double-striking it.
-    //
-    // NE-tier geometry ONLY (`kind` absent): the planet detail tier joins
-    // the same source-layer from z9 as MANY polygons whose chunk-clip seams
-    // rejoin invisibly as FILLS — but a line layer strokes every seam, and
-    // Winnipesaukee rendered as a mesh of internal edges. Planet features
-    // carry `kind` (the INLAND_KINDS filter's own field); NE's carry only
-    // `name`, so the absence of `kind` IS the tier discriminator.
-    L({
-      id: "chrtbase-inland-shore",
-      type: "line",
-      source: src,
-      "source-layer": "inland_water",
-      filter: NE_TIER,
-      // Hands the shoreline over to the planet tier at ITS floor. Both
-      // tiers live in `inland_water` from z9 up (tile-join concatenates the
-      // same layer name), and their FILLS merge invisibly — but two
-      // outlines do not: NE 10m generalises Winnipesaukee's shape, so its
-      // outline ran straight across the middle of the lake the planet had
-      // drawn correctly around. The coarse line is right only while it is
-      // the only shape we have.
-      maxzoom: HANDOVER,
-      paint: {
-        "line-color": T.inlandShore,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 1.1, 14, 1.6],
-        "line-opacity": 0.9
-      }
-    }),
-    // The PLANET tier's shoreline (owner ask 2026-08-31: "uncharted small
-    // lakes render with no outline"). It reads its own `inland_shore` layer,
-    // NOT `inland_water`, and that indirection is the whole fix: the mesh
-    // that forced the `!has kind` fence above is a CLIP artefact — an MVT
-    // feature arrives already cut to its own z10 tile, so stroking the
-    // polygon strokes every tile boundary it crosses. The build now walks
-    // those rings, drops the axis-aligned runs that sit on the read zoom's
-    // tile grid, and emits what is left as lines (measured on one New
-    // England chunk: 61 long axis-aligned mesh edges → 5, and the 5 survivors
-    // are 0.02–0.5 tiles off the grid, i.e. real straight water edges).
-    //
-    // Thinner and quieter than the NE line: this is finer geometry describing
-    // water nobody has surveyed, and approximate data should look
-    // approximate.
-    L({
-      id: "chrtbase-inland-shore-detail",
-      type: "line",
-      source: src,
-      "source-layer": "inland_shore",
-      minzoom: HANDOVER,
-      paint: {
-        "line-color": T.inlandShore,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 9, 0.5, 12, 0.9, 15, 1.2],
-        "line-opacity": 0.85
-      }
-    }),
-    // The lake's name (owner ask 2026-08-28) — the second scoped exception
-    // to no-names-on-the-basemap, after the states: WATER-BODY names only.
-    // No maxzoom: an uncharted lake keeps its name at every zoom; over
-    // charted lakes the chart's own SEAARE label takes over at detail zooms
-    // and collision culls the echo.
-    //
-    // The archive's `inland_water_label` anchors (v3+). v3 shipped ONE
-    // PointOnSurface anchor per lake, and a big lake's single anchor pans
-    // off-viewport — Winnipesaukee at z11.7 read nameless with its name two
-    // tiles west of the screen (owner-reported). Labelling the polygons
-    // instead is NOT the fix: tippecanoe's coalescing drops the NE polygon
-    // from some z11 tiles (measured: 11/619/747 carries only planet pieces),
-    // so a polygon-sourced label vanishes tile by tile. v4 therefore bakes a
-    // deterministic anchor GRID into big lakes — the paper-chart convention
-    // of repeating a name along a large water body — and this one layer
-    // renders however many anchors are in view; collision culls the rest.
-    // Planet-tier water-body NAMES (owner ask 2026-08-31: NE 10m names only
-    // 113 US lakes). Emitted BELOW the NE layer on purpose — MapLibre places
-    // symbols topmost-layer-first, so the big NE lake wins collision against
-    // the pond beside it, and both lose to the chart's own labels (every ENC
-    // class is emitted after this pair).
-    //
-    // The size threshold is OSM's own `min_zoom`, carried through the build:
-    // Lake Winnipesaukee reads 10, Squam Lake 12, so a pond simply is not in
-    // the filter until the user is close enough for it to be the answer to
-    // "what is that water". `["zoom"]` in a filter evaluates at integer zoom
-    // levels and removes the feature from placement entirely — verified
-    // against maplibre-gl-native rather than assumed, because a text-size-0
-    // gate would still claim a collision slot.
-    //
-    // The tiers are separate LAYERS, not a filtered split of one — see the
-    // builder for why: an archive that a not-yet-deployed style would
-    // mis-render cannot be promoted first, and this one has to be.
-    L({
-      id: "chrtbase-inland-label-detail",
-      type: "symbol",
-      source: src,
-      "source-layer": "inland_water_label_detail",
-      minzoom: HANDOVER,
-      filter: [">=", ["zoom"], ["get", "min_zoom"]],
-      layout: {
-        "text-field": ["get", "name"],
-        "text-font": ["Open Sans Regular"],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 9, 9, 12, 10.5, 15, 11],
-        "text-max-width": 8,
-        "text-allow-overlap": false,
-        "text-padding": 6,
-        // Bigger water first within the tier — min_zoom IS the size rank.
-        "symbol-sort-key": ["get", "min_zoom"]
-      },
+    {
+      ...common,
+      id: LAMP_GLOW_LAYER_ID,
       paint: {
-        "text-color": T.inlandLabel,
-        "text-halo-color": T.inlandHalo,
-        "text-halo-width": 1,
-        "text-opacity": 0.9
-      }
-    }),
-    L({
-      id: "chrtbase-inland-label",
-      type: "symbol",
-      source: src,
-      "source-layer": "inland_water_label",
-      minzoom: 5,
-      layout: {
-        "text-field": ["get", "name"],
-        "text-font": ["Open Sans Regular"],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 5, 9.5, 10, 12],
-        "text-max-width": 7,
-        "text-allow-overlap": false,
-        // Zoom-scaled spacing for the anchor GRID: at z8.9 the 0.08-deg
-        // anchors sit ~54 px apart and a flat padding let six copies of
-        // "Lake Ontario" crowd one screen (owner-reported 2026-08-30).
-        // Wide collision boxes at low zoom thin the grid to the repeat-
-        // by-convention cadence; by z12 the anchors are ~850 px apart and
-        // the padding relaxes to normal.
-        "text-padding": ["interpolate", ["linear"], ["zoom"], 5, 80, 9, 64, 12, 16]
+        "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: {
-        "text-color": T.inlandLabel,
-        "text-halo-color": T.inlandHalo,
-        "text-halo-width": 1.1
-      }
-    })
+        "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 },
+  "2": { minzoom: 5 },
+  "3": { minzoom: 7 },
+  "4": { minzoom: 9 },
+  "5": { minzoom: 11 },
+  "6": { minzoom: 11 }
+};
+var BAND_DATA_MINZOOM = {
+  "1": 0,
+  "2": 5,
+  "3": 7,
+  "4": 9,
+  "5": 11,
+  "6": 13
+};
+function dominatedVariantMaxzoom(D) {
+  return Math.max(BAND_PRIORITY_RANGES[D].minzoom, BAND_DATA_MINZOOM[D]);
+}
+var DOMINANCE_EXEMPT_FILL_CLASSES = /* @__PURE__ */ new Set([
+  "LNDARE",
+  "DEPARE",
+  "UNSARE",
+  "LAKARE",
+  "DRGARE",
+  "SEAARE"
+]);
+function isExemptOpaqueFill(layer) {
+  if (layer.type !== "fill") return false;
+  for (const cls of DOMINANCE_EXEMPT_FILL_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return true;
+  }
+  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",
+  "3"
+]);
+function bandVariantMinzoom(layer, B) {
+  const classMinzoom = layer.minzoom ?? 0;
+  if (isGroundFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
+    return 0;
+  }
+  if (isGroundFill(layer)) {
+    return BAND_PRIORITY_RANGES[B].minzoom;
+  }
+  return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
+}
+var GENERALISED_AREA_FILL_CLASSES = /* @__PURE__ */ new Set([
+  "BUAARE",
+  // 2026-08-28, New York Harbor: the "New York Marine Inspection Zone and
+  // Captain of the Port Zone" RESARE exists at bands 2/3 as a generalized
+  // shore-hugging polygon whose point-sampled dominance tag MISSED (the
+  // Providence-BUAARE failure mode), so its magenta dashed boundary drew
+  // OFFSET over the band-5 detail at z11.5 — read in the field as "a
+  // magenta shoreline bleeding down from a less coarse band". The same
+  // tile carried untagged band-2 ADMARE and CTNARE giants in the same
+  // state. All three are area classes whose coarse-band boundaries hug
+  // shorelines and whose fine-band copies are authoritative.
+  "RESARE",
+  "CTNARE",
+  "ADMARE"
+]);
+var GENERALISED_AREA_MAX_BAND = 3;
+function generalisedAreaCeiling(layer, B) {
+  if (layer.type !== "fill" && layer.type !== "line") return null;
+  if (parseInt(B, 10) > GENERALISED_AREA_MAX_BAND) return null;
+  for (const cls of GENERALISED_AREA_FILL_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return BAND_PRIORITY_RANGES["5"].minzoom;
+  }
+  return null;
+}
+var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
+var CHART_BAND_CODES = {
+  Overview: ["1"],
+  General: ["2"],
+  Coastal: ["3"],
+  Approach: ["4"],
+  Harbor: ["5", "6"]
+};
+var CHART_CASCADE_CODES = {
+  Overview: ["1"],
+  General: ["1", "2"],
+  Coastal: ["1", "2", "3"],
+  Approach: ["1", "2", "3", "4"],
+  Harbor: ["1", "2", "3", "4", "5", "6"]
+};
+var CHRT_STYLE_MODES = [
+  "continuous",
+  ...Object.keys(CHART_BAND_CODES).map(
+    (band) => `chart:${band}`
+  )
+];
+function normalizeStyleMode(raw) {
+  if (raw === null || raw === void 0 || raw === "") return "continuous";
+  const lower = raw.toLowerCase();
+  return CHRT_STYLE_MODES.find((mode) => mode.toLowerCase() === lower) ?? null;
+}
+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];
+  const chars = [...new Set(list.flatMap((c) => cellBandCharacters(c)))];
+  if (chars.length === 1) {
+    return ["==", cellBandExpr, chars[0]];
+  }
+  return ["in", cellBandExpr, ["literal", chars]];
+}
+function combineWithBandFilter(baseFilter, bandFilter) {
+  if (!baseFilter) return bandFilter;
+  if (baseFilter[0] === "all") {
+    return ["all", ...baseFilter.slice(1), bandFilter];
+  }
+  return ["all", baseFilter, bandFilter];
+}
+var NOT_DOMINATED_FILTER = [
+  "all",
+  ["!", ["has", "_dominated_by_min"]],
+  ["!=", ["get", "_dominated"], true]
+];
+function dominatedByMinFilter(D) {
+  const dInt = parseInt(D, 10);
+  if (D === "6") {
+    return [
+      "any",
+      ["==", ["get", "_dominated_by_min"], dInt],
+      ["==", ["get", "_dominated"], true]
+    ];
+  }
+  return ["==", ["get", "_dominated_by_min"], dInt];
+}
+function withinBboxFilter(bbox) {
+  const [w, s] = bbox.sw;
+  const [e, n] = bbox.ne;
+  return [
+    "within",
+    {
+      type: "Polygon",
+      coordinates: [
+        [
+          [w, s],
+          [e, s],
+          [e, n],
+          [w, n],
+          [w, s]
+        ]
+      ]
+    }
   ];
 }
+function worldMinusBboxPolygon(bbox) {
+  const [w, s] = bbox.sw;
+  const [e, n] = bbox.ne;
+  return {
+    type: "Polygon",
+    coordinates: [
+      [
+        [-180, -85],
+        [180, -85],
+        [180, 85],
+        [-180, 85],
+        [-180, -85]
+      ],
+      // Inner ring (hole) — winding opposite to outer ring per GeoJSON
+      // spec. MapLibre is permissive but we follow strict winding.
+      [
+        [w, s],
+        [w, n],
+        [e, n],
+        [e, s],
+        [w, s]
+      ]
+    ]
+  };
+}
 
 // src/atlas/tile-number.ts
 function tileNumber(property, fallback) {
@@ -29949,6 +30469,57 @@ var LAND_THEMES = {
     // skipper is navigating by. Left at the shipped value rather than
     // lowered, because lowering it is a separate decision from this one.
     exaggeration: 0.45
+  },
+  // ── E-ink: paper land, no relief ──────────────────────────────────────
+  // Hillshade is a continuous grey ramp — exactly what an e-ink panel cannot
+  // show (and a moving one costs a refresh), so both e-ink palettes switch it
+  // off (`exaggeration: 0`). Land is the chart's own LANDA in that table, so
+  // charted and CHRTland land are one tone; labels are black on paper.
+  EINK_COLOR: {
+    base: "#f2e2b0",
+    cover: { wood: "#d6e0b0", wetland: "#d0dccc", urban: "#e0dacb", sand: "#f2e2b0" },
+    contour: "#a08a5a",
+    contourIndex: "#6b5a3e",
+    road: "#d8c08a",
+    roadMajor: "#c49a4a",
+    label: "#000000",
+    halo: "#ffffff",
+    shadow: "#6b5a3e",
+    highlight: "#ffffff",
+    fade: "#ffffff",
+    exaggeration: 0
+  },
+  // Mono: one land tone (MID). Land cover is not drawn as tone — four greys
+  // cannot spare one for "wood" — so every cover class is the land tone.
+  EINK_MONO: {
+    base: "#aaaaaa",
+    cover: { wood: "#aaaaaa", wetland: "#aaaaaa", urban: "#aaaaaa", sand: "#aaaaaa" },
+    contour: "#555555",
+    contourIndex: "#555555",
+    road: "#ffffff",
+    roadMajor: "#ffffff",
+    label: "#000000",
+    halo: "#ffffff",
+    shadow: "#555555",
+    highlight: "#ffffff",
+    fade: "#ffffff",
+    exaggeration: 0
+  },
+  // Night: land is the DIM grey (the chart's EINK_NIGHT LANDA), drawn on in
+  // black so the land adds no lit lines of its own; labels the night line grey.
+  EINK_NIGHT: {
+    base: "#555555",
+    cover: { wood: "#555555", wetland: "#555555", urban: "#555555", sand: "#555555" },
+    contour: "#000000",
+    contourIndex: "#000000",
+    road: "#000000",
+    roadMajor: "#000000",
+    label: "#aaaaaa",
+    halo: "#000000",
+    shadow: "#000000",
+    highlight: "#555555",
+    fade: "#000000",
+    exaggeration: 0
   }
 };
 var FITS = ["<=", tileNumber("min_z", 0), ["zoom"]];
@@ -30331,7 +30902,10 @@ var META_LAYERS = /* @__PURE__ */ new Set([
 var PALETTE_NAMES = {
   DAY: "DAY_BRIGHT",
   DUSK: "DUSK",
-  NIGHT: "NIGHT"
+  NIGHT: "NIGHT",
+  EINK_COLOR: "EINK_COLOR",
+  EINK_MONO: "EINK_MONO",
+  EINK_NIGHT: "EINK_NIGHT"
 };
 var SYMBOL_SET_LABELS = {
   s52: "S-52",
@@ -30443,7 +31017,7 @@ var ORIENTATION_OPACITY_SCALE = {
 };
 var ORIENTATION_OPACITY_MAX = 0.92;
 var ORIENTATION_BOOST_MINZOOM = 11;
-function fanOrientationLabelByCellBand(label, bandFan, objectClass) {
+function fanOrientationLabelByCellBand(label, bandFan, objectClass2) {
   const cellBandExpr = [
     "slice",
     ["coalesce", ["get", "_cell_id"], "??9???"],
@@ -30451,7 +31025,7 @@ function fanOrientationLabelByCellBand(label, bandFan, objectClass) {
     3
   ];
   const variants = [];
-  const scale = objectClass ? ORIENTATION_OPACITY_SCALE[objectClass] ?? 1 : 1;
+  const scale = objectClass2 ? ORIENTATION_OPACITY_SCALE[objectClass2] ?? 1 : 1;
   for (const code of BAND_DRAW_ORDER) {
     const range = BAND_PRIORITY_RANGES[code];
     const curve = CELL_BAND_OPACITY_CURVE[code];
@@ -30650,14 +31224,14 @@ function generateStyle(palette = "DAY", opts = {}) {
   const bandFan = opts.bandFan ?? "collapsed";
   const lockedBounds = opts.chartMode?.lockedBounds;
   const bundles = [];
-  for (const objectClass of orderedClasses) {
-    if (META_LAYERS.has(objectClass)) continue;
+  for (const objectClass2 of orderedClasses) {
+    if (META_LAYERS.has(objectClass2)) continue;
     bundles.push({
-      objectClass,
-      featureLayers: buildLayersForClass(objectClass, palette, sourceId, {
+      objectClass: objectClass2,
+      featureLayers: buildLayersForClass(objectClass2, palette, sourceId, {
         safetyContour: opts.safetyContour
       }),
-      label: buildLabelLayer2(objectClass, palette, sourceId, opts.depthUnits ?? "meters", {
+      label: buildLabelLayer2(objectClass2, palette, sourceId, opts.depthUnits ?? "meters", {
         safetyContour: opts.safetyContour,
         twoShadeSoundings: opts.twoShadeSoundings,
         soundingFontWeight: opts.soundingFontWeight,
@@ -30802,17 +31376,17 @@ function generateStyle(palette = "DAY", opts = {}) {
     if (opts.labels === "placename") {
       labelLayers.push(...buildPlaceNameLayers(sourceId, palette));
     } else {
-      for (const { objectClass, label } of bundles) {
+      for (const { objectClass: objectClass2, label } of bundles) {
         if (!label) continue;
-        if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-          if (objectClass === "LNDARE" || objectClass === "SEAARE") {
+        if (getLabelBehavior(objectClass2) === "orientation-cross-band") {
+          if (objectClass2 === "LNDARE" || objectClass2 === "SEAARE") {
             const Z = ISLAND_LABEL_HOIST_MINZOOM;
-            const { hoist, watermark } = objectClass === "LNDARE" ? splitOrientationFan(
-              fanOrientationLabelByCellBand(label, bandFan, objectClass),
+            const { hoist, watermark } = objectClass2 === "LNDARE" ? splitOrientationFan(
+              fanOrientationLabelByCellBand(label, bandFan, objectClass2),
               [">=", ["zoom"], Z],
               ["<", ["zoom"], Z]
             ) : splitOrientationFan(
-              fanOrientationLabelByCellBand(label, bandFan, objectClass),
+              fanOrientationLabelByCellBand(label, bandFan, objectClass2),
               ["<=", buildSeaAreaTierExpression(), MAJOR_WATER_TIER_MAX],
               [">", buildSeaAreaTierExpression(), MAJOR_WATER_TIER_MAX],
               { "text-padding": MAJOR_WATER_TEXT_PADDING }
@@ -30821,7 +31395,7 @@ function generateStyle(palette = "DAY", opts = {}) {
             labelLayers.push(...watermark);
             continue;
           }
-          labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan, objectClass));
+          labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan, objectClass2));
         }
       }
     }
@@ -31085,10 +31659,8 @@ function generateStyle(palette = "DAY", opts = {}) {
     glyphs: `${glyphsBase}/{fontstack}/{range}.pbf`,
     layers: finalLayers
   };
-  if (symbolSet === "s101") return applyS101SymbolSet(style);
-  if (symbolSet === "chrt") return applyChrtSymbolSet(style, palette);
-  if (symbolSet === "raster") return applyRasterSymbolSet(style);
-  return style;
+  const familyStyle = symbolSet === "s101" ? applyS101SymbolSet(style) : symbolSet === "chrt" ? applyChrtSymbolSet(style, palette) : symbolSet === "raster" ? applyRasterSymbolSet(style) : style;
+  return applyEinkPortrayal(familyStyle, palette, { safetyContour: opts.safetyContour });
 }
 function generateStyleJSON(palette = "DAY", opts = {}) {
   return JSON.stringify(generateStyle(palette, opts), null, 2);
@@ -31232,7 +31804,7 @@ var DEFAULT_CUSTOM_STYLE_CONFIG = {
   water_body_settings: DEFAULT_WATER_BODY_SETTINGS,
   visible_layers: null
 };
-var COLOR_TABLE_NAMES = /* @__PURE__ */ new Set(["DAY", "DUSK", "NIGHT"]);
+var COLOR_TABLE_NAMES = /* @__PURE__ */ new Set(["DAY", "DUSK", "NIGHT", "EINK_COLOR", "EINK_MONO", "EINK_NIGHT"]);
 var DISPLAY_MODES = /* @__PURE__ */ new Set(["BASE", "STANDARD", "ALL"]);
 var LAYER_NAME_RE = /^[A-Za-z0-9_$]{2,16}$/;
 var MAX_VISIBLE_LAYERS = 512;
@@ -31339,12 +31911,12 @@ function sanitizeCustomStyleConfig(raw) {
 }
 function normalizeTheme(raw) {
   if (!raw) return null;
-  const upper = raw.trim().toUpperCase();
+  const upper = raw.trim().toUpperCase().replace(/-/g, "_");
   return COLOR_TABLE_NAMES.has(upper) ? upper : null;
 }
 function resolveCustomTheme(config, requested) {
   if (!requested) return { palette: config.default_color_table, themeFellBack: false };
-  if (config.enabled_color_tables.includes(requested)) {
+  if (isEinkColorTable(requested) || config.enabled_color_tables.includes(requested)) {
     return { palette: requested, themeFellBack: false };
   }
   return { palette: config.default_color_table, themeFellBack: true };
@@ -32022,6 +32594,11 @@ export {
   DEPTH_LABEL_CLASSES,
   DEPTH_LABEL_SIZES,
   DRAPEABLE_LAYER_TYPES,
+  EINK_COLOR_TABLES,
+  EINK_DANGER_PATTERN,
+  EINK_DOTS_PATTERN,
+  EINK_HATCH_PATTERN,
+  EINK_MONO_GREYS,
   INSPECT_CLASS_RANK,
   INSPECT_RANK_DEVIATIONS,
   InteractClient,
@@ -32074,6 +32651,9 @@ export {
   S52_DAY,
   S52_DRAW_ORDER,
   S52_DUSK,
+  S52_EINK_COLOR,
+  S52_EINK_MONO,
+  S52_EINK_NIGHT,
   S52_LOOKUP,
   S52_NIGHT,
   S52_PATTERN_SPRITE_PREFIX,
@@ -32093,6 +32673,7 @@ export {
   applyColorTheme,
   applyCustomStyleSettings,
   applyDepthLabelSize,
+  applyEinkPortrayal,
   applyRasterSymbolSet,
   applyS101SymbolSet,
   atonIconExpression,
@@ -32172,6 +32753,8 @@ export {
   iconExpressionForFamily,
   isDepthAreaClassLayerId,
   isDrapeable,
+  isEinkColorTable,
+  isEinkGreyTable,
   isLabelLayerVisible,
   isMapLive,
   isNavAidLayer,
@@ -32211,6 +32794,7 @@ export {
   resolveTargetClass,
   rhythmProperties,
   s101ArtworkProvenance,
+  safetyContourValues,
   sanitizeCustomStyleConfig,
   scaleLinearLight,
   scaleSizeValue,