@chrtco/sdk 0.10.19 → 0.10.20

package/dist/index.js

@@ -366,8 +366,8 @@ var RELIEF_REGION = "CHRT_RELIEF";
 var BASE_REGION = "CHRT_BASE";
 var BASE_MINZOOM = 0;
 var BASE_MAXZOOM = 11;
-var RELIEF_MINZOOM = 8;
-var RELIEF_MAXZOOM = 11;
+var RELIEF_MINZOOM = 9;
+var RELIEF_MAXZOOM = 12;
 var RELIEF_TILE_SIZE = 512;
 var BUILD_PARAM = "v";
 function tileTemplate(base, region, extension, buildId) {
@@ -22829,14 +22829,19 @@ var ORIENTATION_BAND_SORT_KEY = [
   ["slice", ["coalesce", ["get", "_cell_id"], "??9???"], 2, 3],
   9
 ];
-function orientationLabelLayout(extras = {}) {
+function orientationSortKey(tier) {
+  const band = ["*", 100, ORIENTATION_BAND_SORT_KEY];
+  if (!tier) return band;
+  return ["+", band, tier];
+}
+function orientationLabelLayout(extras = {}, tier) {
   return {
     "text-anchor": "center",
     "text-allow-overlap": false,
     "text-ignore-placement": false,
     "text-optional": true,
     "text-padding": 15,
-    "symbol-sort-key": ORIENTATION_BAND_SORT_KEY,
+    "symbol-sort-key": orientationSortKey(tier),
     ...extras
   };
 }
@@ -22846,15 +22851,17 @@ function tieredSizeCurve(tierExpr, stops) {
     if (i > 0) {
       const [pz, pv] = stops[i - 1];
       const [nz, nv] = stops[i];
-      if (pv.some((v, t) => v === 0 && nv[t] > 0)) {
+      if (pv.some((v, t) => v === 0 && nv[t] > 0 || v > 0 && nv[t] === 0)) {
         const hz = Math.round((nz - 0.2) * 10) / 10;
         if (hz > pz) {
           const f = (hz - pz) / (nz - pz);
           withHolds.push([
             hz,
-            pv.map(
-              (v, t) => v === 0 && nv[t] > 0 ? 0 : Math.round((v + (nv[t] - v) * f) * 10) / 10
-            )
+            pv.map((v, t) => {
+              if (v === 0 && nv[t] > 0) return 0;
+              if (v > 0 && nv[t] === 0) return v;
+              return Math.round((v + (nv[t] - v) * f) * 10) / 10;
+            })
           ]);
         }
       }
@@ -22883,6 +22890,19 @@ var ORIENTATION_HALO_WIDTH = [
   16,
   0.7
 ];
+var LAND_HALO_WIDTH = [
+  "interpolate",
+  ["linear"],
+  ["zoom"],
+  8,
+  1.6,
+  11,
+  1.7,
+  14,
+  1.8,
+  16,
+  1.8
+];
 var LABEL_BEHAVIOR = {
   // Orientation labels — render once across all bands.
   SEAARE: "orientation-cross-band",
@@ -22956,6 +22976,9 @@ var LABEL_PRIORITY = {
 };
 var DEFAULT_LABEL_PRIORITY = 450;
 var ORIENTATION_LABEL_PRIORITY = 900;
+var MAJOR_WATER_TIER_MAX = 3;
+var MAJOR_WATER_LABEL_PRIORITY = 280;
+var ISLAND_LABEL_HOIST_MINZOOM = 12;
 function getLabelPriority(layerName) {
   if (getLabelBehavior(layerName) === "orientation-cross-band") {
     return ORIENTATION_LABEL_PRIORITY;
@@ -23128,21 +23151,25 @@ function getLabelConfig(layerName, opts = {}) {
         // LNDRGN labels until coastal zoom. The Carto basemap already labels
         // major land regions at z5-z6. Columns: t1 major region, t2 local
         // point (also the default).
+        // Tier 2 (local point: "Bird Island", "Cottage Park") gets the same
+        // lift as LNDARE's small islands — it is the other half of "show me
+        // what this land is". Tier 1 is unchanged.
         textSize: tieredSizeCurve(tierExpr, [
           [5, [0, 0]],
           [7, [11, 0]],
           [9, [12, 0]],
-          [11, [12, 9]],
-          [13, [11, 11]],
-          [16, [10, 10]]
+          [11, [12, 10]],
+          [13, [11.5, 11.5]],
+          [16, [10.5, 11.5]]
         ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.LAND_REGION,
-        textHaloWidth: ORIENTATION_HALO_WIDTH,
+        // Land halo, not the shared taper — see LAND_HALO_WIDTH.
+        textHaloWidth: LAND_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
         minzoom: 5,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "LNDMRK":
@@ -23307,14 +23334,56 @@ function getLabelConfig(layerName, opts = {}) {
         // at approach scale (z9) when the user has zoomed in enough that
         // individual banks are useful context. Columns: t1 ocean, t2 sea/gulf,
         // t3 bay/sound, t4 anchorage, default.
+        // ── The zoom ladder (owner, 2026-08-31) ────────────────────────────
+        //
+        // "When zoomed in I want water area labels (Nubble Channel etc.); as
+        // I zoom out, the major stuff."
+        //
+        // The old curve gave EVERY tier a size at z9-z11, and the field that
+        // produced is the defect. Rendered in isolation at Boston z10.4
+        // (prod 48404b1d): ten copies of "North Atlantic Ocean" scattered
+        // across the harbour, a dozen ledges and shoals — Finns, Boston,
+        // Thieves, Ultonia, Harding, Tinkers, Dread, Newcomb, Three and
+        // One-Half Fathom — and, competing with all of them for the same
+        // pixels, the bays the user actually needs: Broad Sound, Dorchester,
+        // Quincy, Hull, Hingham, President Roads. Nothing was missing. The
+        // majors simply had no better claim on the space than a ledge did.
+        //
+        // So the ladder now steps tiers OUT as well as in:
+        //
+        //   t1 ocean       overview only — gone by z11. "North Atlantic
+        //                  Ocean" inside Boston Harbor is noise, not context.
+        //   t2 sea/gulf    through approach — gone by z13.
+        //   t3 bay/sound   the spine: visible z5 through z16, peaking where
+        //                  a bay IS the answer to "where am I".
+        //   t4 anchorage   harbour detail, z13+ (unchanged).
+        //   t5 default     channels, coves, ledges. Floor UNCHANGED at z9 —
+        //                  and deliberately so. "Nubble Channel" is already
+        //                  a z11 feature without touching this curve: NOAA
+        //                  encodes it only in band-5 cells (US5BOSCD ×2,
+        //                  US5BOSCE), band-5 features first exist in tiles at
+        //                  z11, and the cell-band fan floors their label
+        //                  variant at z11 too. The owner's "channels/coves at
+        //                  z11+" is therefore satisfied by the DATA, and
+        //                  moving this floor would only have cost the
+        //                  offshore relief its approach-zoom entry (Georges
+        //                  Bank, Hudson Canyon — the population this tier was
+        //                  built for, pinned by seaare-tier.test.ts).
+        //
+        // What crowds the bays at z10 is fixed by RANK, not by floors:
+        // `orientationSortKey` now places tier 3 ahead of tier 5 inside a
+        // band, and the padding ladder below thins the field so that
+        // ordering decides the survivors.
+        //
+        // Columns: t1 ocean, t2 sea/gulf, t3 bay/sound, t4 anchorage, default.
         textSize: tieredSizeCurve(tierExpr, [
           [3, [14, 8, 0, 0, 0]],
           [5, [16, 13, 9, 0, 0]],
           [7, [14, 14, 12, 0, 0]],
-          [9, [12, 13, 14, 0, 9]],
-          [11, [10, 12, 13, 0, 11]],
-          [13, [9, 11, 12, 10, 11]],
-          [16, [9, 10, 11, 11, 10]]
+          [9, [11, 13, 14, 0, 9]],
+          [11, [0, 11, 14, 0, 11]],
+          [13, [0, 0, 13, 10, 11]],
+          [16, [0, 0, 12, 11, 10]]
         ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER_DEEP,
@@ -23338,8 +23407,41 @@ function getLabelConfig(layerName, opts = {}) {
           // the tiles and replaces this fan outright — do not restore
           // always-paint on a starvation report; flip `labels: "placename"`
           // instead once the build carries the layer.
-          "text-padding": 2
-        })
+          //
+          // ── The padding is the zoom LADDER (owner, 2026-08-31) ───────────
+          //
+          // "When zoomed in I want water area labels (Nubble Channel etc.);
+          // as I zoom out, the major stuff."
+          //
+          // A flat 2 px moat gives every name in view the same claim on the
+          // space, so at z10 all 34 band-4 names in one Boston tile compete
+          // as peers and the result reads as clutter rather than as
+          // orientation. Widening the moat as the user zooms OUT thins that
+          // field by collision alone: with a 20 px moat only a few names
+          // survive per screen, and `orientationSortKey` decides which —
+          // lowest band first, then lowest class tier, i.e. the bays and
+          // sounds. Narrowing it back to 2 px by z13 restores exactly
+          // today's harbour behaviour, where the channels and coves should
+          // all be readable.
+          //
+          // Same mechanism (and the same lesson) as the lake-label grid:
+          // a flat padding let six copies of "Lake Ontario" crowd z8.9.
+          // Nothing is filtered and no name is invented — the ladder is
+          // entirely a collision-space decision.
+          "text-padding": [
+            "interpolate",
+            ["linear"],
+            ["zoom"],
+            5,
+            20,
+            9,
+            14,
+            11,
+            8,
+            13,
+            2
+          ]
+        }, tierExpr)
       };
     }
     case "LAKARE": {
@@ -23360,7 +23462,7 @@ function getLabelConfig(layerName, opts = {}) {
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 7,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "RIVERS": {
@@ -23381,7 +23483,7 @@ function getLabelConfig(layerName, opts = {}) {
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 7,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "CANALS":
@@ -23412,21 +23514,31 @@ function getLabelConfig(layerName, opts = {}) {
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
+        // Tier 2 is the SMALL island — the one the owner cannot identify.
+        // Its old curve peaked at 10 px and fell to 10 px, i.e. it never got
+        // its own scale: a name that only exists because you zoomed in was
+        // rendered at the size used for ambient context. It now grows through
+        // harbour zoom (10 → 11.5) while tier 1, the major island already
+        // legible from coastal zoom, is left almost where it was. Small
+        // absolute numbers on purpose: the ask was "clear", not "large" —
+        // the legibility comes mostly from LAND_HALO_WIDTH and the opacity
+        // scale, both of which cost no extra footprint.
         textSize: tieredSizeCurve(tierExpr, [
           [5, [8, 0]],
           [7, [10, 0]],
           [9, [11, 0]],
-          [11, [11, 9]],
-          [13, [10, 10]],
-          [16, [9, 10]]
+          [11, [11.5, 10]],
+          [13, [11.5, 11.5]],
+          [16, [10.5, 11.5]]
         ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.LAND_NATURAL,
-        textHaloWidth: ORIENTATION_HALO_WIDTH,
+        // Land halo, not the shared taper — see LAND_HALO_WIDTH.
+        textHaloWidth: LAND_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
         minzoom: 5,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "BUAARE": {
@@ -23451,7 +23563,7 @@ function getLabelConfig(layerName, opts = {}) {
         minzoom: 3,
         layout: orientationLabelLayout({
           "text-letter-spacing": 0.05
-        })
+        }, tierExpr)
       };
     }
     case "BRIDGE":
@@ -23543,7 +23655,7 @@ function getLabelConfig(layerName, opts = {}) {
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
         minzoom: 7,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "SBDARE":
@@ -28381,8 +28493,7 @@ function worldMinusBboxPolygon(bbox) {
 
 // src/atlas/land-layers.ts
 var LAND_SURFACE_MINZOOM = BAND_PRIORITY_RANGES["5"].minzoom;
-var RELIEF_MINZOOM2 = 10;
-var LAND_SURFACE_LAYERS = (id) => id === "chrtland-base" || id === "chrtland-cover" || id === "chrtland-contour" || id.startsWith("chrtland-fade-");
+var LAND_SURFACE_LAYERS = (id) => id === "chrtland-base" || id === "chrtland-cover" || id === "chrtland-contour" || id === "chrtland-hillshade" || id.startsWith("chrtland-fade-");
 var FADE_PX = 80;
 var FADE_BANDS = 16;
 function fadeAlpha(r) {
@@ -28501,10 +28612,11 @@ function landLayers(opts = {}) {
   }));
   if (opts.relief) {
     layers.push(L({
+      // No minzoom here: LAND_SURFACE_LAYERS floors it with the rest of the
+      // surface, so the two can never drift apart again.
       id: "chrtland-hillshade",
       type: "hillshade",
       source: demSrc,
-      minzoom: RELIEF_MINZOOM2,
       paint: {
         "hillshade-exaggeration": T.exaggeration,
         "hillshade-shadow-color": T.shadow,
@@ -28881,12 +28993,38 @@ function baseInlandWaterLayers(opts = {}) {
   const T = BASE_THEMES[palette] ?? BASE_THEMES.DAY;
   const src = opts.sourceId ?? BASE_REGION;
   const L = (o) => o;
+  const NE_TIER = ["!", ["has", "kind"]];
+  const PLANET_TIER = ["has", "kind"];
+  const HANDOVER = 9;
   return [
+    // ── The fill pair, SPLIT BY TIER at the handover ────────────────────────
+    //
+    // Both tiers share `inland_water` (tile-join concatenates the same layer
+    // name), and an unsplit fill draws BOTH — which means the NE polygon is
+    // painted over the planet one at every zoom. That is not a cosmetic
+    // double-draw: NE 10m carries no interior rings, so its blob has no
+    // ISLANDS in it, and painting it over the planet's holed polygons buries
+    // every island in the lake under "uncharted water". Owner-reported at
+    // Winnipesaukee z11.7 ("there is land (and islands) being covered by the
+    // 'no chart here' boundary"), and measured: rendering the planet tier
+    // alone brings back the whole archipelago — Rattlesnake, Bear, Long
+    // Island, Diamond, the Barndoors — while the NE tier alone is a faceted
+    // blob whose edges bear no relation to the shoreline drawn beneath it.
+    //
+    // So each tier owns its own zoom range, the same handover the shoreline
+    // below uses. Known residue, measured over the whole archive: of the 141
+    // NE lakes we still carry, 138 have planet water beneath them; the
+    // exceptions are two unnamed western-Alaska tundra lakes and a 2e-5 deg²
+    // Lake Michigan sliver, which lose their rough fill above z9 because the
+    // planet has no `water` polygon there at all (checked against the raw
+    // pre-clip NDJSON — not a clip artefact).
     L({
       id: "chrtbase-inland-water",
       type: "fill",
       source: src,
       "source-layer": "inland_water",
+      filter: NE_TIER,
+      maxzoom: HANDOVER,
       paint: { "fill-color": T.inlandWater }
     }),
     L({
@@ -28894,6 +29032,26 @@ function baseInlandWaterLayers(opts = {}) {
       type: "fill",
       source: src,
       "source-layer": "inland_water",
+      filter: NE_TIER,
+      maxzoom: HANDOVER,
+      paint: { "fill-pattern": UNCHARTED_PATTERN, "fill-opacity": 0.7 }
+    }),
+    L({
+      id: "chrtbase-inland-water-detail",
+      type: "fill",
+      source: src,
+      "source-layer": "inland_water",
+      filter: PLANET_TIER,
+      minzoom: HANDOVER,
+      paint: { "fill-color": T.inlandWater }
+    }),
+    L({
+      id: "chrtbase-inland-hatch-detail",
+      type: "fill",
+      source: src,
+      "source-layer": "inland_water",
+      filter: PLANET_TIER,
+      minzoom: HANDOVER,
       paint: { "fill-pattern": UNCHARTED_PATTERN, "fill-opacity": 0.7 }
     }),
     // The rough shoreline (owner ask 2026-08-28). Drawn ABOVE the hatch so
@@ -28913,13 +29071,47 @@ function baseInlandWaterLayers(opts = {}) {
       type: "line",
       source: src,
       "source-layer": "inland_water",
-      filter: ["!", ["has", "kind"]],
+      filter: NE_TIER,
+      // Hands the shoreline over to the planet tier at ITS floor. Both
+      // tiers live in `inland_water` from z9 up (tile-join concatenates the
+      // same layer name), and their FILLS merge invisibly — but two
+      // outlines do not: NE 10m generalises Winnipesaukee's shape, so its
+      // outline ran straight across the middle of the lake the planet had
+      // drawn correctly around. The coarse line is right only while it is
+      // the only shape we have.
+      maxzoom: HANDOVER,
       paint: {
         "line-color": T.inlandShore,
         "line-width": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 1.1, 14, 1.6],
         "line-opacity": 0.9
       }
     }),
+    // The PLANET tier's shoreline (owner ask 2026-08-31: "uncharted small
+    // lakes render with no outline"). It reads its own `inland_shore` layer,
+    // NOT `inland_water`, and that indirection is the whole fix: the mesh
+    // that forced the `!has kind` fence above is a CLIP artefact — an MVT
+    // feature arrives already cut to its own z10 tile, so stroking the
+    // polygon strokes every tile boundary it crosses. The build now walks
+    // those rings, drops the axis-aligned runs that sit on the read zoom's
+    // tile grid, and emits what is left as lines (measured on one New
+    // England chunk: 61 long axis-aligned mesh edges → 5, and the 5 survivors
+    // are 0.02–0.5 tiles off the grid, i.e. real straight water edges).
+    //
+    // Thinner and quieter than the NE line: this is finer geometry describing
+    // water nobody has surveyed, and approximate data should look
+    // approximate.
+    L({
+      id: "chrtbase-inland-shore-detail",
+      type: "line",
+      source: src,
+      "source-layer": "inland_shore",
+      minzoom: HANDOVER,
+      paint: {
+        "line-color": T.inlandShore,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 9, 0.5, 12, 0.9, 15, 1.2],
+        "line-opacity": 0.85
+      }
+    }),
     // The lake's name (owner ask 2026-08-28) — the second scoped exception
     // to no-names-on-the-basemap, after the states: WATER-BODY names only.
     // No maxzoom: an uncharted lake keeps its name at every zoom; over
@@ -28936,6 +29128,47 @@ function baseInlandWaterLayers(opts = {}) {
     // deterministic anchor GRID into big lakes — the paper-chart convention
     // of repeating a name along a large water body — and this one layer
     // renders however many anchors are in view; collision culls the rest.
+    // Planet-tier water-body NAMES (owner ask 2026-08-31: NE 10m names only
+    // 113 US lakes). Emitted BELOW the NE layer on purpose — MapLibre places
+    // symbols topmost-layer-first, so the big NE lake wins collision against
+    // the pond beside it, and both lose to the chart's own labels (every ENC
+    // class is emitted after this pair).
+    //
+    // The size threshold is OSM's own `min_zoom`, carried through the build:
+    // Lake Winnipesaukee reads 10, Squam Lake 12, so a pond simply is not in
+    // the filter until the user is close enough for it to be the answer to
+    // "what is that water". `["zoom"]` in a filter evaluates at integer zoom
+    // levels and removes the feature from placement entirely — verified
+    // against maplibre-gl-native rather than assumed, because a text-size-0
+    // gate would still claim a collision slot.
+    //
+    // The tiers are separate LAYERS, not a filtered split of one — see the
+    // builder for why: an archive that a not-yet-deployed style would
+    // mis-render cannot be promoted first, and this one has to be.
+    L({
+      id: "chrtbase-inland-label-detail",
+      type: "symbol",
+      source: src,
+      "source-layer": "inland_water_label_detail",
+      minzoom: HANDOVER,
+      filter: [">=", ["zoom"], ["get", "min_zoom"]],
+      layout: {
+        "text-field": ["get", "name"],
+        "text-font": ["Open Sans Regular"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 9, 9, 12, 10.5, 15, 11],
+        "text-max-width": 8,
+        "text-allow-overlap": false,
+        "text-padding": 6,
+        // Bigger water first within the tier — min_zoom IS the size rank.
+        "symbol-sort-key": ["get", "min_zoom"]
+      },
+      paint: {
+        "text-color": T.inlandLabel,
+        "text-halo-color": T.inlandHalo,
+        "text-halo-width": 1,
+        "text-opacity": 0.9
+      }
+    }),
     L({
       id: "chrtbase-inland-label",
       type: "symbol",
@@ -29167,14 +29400,21 @@ function makeBandVariants(layer, B) {
   return variants;
 }
 var CELL_BAND_OPACITY_CURVE = {
-  "1": [[3, 0.5], [5, 0.3], [16, 0.15]],
-  "2": [[5, 0.5], [7, 0.3], [16, 0.15]],
-  "3": [[7, 0.55], [9, 0.35], [16, 0.18]],
-  "4": [[9, 0.55], [11, 0.35], [16, 0.2]],
-  "5": [[11, 0.6], [13, 0.35], [18, 0.25]],
-  "6": [[13, 0.75], [16, 0.55], [22, 0.45]]
+  "1": [[3, 0.5], [5, 0.42], [16, 0.34]],
+  "2": [[5, 0.52], [7, 0.44], [16, 0.34]],
+  "3": [[7, 0.55], [9, 0.46], [16, 0.36]],
+  "4": [[9, 0.58], [11, 0.5], [16, 0.42]],
+  "5": [[11, 0.62], [13, 0.52], [18, 0.44]],
+  "6": [[13, 0.75], [16, 0.6], [22, 0.5]]
+};
+var ORIENTATION_OPACITY_SCALE = {
+  LNDARE: 1.45,
+  LNDRGN: 1.4,
+  BUAARE: 1.25
 };
-function fanOrientationLabelByCellBand(label, bandFan) {
+var ORIENTATION_OPACITY_MAX = 0.92;
+var ORIENTATION_BOOST_MINZOOM = 11;
+function fanOrientationLabelByCellBand(label, bandFan, objectClass) {
   const cellBandExpr = [
     "slice",
     ["coalesce", ["get", "_cell_id"], "??9???"],
@@ -29182,11 +29422,15 @@ function fanOrientationLabelByCellBand(label, bandFan) {
     3
   ];
   const variants = [];
+  const scale = objectClass ? ORIENTATION_OPACITY_SCALE[objectClass] ?? 1 : 1;
   for (const code of BAND_DRAW_ORDER) {
     const range = BAND_PRIORITY_RANGES[code];
     const curve = CELL_BAND_OPACITY_CURVE[code];
     const opacityExpr = ["interpolate", ["linear"], ["zoom"]];
-    for (const [z, o] of curve) opacityExpr.push(z, o);
+    for (const [z, o] of curve) {
+      const s = z >= ORIENTATION_BOOST_MINZOOM ? scale : 1;
+      opacityExpr.push(z, Math.round(Math.min(o * s, ORIENTATION_OPACITY_MAX) * 100) / 100);
+    }
     const cellFiltered = combineWithBandFilter(
       label.filter,
       ["==", cellBandExpr, code]
@@ -29233,6 +29477,33 @@ function fanOrientationLabelByCellBand(label, bandFan) {
   }
   return variants;
 }
+var MAJOR_WATER_TEXT_PADDING = [
+  "interpolate",
+  ["linear"],
+  ["zoom"],
+  5,
+  24,
+  9,
+  20,
+  13,
+  16,
+  16,
+  14
+];
+function splitOrientationFan(fan, hoistedFilter, watermarkFilter, hoistedLayout) {
+  return {
+    hoist: fan.map((l) => ({
+      ...l,
+      id: `${l.id}-major`,
+      filter: combineWithBandFilter(l.filter, hoistedFilter),
+      ...hoistedLayout ? { layout: { ...l.layout ?? {}, ...hoistedLayout } } : {}
+    })),
+    watermark: fan.map((l) => ({
+      ...l,
+      filter: combineWithBandFilter(l.filter, watermarkFilter)
+    }))
+  };
+}
 function byLabelPriorityBottomUp(bundles) {
   return [...bundles].sort(
     (a, b) => getLabelPriority(b.objectClass) - getLabelPriority(a.objectClass)
@@ -29332,6 +29603,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     layers.push(...baseInlandWaterLayers({ palette }));
   }
   const labelLayers = [];
+  const majorWaterLayers = [];
   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";
@@ -29448,19 +29720,18 @@ function generateStyle(palette = "DAY", opts = {}) {
       }
     }
     {
-      const TERMINAL_FILL_RE = /^s52-(LNDARE|DEPARE)-fill-band([456])$/;
-      for (let i = layers.length - 1; i >= 0; i--) {
-        const src = layers[i];
-        const m = TERMINAL_FILL_RE.exec(src.id);
-        if (!m) continue;
-        const clone = {
-          ...layers[i],
-          id: `s52-${m[1]}-fill-terminal-band${m[2]}`,
-          filter: ["all", src.filter, ["==", ["get", "_terminal_fill"], true]]
-        };
-        delete clone.minzoom;
-        clone.maxzoom = src.minzoom ?? 0;
-        layers.splice(i + 1, 0, clone);
+      const TERMINAL_FILL_RE = /^s52-(?:LNDARE|DEPARE)-fill-band[456]$/;
+      for (const l of layers) {
+        const lay = l;
+        if (!TERMINAL_FILL_RE.test(lay.id)) continue;
+        const floor = lay.minzoom ?? 0;
+        if (floor <= 0) continue;
+        lay.filter = [
+          "all",
+          lay.filter,
+          ["any", [">=", ["zoom"], floor], ["==", ["get", "_terminal_fill"], true]]
+        ];
+        delete lay.minzoom;
       }
     }
     if (opts.labels === "placename") {
@@ -29469,7 +29740,23 @@ function generateStyle(palette = "DAY", opts = {}) {
       for (const { objectClass, label } of bundles) {
         if (!label) continue;
         if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-          labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan));
+          if (objectClass === "LNDARE" || objectClass === "SEAARE") {
+            const Z = ISLAND_LABEL_HOIST_MINZOOM;
+            const { hoist, watermark } = objectClass === "LNDARE" ? splitOrientationFan(
+              fanOrientationLabelByCellBand(label, bandFan, objectClass),
+              [">=", ["zoom"], Z],
+              ["<", ["zoom"], Z]
+            ) : splitOrientationFan(
+              fanOrientationLabelByCellBand(label, bandFan, objectClass),
+              ["<=", buildSeaAreaTierExpression(), MAJOR_WATER_TIER_MAX],
+              [">", buildSeaAreaTierExpression(), MAJOR_WATER_TIER_MAX],
+              { "text-padding": MAJOR_WATER_TEXT_PADDING }
+            );
+            majorWaterLayers.push(...hoist);
+            labelLayers.push(...watermark);
+            continue;
+          }
+          labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan, objectClass));
         }
       }
     }
@@ -29478,7 +29765,12 @@ function generateStyle(palette = "DAY", opts = {}) {
         (b) => b.label !== null && getLabelBehavior(b.objectClass) !== "orientation-cross-band"
       )
     );
-    for (const { label } of featureLabelBundles) {
+    let majorsEmitted = majorWaterLayers.length === 0;
+    for (const { label, objectClass: cls } of featureLabelBundles) {
+      if (!majorsEmitted && getLabelPriority(cls) < MAJOR_WATER_LABEL_PRIORITY) {
+        labelLayers.push(...majorWaterLayers);
+        majorsEmitted = true;
+      }
       if (bandFan === "collapsed") {
         labelLayers.push(makeCollapsedCrossBandLabel(label, isDominanceExempt(label)));
         continue;
@@ -29487,6 +29779,7 @@ function generateStyle(palette = "DAY", opts = {}) {
         labelLayers.push(...emitBand(label, code));
       }
     }
+    if (!majorsEmitted) labelLayers.push(...majorWaterLayers);
     layers.push(...labelLayers);
   }
   const symbolSet = opts.symbolSet ?? "s52";