@chrtco/sdk 0.10.52 → 0.10.54

package/CHANGELOG.md

@@ -54,6 +54,20 @@ All notable changes to `@chrtco/sdk` will be documented in this file.
   emits for the relief source. Exported for consumers that describe that
   source themselves, such as the tile-worker's TileJSON.
 
+### Changed
+- **Below z7, an overview or general chart draws only its aids to navigation.** In continuous
+  mode a band-1 or band-2 point mark (an icon or a circle) that is not an aid to navigation now
+  draws from z7, the coastal band's floor, instead of from its band's z0 or z5: platforms,
+  dumping grounds, islets drawn as points and the like. Buoys, beacons, lights, light floats and
+  vessels, fog signals, radio and radar aids, topmarks and daymarks keep their band floor
+  (`AID_TO_NAVIGATION_CLASSES`, `COARSE_MARK_FLOOR`), and so, for now, do wrecks, rocks and
+  obstructions (`COARSE_MARK_HELD_HAZARDS`). Soundings, text, fills, lines, bands 3–6 and chart
+  mode are unchanged.
+- **Sector-light rings wait for their own band**, as the light's flare does: a coastal light's
+  legs and arc from z7, an approach light's from z9, a harbour or berthing light's from z11,
+  instead of z6 for every band (`bandFloorGate`). Continuous mode only; the night lamps are
+  unchanged.
+
 ### Fixed
 - **The image loaders threw on a map removed while they waited.**
   `loadS52SymbolImagesCached`, `loadSymbolImageSpecs`, `rethemeSymbolImages`,

package/dist/index.cjs

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AID_TO_NAVIGATION_CLASSES: () => AID_TO_NAVIGATION_CLASSES,
   ALL_NAV_AID_LAYERS: () => ALL_NAV_AID_LAYERS,
   ALL_WATER_BODY_LAYERS: () => ALL_WATER_BODY_LAYERS,
   AREA_QUERY_LAYERS: () => AREA_QUERY_LAYERS,
@@ -59,6 +60,8 @@ __export(index_exports, {
   CHRT_ICON_PREFIX: () => CHRT_ICON_PREFIX,
   CHRT_SDF_GLYPHS: () => CHRT_SDF_GLYPHS,
   CHRT_STYLE_MODES: () => CHRT_STYLE_MODES,
+  COARSE_MARK_FLOOR: () => COARSE_MARK_FLOOR,
+  COARSE_MARK_HELD_HAZARDS: () => COARSE_MARK_HELD_HAZARDS,
   Chrt: () => Chrt,
   ChrtError: () => ChrtError,
   DANGER_DEPTH_LABEL_ID: () => DANGER_DEPTH_LABEL_ID,
@@ -191,6 +194,7 @@ __export(index_exports, {
   applyS101SymbolSet: () => applyS101SymbolSet,
   atonIconExpression: () => atonIconExpression,
   bandFilterExpression: () => bandFilterExpression,
+  bandFloorGate: () => bandFloorGate,
   buildAirportTierExpression: () => buildAirportTierExpression,
   buildBuiltUpAreaTierExpression: () => buildBuiltUpAreaTierExpression,
   buildFlashPattern: () => buildFlashPattern,
@@ -31546,7 +31550,10 @@ var SERVED_FONT_STACKS = [
   "Open Sans Semibold",
   "Old Standard TT Regular",
   "Old Standard TT Italic",
-  "Old Standard TT Bold"
+  "Old Standard TT Bold",
+  "Liberation Sans Regular",
+  "Liberation Sans Italic",
+  "Liberation Sans Bold"
 ];
 function semiboldFontStack(font) {
   if (!Array.isArray(font) || !font.every((face) => typeof face === "string")) return font;
@@ -31977,8 +31984,54 @@ function bandVariantMinzoom(layer, B) {
   if (isGroundFill(layer)) {
     return BAND_PRIORITY_RANGES[B].minzoom;
   }
+  if (COARSE_MARK_BANDS.has(B) && isCoarseNonAidMark(layer)) {
+    return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom, COARSE_MARK_FLOOR);
+  }
   return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
 }
+var AID_TO_NAVIGATION_CLASSES = /* @__PURE__ */ new Set([
+  "BOYLAT",
+  "BOYCAR",
+  "BOYSPP",
+  "BOYISD",
+  "BOYSAW",
+  "BOYINB",
+  "BCNLAT",
+  "BCNCAR",
+  "BCNSPP",
+  "BCNISD",
+  "BCNSAW",
+  "LIGHTS",
+  "LITFLT",
+  "LITVES",
+  "FOGSIG",
+  "TOPMAR",
+  "DAYMAR",
+  "RTPBCN",
+  "RDOSTA",
+  "RADRFL",
+  "RETRFL"
+]);
+var COARSE_MARK_BANDS = /* @__PURE__ */ new Set(["1", "2"]);
+var COARSE_MARK_HELD_HAZARDS = /* @__PURE__ */ new Set(["WRECKS", "OBSTRN", "UWTROC"]);
+var COARSE_MARK_FLOOR = BAND_PRIORITY_RANGES["3"].minzoom;
+function bandFloorGate() {
+  return [
+    "any",
+    ...BAND_DRAW_ORDER.map((B) => {
+      const floor = BAND_PRIORITY_RANGES[B].minzoom;
+      return floor > 0 ? ["all", bandFilterExpression(B), [">=", ["zoom"], floor]] : bandFilterExpression(B);
+    })
+  ];
+}
+function isCoarseNonAidMark(layer) {
+  if (layer.type !== "symbol" && layer.type !== "circle") return false;
+  const cls = /^s52-([A-Za-z]{6})(?:-|$)/.exec(layer.id)?.[1]?.toUpperCase();
+  if (!cls || cls === "SOUNDG" || AID_TO_NAVIGATION_CLASSES.has(cls) || COARSE_MARK_HELD_HAZARDS.has(cls)) return false;
+  if (layer.type === "circle") return true;
+  const layout = layer.layout;
+  return typeof layout === "object" && layout !== null && "icon-image" in layout;
+}
 var GENERALISED_AREA_FILL_CLASSES = /* @__PURE__ */ new Set([
   "BUAARE",
   // 2026-08-28, New York Harbor: the "New York Marine Inspection Zone and
@@ -33102,7 +33155,11 @@ function generateStyle(palette = "DAY", opts = {}) {
         }
       }
     }
-    layers.push(...sectorLightLayers, ...lampLayers);
+    const sectorGate = bandFloorGate();
+    layers.push(
+      ...sectorLightLayers.map((l) => ({ ...l, filter: combineWithBandFilter(l.filter, sectorGate) })),
+      ...lampLayers
+    );
     {
       const TERMINAL_FILL_RE = new RegExp(
         `^s52-(?:${[...DOMINANCE_EXEMPT_FILL_CLASSES].join("|")})-fill-band[456]$`
@@ -34309,6 +34366,7 @@ var Chrt = class {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AID_TO_NAVIGATION_CLASSES,
   ALL_NAV_AID_LAYERS,
   ALL_WATER_BODY_LAYERS,
   AREA_QUERY_LAYERS,
@@ -34348,6 +34406,8 @@ var Chrt = class {
   CHRT_ICON_PREFIX,
   CHRT_SDF_GLYPHS,
   CHRT_STYLE_MODES,
+  COARSE_MARK_FLOOR,
+  COARSE_MARK_HELD_HAZARDS,
   Chrt,
   ChrtError,
   DANGER_DEPTH_LABEL_ID,
@@ -34480,6 +34540,7 @@ var Chrt = class {
   applyS101SymbolSet,
   atonIconExpression,
   bandFilterExpression,
+  bandFloorGate,
   buildAirportTierExpression,
   buildBuiltUpAreaTierExpression,
   buildFlashPattern,