@chrtco/sdk 0.10.15 → 0.10.17

package/dist/index.js

@@ -7483,6 +7483,16 @@ var S52_DRAW_ORDER = [
   // the visual-coherence fix for hard charcoal-vs-vector-blue seams at
   // scale-band boundaries — see `s52-lookup.ts`'s SEAARE entry for the
   // paired paint-spec change (fill-opacity 0 → 1, color → DEPDW).
+  //
+  // ⚠ 2026-08-23: within-band ordering alone was NOT enough. Under the
+  // band-major interleave, band-N's SEAARE painted ABOVE band-(N-1)'s
+  // DEPARE, and NOAA's named-bay SEAARE polygons outrun (and out-survive,
+  // through tile simplification) their own band's DEPARE — the live
+  // "white blobs" over Narragansett/Quincy/Hingham Bays. The style
+  // generator now hoists every band's SEAARE fill below the whole
+  // cascade (BOTTOM_STACK_WATER_BASE_CLASSES in style-generator.ts);
+  // this within-band slot remains for the label layer and as the record
+  // of the original intent.
   "SEAARE",
   "DEPARE",
   // 2a. Unsurveyed area — opaque grey wash painted ON TOP of any DEPARE
@@ -27012,11 +27022,13 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
           ["linear"],
           ["zoom"],
           10,
-          0.3,
+          0.16,
+          11,
+          0.22,
           12,
-          0.5,
+          0.3,
           13,
-          0.65,
+          0.5,
           14,
           0.9,
           16,
@@ -27027,12 +27039,45 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         layer.layout = {
           ...layer.layout,
           "icon-size": hazardIconSize,
-          "icon-allow-overlap": false,
-          "icon-optional": true,
-          // Pad each hazard's collision box so adjacent rocks don't stack
-          // visually. At z12–13 a 2 px pad roughly doubles the dedupe
-          // radius relative to the rendered icon, which is the difference
-          // between a black mass and individually-legible hazards.
+          // ── A HAZARD IS NEVER SUPPRESSED BY COLLISION ────────────────────
+          //
+          // This was `allow-overlap: false, icon-optional: true`, chosen to stop
+          // adjacent rocks stacking into a black mass — a real problem, and the
+          // reasoning above it only ever considered rock-against-rock.
+          //
+          // The same two flags also made hazards lose against EVERY other
+          // class, and the nav aids they lose to are `allow-overlap: true` and
+          // so can never lose in return. A rock beside a buoy was dropped;
+          // `icon-optional: true` means an icon that collides is simply not
+          // drawn, and a hazard symbol carries no label to fall back to, so it
+          // vanished with nothing left behind to notice. Observed at Sculpin
+          // Ledge (42°39.6'N 070°36.9'W) at Harbor scale.
+          //
+          // Which hazard wins was also decided by an accident of stack
+          // position: UWTROC sits at draw index 802, below the nav aids at
+          // ~947, while WRECKS sits at 950 above them — so rocks beat buoys and
+          // wrecks lost to them, for no reason anyone chose.
+          //
+          // Deconflicting hazards against each other stays; it just no longer
+          // runs through suppression:
+          //   - `symbol-sort-key` (below) still ranks by danger, and with
+          //     overlap allowed it now sets DRAW ORDER, so the worst hazard is
+          //     the one painted on top rather than the one that survives.
+          //   - the icon-size curve above is what keeps a dense ledge legible
+          //     at the zoomed-out end of Harbor. That is now the only thing
+          //     doing it, which is why its low end was lowered in the same
+          //     change.
+          //
+          // ⚠ `icon-ignore-placement` is deliberately LEFT AT ITS DEFAULT
+          // (false). Hazards no longer yield to anything, but they still
+          // occupy the collision index, so a label that would sit on top of a
+          // rock moves instead of covering it.
+          "icon-allow-overlap": true,
+          "icon-optional": false,
+          // Retained, with a narrower job than it had. With overlap allowed
+          // this no longer suppresses a neighbouring hazard; it pads the box
+          // hazards present to OTHER classes' placement, keeping labels off
+          // them.
           "icon-padding": 2,
           "symbol-sort-key": [
             "case",
@@ -28544,6 +28589,7 @@ function isDominanceExempt(layer) {
   return false;
 }
 var TOP_STACK_LIGHT_CLASSES = /* @__PURE__ */ new Set(["LIGHTS"]);
+var BOTTOM_STACK_WATER_BASE_CLASSES = /* @__PURE__ */ new Set(["SEAARE"]);
 function makeBandVariants(layer, B) {
   const range = BAND_PRIORITY_RANGES[B];
   const minzoom = bandVariantMinzoom(layer, B);
@@ -28743,8 +28789,13 @@ function generateStyle(palette = "DAY", opts = {}) {
       })
     });
   }
-  const regularBundles = bundles.filter((b) => !TOP_STACK_LIGHT_CLASSES.has(b.objectClass));
+  const regularBundles = bundles.filter(
+    (b) => !TOP_STACK_LIGHT_CLASSES.has(b.objectClass) && !BOTTOM_STACK_WATER_BASE_CLASSES.has(b.objectClass)
+  );
   const topLightBundles = bundles.filter((b) => TOP_STACK_LIGHT_CLASSES.has(b.objectClass));
+  const waterBaseBundles = bundles.filter(
+    (b) => BOTTOM_STACK_WATER_BASE_CLASSES.has(b.objectClass)
+  );
   if (chartCascade && chartRequestedCodes) {
     const requestedSet = new Set(chartRequestedCodes);
     const emitChartFeatureVariants = (bundleSet) => {
@@ -28772,6 +28823,7 @@ function generateStyle(palette = "DAY", opts = {}) {
         }
       }
     };
+    emitChartFeatureVariants(waterBaseBundles);
     emitChartFeatureVariants(regularBundles);
     emitChartFeatureVariants(topLightBundles);
     const chartLabelBundles = byLabelPriorityBottomUp(
@@ -28812,6 +28864,13 @@ function generateStyle(palette = "DAY", opts = {}) {
     layers.push(...labelLayers);
   } else {
     const emitBand = (base, code) => bandFan === "legacy" ? makeBandVariants(base, code) : makeCollapsedBandVariant(base, code, isDominanceExempt(base));
+    for (const code of BAND_DRAW_ORDER) {
+      for (const { featureLayers } of waterBaseBundles) {
+        for (const base of featureLayers) {
+          layers.push(...emitBand(base, code));
+        }
+      }
+    }
     for (const code of BAND_DRAW_ORDER) {
       for (const { featureLayers } of regularBundles) {
         for (const base of featureLayers) {
@@ -28855,10 +28914,12 @@ function generateStyle(palette = "DAY", opts = {}) {
   const symbolSet = opts.symbolSet ?? "s52";
   const spriteBase = `${opts.tileBaseUrl ?? "https://tiles.chrt.co"}/v1/sprites`;
   const isLndareFill = (l) => /^s52-LNDARE-fill-band\d+$/.test(l.id);
+  const isSeaareFill = (l) => /^s52-SEAARE-fill-band\d+$/.test(l.id);
   const emitted = opts.land ? (() => {
-    const fills = layers.filter(isLndareFill);
-    const rest = layers.filter((l) => !isLndareFill(l));
-    return [rest[0], ...fills, ...rest.slice(1)];
+    const lndareFills = layers.filter(isLndareFill);
+    const seaareFills = layers.filter(isSeaareFill);
+    const rest = layers.filter((l) => !isLndareFill(l) && !isSeaareFill(l));
+    return [rest[0], ...seaareFills, ...lndareFills, ...rest.slice(1)];
   })() : layers;
   const style = {
     version: 8,