@chrtco/sdk 0.10.0 → 0.10.2

package/dist/index.d.cts

@@ -2600,20 +2600,37 @@ declare function worldMinusBboxPolygon(bbox: BBox): GeoJSON.Polygon;
  * `band-collapse.test.ts` re-proves it on every CI run by differentially
  * evaluating legacy-vs-collapsed through MapLibre's real three gates.
  *
- * **Scope.** This is axis 1 ONLY: the per-band layers survive, with identical
- * ids and identical positions, so the band-major draw order is untouched.
- * "Axis 2" (collapsing the per-band copies into one layer per class) was
- * evaluated and **KILLED** — it is unsound for the opaque-fill classes
+ * **Scope.** For FEATURE layers (fills, lines, feature symbols) this is
+ * axis 1 ONLY: the per-band layers survive, with identical ids and identical
+ * positions, so the band-major draw order is untouched. "Axis 2" (collapsing
+ * the per-band copies into one layer per class) was evaluated and **KILLED**
+ * for feature layers — it is unsound for the opaque-fill classes
  * (`DOMINANCE_EXEMPT_FILL_CLASSES` ≡ `OPAQUE_FILL_LAYERS`), where band-major
  * order is the ONLY thing separating the bands, and 15/15 class pairs are
- * provably unsatisfiable with one layer each. Do not reintroduce it.
+ * provably unsatisfiable with one layer each. Do not reintroduce it there.
  * Evidence: `.chrt/perf/2026-07-14-p8-d4-spike.md`.
  *
- * **Load-bearing invariant.** The collapsed layer MUST keep the `-band{B}`
- * id segment: `custom-style.ts` `bandFloor()` parses `/-band(\d)/` to clamp
- * customer minzoom/scamin overrides to the band's data floor, on the live
- * public Style API path. Renaming the id silently unclamps those overrides.
- * Asserted in `band-collapse.test.ts`.
+ * LABEL layers are different (CHRTsail #121 — MapLibre Native iOS silently
+ * collapses its whole render pass above 482 symbol layers, and the served
+ * style carried 575): `makeCollapsedCrossBandLabel` folds a label's ×6 band
+ * fan into ONE layer per class, and `collapsedOrientationGate` folds the
+ * orientation fan's per-dominator variants into its per-cell layers. That is
+ * NOT the killed axis 2, because what the fill argument protects — paint
+ * order as the sole band separator — does not apply to labels: their
+ * load-bearing order is the cross-class P4 priority ladder (each class keeps
+ * exactly one layer in its ladder slot), and within-class placement priority
+ * rides the `rank*1000 + within-key` symbol-sort-key that labels.ts
+ * documents as designed to survive precisely this merge.
+ *
+ * **Load-bearing invariant.** A collapsed per-band FEATURE layer MUST keep
+ * the `-band{B}` id segment: `custom-style.ts` `bandFloor()` parses
+ * `/-band(\d)/` to clamp customer minzoom/scamin overrides to the band's
+ * data floor, on the live public Style API path. Renaming the id silently
+ * unclamps those overrides. Cross-band LABEL layers are the deliberate
+ * exception: they carry every band floor INSIDE the filter (tile-zoom
+ * clauses a customer override cannot touch), which supersedes the clamp —
+ * `bandFloor()` returning 0 for a bare label id is correct, not a gap.
+ * Both halves asserted in `band-collapse.test.ts`.
  */
 
 /**

package/dist/index.d.ts

@@ -2600,20 +2600,37 @@ declare function worldMinusBboxPolygon(bbox: BBox): GeoJSON.Polygon;
  * `band-collapse.test.ts` re-proves it on every CI run by differentially
  * evaluating legacy-vs-collapsed through MapLibre's real three gates.
  *
- * **Scope.** This is axis 1 ONLY: the per-band layers survive, with identical
- * ids and identical positions, so the band-major draw order is untouched.
- * "Axis 2" (collapsing the per-band copies into one layer per class) was
- * evaluated and **KILLED** — it is unsound for the opaque-fill classes
+ * **Scope.** For FEATURE layers (fills, lines, feature symbols) this is
+ * axis 1 ONLY: the per-band layers survive, with identical ids and identical
+ * positions, so the band-major draw order is untouched. "Axis 2" (collapsing
+ * the per-band copies into one layer per class) was evaluated and **KILLED**
+ * for feature layers — it is unsound for the opaque-fill classes
  * (`DOMINANCE_EXEMPT_FILL_CLASSES` ≡ `OPAQUE_FILL_LAYERS`), where band-major
  * order is the ONLY thing separating the bands, and 15/15 class pairs are
- * provably unsatisfiable with one layer each. Do not reintroduce it.
+ * provably unsatisfiable with one layer each. Do not reintroduce it there.
  * Evidence: `.chrt/perf/2026-07-14-p8-d4-spike.md`.
  *
- * **Load-bearing invariant.** The collapsed layer MUST keep the `-band{B}`
- * id segment: `custom-style.ts` `bandFloor()` parses `/-band(\d)/` to clamp
- * customer minzoom/scamin overrides to the band's data floor, on the live
- * public Style API path. Renaming the id silently unclamps those overrides.
- * Asserted in `band-collapse.test.ts`.
+ * LABEL layers are different (CHRTsail #121 — MapLibre Native iOS silently
+ * collapses its whole render pass above 482 symbol layers, and the served
+ * style carried 575): `makeCollapsedCrossBandLabel` folds a label's ×6 band
+ * fan into ONE layer per class, and `collapsedOrientationGate` folds the
+ * orientation fan's per-dominator variants into its per-cell layers. That is
+ * NOT the killed axis 2, because what the fill argument protects — paint
+ * order as the sole band separator — does not apply to labels: their
+ * load-bearing order is the cross-class P4 priority ladder (each class keeps
+ * exactly one layer in its ladder slot), and within-class placement priority
+ * rides the `rank*1000 + within-key` symbol-sort-key that labels.ts
+ * documents as designed to survive precisely this merge.
+ *
+ * **Load-bearing invariant.** A collapsed per-band FEATURE layer MUST keep
+ * the `-band{B}` id segment: `custom-style.ts` `bandFloor()` parses
+ * `/-band(\d)/` to clamp customer minzoom/scamin overrides to the band's
+ * data floor, on the live public Style API path. Renaming the id silently
+ * unclamps those overrides. Cross-band LABEL layers are the deliberate
+ * exception: they carry every band floor INSIDE the filter (tile-zoom
+ * clauses a customer override cannot touch), which supersedes the clamp —
+ * `bandFloor()` returning 0 for a bare label id is correct, not a gap.
+ * Both halves asserted in `band-collapse.test.ts`.
  */
 
 /**

package/dist/index.js

@@ -22224,7 +22224,7 @@ function getLabelConfig(layerName, opts = {}) {
         screenColors.deeper
       ] : screenColors.shoaler;
       const haloColor = screenColors.halo;
-      const fontStack = weight === "semibold" ? ["Open Sans Semibold", "Open Sans Regular"] : ["Open Sans Regular"];
+      const fontStack = weight === "semibold" ? ["Open Sans Semibold"] : ["Open Sans Regular"];
       return {
         type: "symbol",
         // Property name varies by source path:
@@ -27282,6 +27282,34 @@ function makeCollapsedBandVariant(layer, B, isExempt) {
   delete collapsed.maxzoom;
   return [collapsed];
 }
+function collapsedOrientationGate(minzoom) {
+  const clauses = [NOT_DOMINATED_FILTER];
+  for (const D of BAND_DRAW_ORDER) {
+    const dMaxzoom = dominatedVariantMaxzoom(D);
+    if (dMaxzoom <= minzoom) continue;
+    clauses.push(["all", dominatedByMinFilter(D), ["<", ["zoom"], dMaxzoom]]);
+  }
+  return ["any", ...clauses];
+}
+function makeCollapsedCrossBandLabel(label, isExempt) {
+  const classMinzoom = label.minzoom ?? 0;
+  const clauses = [];
+  for (const B of BAND_DRAW_ORDER) {
+    const floor = BAND_PRIORITY_RANGES[B].minzoom;
+    const parts = [bandFilterExpression(B)];
+    if (floor > 0) parts.push([">=", ["zoom"], floor]);
+    if (!isExempt) {
+      parts.push(collapsedDominanceGate(B, Math.max(classMinzoom, floor)));
+    }
+    clauses.push(parts.length === 1 ? parts[0] : ["all", ...parts]);
+  }
+  const collapsed = {
+    ...label,
+    filter: combineWithBandFilter(label.filter, ["any", ...clauses])
+  };
+  delete collapsed.maxzoom;
+  return collapsed;
+}
 
 // src/atlas/style-generator.ts
 var META_LAYERS = /* @__PURE__ */ new Set([
@@ -27433,7 +27461,7 @@ var CELL_BAND_OPACITY_CURVE = {
   "5": [[11, 0.6], [13, 0.35], [18, 0.25]],
   "6": [[13, 0.75], [16, 0.55], [22, 0.45]]
 };
-function fanOrientationLabelByCellBand(label) {
+function fanOrientationLabelByCellBand(label, bandFan) {
   const cellBandExpr = [
     "slice",
     ["coalesce", ["get", "_cell_id"], "??9???"],
@@ -27458,6 +27486,16 @@ function fanOrientationLabelByCellBand(label) {
       ...label.paint ?? {},
       "text-opacity": opacityExpr
     };
+    if (bandFan === "collapsed") {
+      variants.push({
+        ...label,
+        id: `${label.id}-cell${code}-notdom`,
+        filter: combineWithBandFilter(cellFiltered, collapsedOrientationGate(minzoom)),
+        minzoom,
+        paint
+      });
+      continue;
+    }
     variants.push({
       ...label,
       id: `${label.id}-cell${code}-notdom`,
@@ -27487,26 +27525,66 @@ function byLabelPriorityBottomUp(bundles) {
     (a, b) => getLabelPriority(b.objectClass) - getLabelPriority(a.objectClass)
   );
 }
-function chartModeFilterForBand(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
-  let filter = combineWithBandFilter(layer.filter, bandFilterExpression(B));
+function chartModeBandClauses(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
+  const parts = [bandFilterExpression(B)];
   if (!isDominanceExempt(layer)) {
     for (const D of higherCascadeBands) {
-      filter = combineWithBandFilter(filter, ["!", dominatedByMinFilter(D)]);
+      parts.push(["!", dominatedByMinFilter(D)]);
     }
   }
   if (lockedBounds && isRequestedBand) {
-    filter = combineWithBandFilter(filter, withinBboxFilter(lockedBounds));
+    parts.push(withinBboxFilter(lockedBounds));
+  }
+  return parts;
+}
+function chartModeFilterForBand(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
+  const [first, ...rest] = chartModeBandClauses(
+    layer,
+    B,
+    higherCascadeBands,
+    lockedBounds,
+    isRequestedBand
+  );
+  let filter = combineWithBandFilter(layer.filter, first);
+  for (const part of rest) {
+    filter = combineWithBandFilter(filter, part);
   }
   return filter;
 }
+function makeCollapsedChartLabel(label, cascade, requestedSet, lockedBounds) {
+  const clauses = cascade.map((B, i) => {
+    const parts = chartModeBandClauses(
+      label,
+      B,
+      cascade.slice(i + 1),
+      lockedBounds,
+      requestedSet.has(B)
+    );
+    return parts.length === 1 ? parts[0] : ["all", ...parts];
+  });
+  const collapsed = {
+    ...label,
+    filter: combineWithBandFilter(label.filter, ["any", ...clauses])
+  };
+  delete collapsed.maxzoom;
+  return collapsed;
+}
 function generateStyle(palette = "DAY", opts = {}) {
   const sources = buildSources(opts);
   const sourceId = opts.region ?? DEFAULT_REGION;
   const orderedClasses = getOrderedClasses();
-  const layers = [];
+  const backgroundLayer = {
+    id: "chrt-background",
+    type: "background",
+    // A background layer takes no source; StyleLayer models sourced layers,
+    // so the never-used source fields are absent via the unknown hop.
+    paint: { "background-color": resolveColor("NODTA", palette) }
+  };
+  const layers = [backgroundLayer];
   const labelLayers = [];
   const chartCascade = opts.chartMode ? CHART_CASCADE_CODES[opts.chartMode.band] : null;
   const chartRequestedCodes = opts.chartMode ? CHART_BAND_CODES[opts.chartMode.band] : null;
+  const bandFan = opts.bandFan ?? "collapsed";
   const lockedBounds = opts.chartMode?.lockedBounds;
   const bundles = [];
   for (const objectClass of orderedClasses) {
@@ -27560,6 +27638,12 @@ function generateStyle(palette = "DAY", opts = {}) {
       )
     );
     for (const { label } of chartLabelBundles) {
+      if (bandFan === "collapsed") {
+        labelLayers.push(
+          makeCollapsedChartLabel(label, chartCascade, requestedSet, lockedBounds)
+        );
+        continue;
+      }
       for (let i = 0; i < chartCascade.length; i++) {
         const B = chartCascade[i];
         const higher = chartCascade.slice(i + 1);
@@ -27582,7 +27666,6 @@ function generateStyle(palette = "DAY", opts = {}) {
     }
     layers.push(...labelLayers);
   } else {
-    const bandFan = opts.bandFan ?? "collapsed";
     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 regularBundles) {
@@ -27601,7 +27684,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     for (const { objectClass, label } of bundles) {
       if (!label) continue;
       if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-        labelLayers.push(...fanOrientationLabelByCellBand(label));
+        labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan));
       }
     }
     const featureLabelBundles = byLabelPriorityBottomUp(
@@ -27610,6 +27693,10 @@ function generateStyle(palette = "DAY", opts = {}) {
       )
     );
     for (const { label } of featureLabelBundles) {
+      if (bandFan === "collapsed") {
+        labelLayers.push(makeCollapsedCrossBandLabel(label, isDominanceExempt(label)));
+        continue;
+      }
       for (const code of BAND_DRAW_ORDER) {
         labelLayers.push(...emitBand(label, code));
       }
@@ -27617,6 +27704,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     layers.push(...labelLayers);
   }
   const symbolSet = opts.symbolSet ?? "s52";
+  const spriteBase = `${opts.tileBaseUrl ?? "https://tiles.chrt.co"}/v1/sprites`;
   const style = {
     version: 8,
     name: `CHRT ${SYMBOL_SET_LABELS[symbolSet]} ${PALETTE_NAMES[palette]}${opts.chartMode ? ` \u2014 chart:${opts.chartMode.band}` : ""}`,
@@ -27630,13 +27718,21 @@ function generateStyle(palette = "DAY", opts = {}) {
       "chrt:description": "IHO S-52 portrayal rules for Electronic Navigational Charts (ENCs). Generated from the CHRT atlas engine."
     },
     sources,
-    // TODO(Phase 9): the superadmin style-generator emits a reference JSON
-    // intended for external upload to Mapbox Studio. That flow is vestigial —
-    // we're decommissioning Mapbox MTS. When the page is repurposed to
-    // generate a MapLibre-native style for self-hosted consumers, wire the
-    // `sprite` field back in against a CHRT-hosted sprite route (see
-    // `.chrt/` follow-ups). Runtime maps load S-52 symbols via
-    // `loadS52SymbolImages()` — no sprite fetch happens at runtime.
+    // A standard GL sprite, declared in the style — the mechanism every GL
+    // renderer (JS and native) already implements. The web app additionally
+    // registers atlas images at runtime via loadS52SymbolImages() (which wins
+    // when both are present, so JS behavior is unchanged); native consumers
+    // get their icons from this declaration alone. s52 sheets are per-palette
+    // (the artwork carries S-52 colour tokens); chrt and raster are
+    // fixed-palette, one sheet each. s101 deliberately declares NO sprite
+    // until the vendored S-100 artwork clears licence review — see
+    // assets/s101/PROVENANCE.md. CHRTsail #122.
+    // Every non-s101 family is palette-scoped: chrt and raster keep fixed
+    // palettes for their OWN glyphs, but both fall back to s52 artwork for
+    // classes they don't remap — and that artwork carries colour tokens.
+    ...symbolSet !== "s101" && {
+      sprite: `${spriteBase}/${symbolSet}-${palette.toLowerCase()}`
+    },
     glyphs: "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
     layers
   };