@chrtco/sdk 0.10.1 → 0.10.2

package/dist/index.cjs

@@ -27478,6 +27478,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([
@@ -27629,7 +27657,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???"],
@@ -27654,6 +27682,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`,
@@ -27683,18 +27721,50 @@ 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;
@@ -27710,6 +27780,7 @@ function generateStyle(palette = "DAY", opts = {}) {
   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) {
@@ -27763,6 +27834,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);
@@ -27785,7 +27862,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) {
@@ -27804,7 +27880,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(
@@ -27813,6 +27889,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));
       }