@chrtco/sdk 0.10.16 → 0.10.18

package/dist/index.js

@@ -27022,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,
@@ -27037,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",
@@ -27065,6 +27100,18 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
           "icon-allow-overlap": true,
           "icon-ignore-placement": true
         };
+        const valnmrNum = ["to-number", ["coalesce", ["get", "VALNMR"], ["get", "valnmr"], 0], 0];
+        const isMajor = [">=", valnmrNum, 10];
+        const majorLayer = {
+          ...layer,
+          id: `${layer.id}-major`,
+          filter: layer.filter ? ["all", layer.filter, isMajor] : isMajor,
+          layout: { ...layer.layout },
+          minzoom: 6
+        };
+        layer.filter = layer.filter ? ["all", layer.filter, ["!", isMajor]] : ["!", isMajor];
+        layer.minzoom = scaminToMinZoom(entry?.scamin) ?? layer.minzoom;
+        layers.push(majorLayer);
       }
     } else if (resolved.layout) {
       layer.layout = resolved.layout;
@@ -28879,10 +28926,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,