@chrtco/sdk 0.10.32 → 0.10.34

package/dist/index.js

@@ -24350,6 +24350,197 @@ function buildPlaceNameLayers(sourceId) {
     make("land", PLACENAME_LAND_CLASSES, ["Open Sans Regular"], COLOR.LAND_REGION, 0.02, PLACENAME_LAND_SIZE_STOPS)
   ];
 }
+var DRGNOTE_SOURCE_LAYER = "DRGNOTE";
+var DRGNOTE_LABEL_PRIORITY = 300;
+var DRGNOTE_MINZOOM = 13;
+var DRGNOTE_FULL_ZOOM = 16;
+var DRGNOTE_MIN_TEXT_PX = 1;
+var DRGNOTE_MAX_TEXT_PX = 64;
+function legacyNoteSizePx(zoom) {
+  const z = Math.min(16, Math.max(13, zoom));
+  return 10.5 + (13 - 10.5) * (z - 13) / 3;
+}
+var DRGNOTE_FIT_ZOOM = 15;
+function dredgeNoteSize() {
+  const stops = [];
+  for (let z = 12; z <= 20; z++) {
+    const prop = z < DRGNOTE_FULL_ZOOM ? "size_s" : "size_f";
+    const fitted = ["to-number", ["get", prop], 0];
+    stops.push(z, [
+      "case",
+      [">", fitted, 0],
+      [
+        "min",
+        DRGNOTE_MAX_TEXT_PX,
+        ["max", DRGNOTE_MIN_TEXT_PX, ["*", fitted, 2 ** (z - DRGNOTE_FIT_ZOOM)]]
+      ],
+      legacyNoteSizePx(z)
+    ]);
+  }
+  return ["interpolate", ["exponential", 2], ["zoom"], ...stops];
+}
+function noteDepthText(prop, depthUnits) {
+  return depthUnits === "feet" ? ["concat", ["to-string", ["round", ["*", ["to-number", ["get", prop]], 3.28084]]], " FT"] : ["concat", ["to-string", ["get", prop]], " M"];
+}
+function buildDredgeNoteLayers(sourceId, palette = "DAY", depthUnits = "meters") {
+  const widthProp = depthUnits === "feet" ? "width_ft" : "width_m";
+  const widthUnit = depthUnits === "feet" ? " FT" : " M";
+  const titleText = [
+    "to-string",
+    ["coalesce", ["get", "designation"], ["get", "name"], ""]
+  ];
+  const placeText = ["to-string", ["coalesce", ["get", "place"], ""]];
+  const sep = (prop) => [
+    "to-string",
+    ["coalesce", ["get", prop], "\n"]
+  ];
+  const legendText = [
+    "concat",
+    noteDepthText("depth_m", depthUnits),
+    [
+      "case",
+      [">", ["to-number", ["get", "qual_m"], -1], 0],
+      [
+        "concat",
+        "  ",
+        noteDepthText("qual_m", depthUnits),
+        " ",
+        ["to-string", ["get", "qual_part"]]
+      ],
+      ""
+    ],
+    [
+      "case",
+      [">", ["to-number", ["get", widthProp], -1], 0],
+      ["concat", "  FOR A WIDTH OF ", ["to-string", ["get", widthProp]], widthUnit],
+      ""
+    ],
+    [
+      "case",
+      ["!=", ["to-string", ["get", "date"]], ""],
+      ["concat", "  ", ["to-string", ["get", "date"]]],
+      ""
+    ],
+    ["case", ["==", ["get", "unmaintained"], true], "  NOT MAINTAINED", ""]
+  ];
+  const shortField = [
+    "case",
+    ["!=", titleText, ""],
+    ["concat", titleText, sep("sep_s"), legendText],
+    legendText
+  ];
+  const fullField = [
+    "case",
+    ["!=", placeText, ""],
+    ["concat", placeText, sep("sep_fp"), titleText, sep("sep_ft"), legendText],
+    ["case", ["!=", titleText, ""], ["concat", titleText, sep("sep_ft"), legendText], legendText]
+  ];
+  const noteField = [
+    "step",
+    ["zoom"],
+    shortField,
+    DRGNOTE_FULL_ZOOM,
+    fullField
+  ];
+  const sortKey = [
+    "case",
+    [">=", ["to-number", ["get", "rank"], -1], 0],
+    ["to-number", ["get", "rank"]],
+    ["*", 1e3, ["to-number", ["get", "depth_m"], 99]]
+  ];
+  return [
+    {
+      // The `-label` suffix is how this repo marks a label layer, and
+      // z-order guards partition on it (sector-light-zorder.test.ts).
+      id: "chrt-dredge-note-label",
+      type: "symbol",
+      source: sourceId,
+      "source-layer": DRGNOTE_SOURCE_LAYER,
+      minzoom: DRGNOTE_MINZOOM,
+      layout: {
+        "text-field": noteField,
+        "text-font": ["Open Sans Regular"],
+        // Ink on the chart, not type on the screen.
+        //
+        // The size is fitted to THIS polygon at build time (px at z15) and
+        // doubled per zoom here, so the note holds a fixed GEOGRAPHIC size
+        // the way a raster chart's note is fixed to its paper. Set at one
+        // screen size instead, a note fits its channel at one zoom and
+        // spills at every other — measured at Gloucester z15, only 37% of
+        // North Channel's note lay inside North Channel.
+        //
+        // `interpolate` with base 2 and stops ONE zoom apart is exactly
+        // geometric: t = (2^(z-z1)-1)/(2^1-1) and v2 = 2*v1 collapse to
+        // v1*2^(z-z1). Writing it the obvious way instead —
+        // ["*", size, ["^", 2, ["-", ["zoom"], 15]]] — is INVALID, because
+        // ["zoom"] may only be the direct input of an outer interpolate or
+        // step. MapLibre rejects it silently, keeps the previous value and
+        // renders on as if nothing happened.
+        //
+        // It is NOT clamped to a legible band. That was tried and it
+        // defeated the point: measured across z13-z18 a clamp bound at
+        // five of six zooms for every Gloucester note, pinning the note to
+        // a fixed screen size while its channel grew. A note that keeps
+        // its proportion is illegibly small when its channel is small,
+        // and that is correct — it is how the eye tells which channel a
+        // note belongs to, and how a raster chart behaves. Zoom in and it
+        // grows with the water. A tile built before the fit carries no
+        // size and keeps the fixed size it was designed for.
+        "text-size": dredgeNoteSize(),
+        "text-transform": "uppercase",
+        "text-letter-spacing": 0.08,
+        // ONE line, and wide enough never to wrap into a second.
+        //
+        // Must equal noteFit.ts#LINE_HEIGHT_EM — the build side measures
+        // the note's height with it before deciding how large it can set.
+        "text-line-height": 1.2,
+        // Wide enough that MapLibre NEVER wraps. Every break in this note
+        // is an explicit "\n" the build side chose by fitting the result
+        // against the polygon; an automatic wrap on top of that would
+        // re-flow the label into lines nothing measured, and MapLibre's
+        // line breaker balances lines rather than filling greedily, so the
+        // build side cannot predict where it would land.
+        "text-max-width": 512,
+        "text-rotate": ["get", "rotate"],
+        "text-rotation-alignment": "map",
+        "text-padding": 3,
+        "text-allow-overlap": false,
+        "text-ignore-placement": false,
+        "text-optional": true,
+        // Placement rank from the build side (dredgeNote.ts#stationRank):
+        // shoaler water always survives a collision, bigger channel first
+        // among equal depths.
+        //
+        // Deliberately NOT labelSortKey. That helper clamps its second
+        // argument to [0, 999] — fine for a VALDCO contour value, fatal
+        // here: every rank in the millions collapsed to 999 and both notes
+        // evaluated to the identical key 300999, making the whole ranking
+        // inert. The priority prefix it adds is redundant anyway, because
+        // symbol-sort-key only orders WITHIN a layer; cross-layer order is
+        // the layer stack's job (spliceByLabelPriority). PLACENAME reads
+        // its own `rank` bare for exactly this reason.
+        //
+        // Tiles built before `rank` existed fall back to depth ordering,
+        // so they degrade to shoal-first rather than to one flat value.
+        "symbol-sort-key": sortKey
+      },
+      paint: {
+        "text-color": resolveColor("CHBLK", palette),
+        // Halo in the dredged-area fill itself, so the note reads as set
+        // INTO the channel rather than floating over it. Kept thin: the
+        // note crosses its own dashed limit and whatever soundings sit in
+        // the channel, so it needs SOME separation — but a wide halo on
+        // ~11px type erodes the glyph strokes and turns black type grey.
+        "text-halo-color": resolveColor("DEPMD", palette),
+        "text-halo-width": 1
+      },
+      metadata: {
+        "chrt:dredgeNote": true,
+        "chrt:labelPriority": DRGNOTE_LABEL_PRIORITY
+      }
+    }
+  ];
+}
 
 // src/atlas/feature-decimation.ts
 function getGridSizeForZoom(zoom) {
@@ -27620,6 +27811,22 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         metadata: { "s52:objectClass": "ACHARE", "s52:role": "boundary" }
       });
     }
+    if (objectClass === "DRGARE" && resolved.type === "fill") {
+      layers.push({
+        id: "s52-DRGARE-boundary",
+        type: "line",
+        source: sourceId,
+        "source-layer": "DRGARE",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHGRD", ct),
+          "line-width": 0.9,
+          "line-dasharray": [4, 3],
+          "line-opacity": 0.75
+        },
+        metadata: { "s52:objectClass": "DRGARE", "s52:role": "boundary" }
+      });
+    }
     if (objectClass === "ACHARE" && resolved.type === "fill") {
       layers.push({
         id: "s52-ACHARE-anchor-icon",
@@ -29695,6 +29902,17 @@ function byLabelPriorityBottomUp(bundles) {
     (a, b) => getLabelPriority(b.objectClass) - getLabelPriority(a.objectClass)
   );
 }
+function spliceByLabelPriority(labelLayers, incoming, priority) {
+  if (incoming.length === 0) return;
+  const rankOf = (l) => {
+    const meta = l.metadata;
+    const p = meta?.["chrt:labelPriority"];
+    return typeof p === "number" ? p : DEFAULT_LABEL_PRIORITY;
+  };
+  const at = labelLayers.findIndex((l) => rankOf(l) < priority);
+  if (at === -1) labelLayers.push(...incoming);
+  else labelLayers.splice(at, 0, ...incoming);
+}
 function chartModeBandClauses(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
   const parts = [bandFilterExpression(B)];
   if (!isDominanceExempt(layer)) {
@@ -29881,6 +30099,15 @@ function generateStyle(palette = "DAY", opts = {}) {
         labelLayers.push(variant);
       }
     }
+    spliceByLabelPriority(
+      labelLayers,
+      buildDredgeNoteLayers(
+        sourceId,
+        palette,
+        opts.depthUnits ?? "meters"
+      ),
+      DRGNOTE_LABEL_PRIORITY
+    );
     layers.push(...labelLayers);
   } else {
     const emitBand = (base, code) => bandFan === "legacy" ? makeBandVariants(base, code) : makeCollapsedBandVariant(base, code, isDominanceExempt(base));
@@ -29968,6 +30195,15 @@ function generateStyle(palette = "DAY", opts = {}) {
       }
     }
     if (!majorsEmitted) labelLayers.push(...majorWaterLayers);
+    spliceByLabelPriority(
+      labelLayers,
+      buildDredgeNoteLayers(
+        sourceId,
+        palette,
+        opts.depthUnits ?? "meters"
+      ),
+      DRGNOTE_LABEL_PRIORITY
+    );
     layers.push(...labelLayers);
   }
   const symbolSet = opts.symbolSet ?? "s52";