@chrtco/sdk 0.10.18 → 0.10.20

package/dist/index.cjs

@@ -26,9 +26,13 @@ __export(index_exports, {
   ATON_EXPRESSION_CLASSES: () => ATON_EXPRESSION_CLASSES,
   BAND_DRAW_ORDER: () => BAND_DRAW_ORDER,
   BAND_PRIORITY_RANGES: () => BAND_PRIORITY_RANGES,
+  BASE_MAXZOOM: () => BASE_MAXZOOM,
+  BASE_MINZOOM: () => BASE_MINZOOM,
+  BASE_REGION: () => BASE_REGION,
   BRIDGE_QUERY_LAYERS: () => BRIDGE_QUERY_LAYERS,
   BUILD_MAXZOOM: () => BUILD_MAXZOOM,
   BUILD_MINZOOM: () => BUILD_MINZOOM,
+  BUILD_PARAM: () => BUILD_PARAM,
   CHART_BAND_CODES: () => CHART_BAND_CODES,
   CHART_CASCADE_CODES: () => CHART_CASCADE_CODES,
   CHART_SECTIONS: () => CHART_SECTIONS,
@@ -210,6 +214,7 @@ __export(index_exports, {
   scaleSizeValue: () => scaleSizeValue,
   scaminToMinZoom: () => scaminToMinZoom,
   styleModeBand: () => styleModeBand,
+  tileTemplate: () => tileTemplate,
   withinBboxFilter: () => withinBboxFilter,
   worldMinusBboxPolygon: () => worldMinusBboxPolygon
 });
@@ -351,7 +356,7 @@ var TileTokenError = class extends Error {
     this.status = status;
   }
 };
-var TILE_URL_PATH = /\/v1\/tiles\/[A-Za-z0-9_]+(?:\/[a-z][a-z0-9-]*)?\/\d+\/\d+\/\d+\.mvt(?:\?.*)?$/i;
+var TILE_URL_PATH = /\/v1\/tiles\/[A-Za-z0-9_]+(?:\/[a-z][a-z0-9-]*)?\/\d+\/\d+\/\d+\.(?:mvt|png)(?:\?.*)?$/i;
 var STYLE_URL_PATH = /\/v1\/styles\/[A-Za-z0-9_]+\/style\.json(?:\?.*)?$/i;
 var REFRESH_MARGIN_SECONDS = 30;
 var STALE_GRACE_SECONDS = 1;
@@ -362,6 +367,15 @@ function nowSeconds() {
 function sleep2(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
+function readBuildTags(raw, region, buildTag) {
+  const out = { [region]: buildTag };
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    for (const [key, value] of Object.entries(raw)) {
+      if (typeof value === "string" && value) out[key] = value;
+    }
+  }
+  return out;
+}
 function mapErrorCode(raw, status) {
   const known = [
     "invalid_api_key",
@@ -419,6 +433,7 @@ var TileAuth = class {
       expiresAt: b.expires_at,
       kid: b.kid,
       buildTag: b.build_tag,
+      buildTags: readBuildTags(b.build_tags, b.region, b.build_tag),
       region: b.region
     };
   }
@@ -494,6 +509,22 @@ var TileAuth = class {
     if (entry.response.expiresAt - nowSeconds() <= STALE_GRACE_SECONDS) return null;
     return entry.response.token;
   }
+  /**
+   * Synchronous peek at the cached mint's per-region build ids — `{}` when the
+   * cache is cold.
+   *
+   * `chrt.style()` is synchronous and cannot mint, so this is how a style
+   * generated after the cache is warm picks up the build discriminator without
+   * the caller threading it by hand. A cold cache yields `{}`, which produces
+   * the undiscriminated URL the SDK emitted before this existed — never an
+   * error, and never a wrong build.
+   */
+  peekBuildTags(region) {
+    const entry = this.cache.get(region ?? this.defaultRegion);
+    if (!entry) return {};
+    if (entry.response.expiresAt - nowSeconds() <= STALE_GRACE_SECONDS) return {};
+    return entry.response.buildTags;
+  }
   /**
    * Produce a MapLibre / Mapbox GL `transformRequest`. Attaches
    * `Authorization: Bearer <jwt>` only to CHRT tile URLs and the CHRT
@@ -547,6 +578,78 @@ var TileAuth = class {
   }
 };
 
+// src/atlas/tile-zoom.ts
+var BUILD_MINZOOM = 0;
+var BUILD_MAXZOOM = 14;
+
+// src/atlas/source-registry.ts
+var LAND_REGION = "CHRT_LAND";
+var RELIEF_REGION = "CHRT_RELIEF";
+var BASE_REGION = "CHRT_BASE";
+var BASE_MINZOOM = 0;
+var BASE_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) {
+  const url = `${base}/v1/tiles/${region}/{z}/{x}/{y}.${extension}`;
+  const id = buildId?.trim();
+  if (!id) return url;
+  return `${url}?${BUILD_PARAM}=${encodeURIComponent(id)}`;
+}
+var DEFAULT_TILE_BASE_URL2 = "https://tiles.chrt.co";
+var DEFAULT_REGION = "NOAA_ENC";
+function buildSources(opts = {}) {
+  const mode = opts.mode ?? "pmtiles";
+  const region = opts.region ?? DEFAULT_REGION;
+  if (mode === "mapbox") {
+    return {
+      [region]: {
+        type: "vector",
+        url: `mapbox://chrt.${region.toLowerCase()}`
+      }
+    };
+  }
+  const base = (opts.tileBaseUrl ?? DEFAULT_TILE_BASE_URL2).replace(/\/+$/, "");
+  const buildFor = (r) => opts.buildTags?.[r] ?? (r === region ? opts.buildTag : void 0);
+  const sources = {
+    [region]: {
+      type: "vector",
+      tiles: [tileTemplate(base, region, "mvt", buildFor(region))],
+      minzoom: BUILD_MINZOOM,
+      maxzoom: BUILD_MAXZOOM
+    }
+  };
+  if (opts.land) {
+    sources[LAND_REGION] = {
+      type: "vector",
+      tiles: [tileTemplate(base, LAND_REGION, "mvt", buildFor(LAND_REGION))],
+      minzoom: BUILD_MINZOOM,
+      maxzoom: BUILD_MAXZOOM
+    };
+  }
+  if (opts.base) {
+    sources[BASE_REGION] = {
+      type: "vector",
+      tiles: [`${base}/v1/tiles/${BASE_REGION}/{z}/{x}/{y}.mvt`],
+      minzoom: BASE_MINZOOM,
+      maxzoom: BASE_MAXZOOM
+    };
+  }
+  if (opts.relief) {
+    sources[RELIEF_REGION] = {
+      type: "raster-dem",
+      tiles: [tileTemplate(base, RELIEF_REGION, "png", buildFor(RELIEF_REGION))],
+      encoding: "terrarium",
+      tileSize: RELIEF_TILE_SIZE,
+      minzoom: RELIEF_MINZOOM,
+      maxzoom: RELIEF_MAXZOOM
+    };
+  }
+  return sources;
+}
+
 // src/endpoints/tiles.ts
 var TilesEndpoint = class {
   constructor(http, tileAuth, opts) {
@@ -618,13 +721,20 @@ var TilesEndpoint = class {
     return await res.json();
   }
   /**
-   * Vector tile URL template for the configured region, served by the
-   * tile-worker at `tiles.chrt.co`. Tiles are JWT-gated — pair this with
+   * Vector tile URL for the configured region, served by the tile-worker at
+   * `tiles.chrt.co`. Tiles are JWT-gated — pair this with
    * `chrt.transformRequest()`, which attaches the `Authorization: Bearer`
    * header. Prefer `chrt.style()`, which wires the source for you.
+   *
+   * Carries the build discriminator (`?v=`) once the token cache is warm, so
+   * two buildTags never share one cache entry — see `BUILD_PARAM`. A cold cache
+   * yields the bare URL, which is equally valid: the server ignores the
+   * parameter, and warming is a `chrt.warmTiles()` (or one
+   * `chrt.transformRequest()` round-trip) away.
    */
   tileUrl(z, x, y) {
-    return `${this.tileBaseUrl}/v1/tiles/${this.region}/${z}/${x}/${y}.mvt`;
+    const build = this.tileAuth.peekBuildTags(this.region)[this.region];
+    return tileTemplate(this.tileBaseUrl, this.region, "mvt", build).replace("{z}", String(z)).replace("{x}", String(x)).replace("{y}", String(y));
   }
   /**
    * @deprecated Tilesets were consolidated to one PMTiles per region (2026-04);
@@ -850,6 +960,27 @@ var SearchEndpoint = class {
   }
 };
 
+// src/endpoints/poi.ts
+var PoiEndpoint = class {
+  constructor(http) {
+    this.http = http;
+  }
+  async list(options) {
+    return this.http.request(
+      "/poi",
+      {
+        bbox: options.bbox ? options.bbox.join(",") : void 0,
+        near: options.near ? `${options.near[0]},${options.near[1]}` : void 0,
+        radius_m: options.radiusM,
+        category: options.category,
+        limit: options.limit,
+        offset: options.offset
+      },
+      options.signal
+    );
+  }
+};
+
 // src/endpoints/query.ts
 var METRES_PER_NAUTICAL_MILE2 = 1852;
 var QueryEndpoint = class {
@@ -6370,6 +6501,38 @@ var S52_LOOKUP = {
     // polygons that overlap the security-zone CTNARE polygons; with both
     // as flood fills, the harbor inner waters disappeared under stacked
     // magenta. Same boundary-only treatment as CTNARE.
+    // ── DASHED, 2026-08-24. A solid line here read as a second coastline.
+    //
+    // User report: "narragansett bay has 2 offset coastlines... this is so
+    // sloppy. we can't sell this right now." Measured by ablating classes
+    // out of the shipping style and diffing offscreen renders of that exact
+    // frame (z10.54, -71.1745/41.6031): dropping every magenta-painting
+    // class changed 38,580 px and the doubled shoreline vanished; RESARE
+    // ALONE was 37,613 of them — 97.5%. CBLARE, CTNARE, ACHARE and ADMARE
+    // each changed zero.
+    //
+    // Restricted areas in Narragansett Bay follow the shore, so their
+    // boundary runs parallel to the coastline a short distance off it. Drawn
+    // SOLID, in a chart where the coastline is also a solid line, that is a
+    // second coastline to any reader — the geometry is right and the
+    // portrayal lies about what it is.
+    //
+    // This is not a SCAMIN problem, and the first fix attempted was wrong:
+    // the tile pipeline already honours SCAMIN (the z10 tile carries 9
+    // RESARE features, all SCAMIN 1:119,999-1:999,999 — NOAA's own
+    // instruction to draw them at overview scale — while the z11 tile
+    // carries 35). Gating harder would have hidden features the HO asks for.
+    //
+    // Dashed restores the convention this class was already believed to
+    // follow: MIPARE [4,3], TESARE [6,4] and PRDARE [4,2] are all dashed
+    // magenta boundaries, and PRDARE's own comment describes itself as
+    // "matching RESARE/CTNARE/MIPARE/TESARE convention". RESARE was the lone
+    // solid outlier. It also moves toward the S-52 line style for this
+    // class, RESARE51 ("boundary of a restricted area"), a broken magenta
+    // line with inward T-marks — which cannot be used directly yet: the
+    // served sprite (s52-day, 101 entries) carries no RESARE51 pattern, and
+    // a `line-pattern` naming a missing sprite renders NOTHING, which would
+    // turn a portrayal complaint into invisible restricted areas.
     objectClass: "RESARE",
     name: "Restricted Area",
     category: "Regulated Areas",
@@ -6380,7 +6543,8 @@ var S52_LOOKUP = {
       paint: {
         "line-color": "TRFCD",
         "line-width": 1.2,
-        "line-opacity": 0.7
+        "line-opacity": 0.7,
+        "line-dasharray": [4, 3]
       }
     },
     viewingGroup: 26040,
@@ -6464,7 +6628,13 @@ var S52_LOOKUP = {
     category: "Regulated Areas",
     displayCategory: "OTHER",
     int1Ref: "N23",
-    style: { type: "fill", paint: { "fill-color": "LITYW", "fill-opacity": 0.15 } },
+    // 0.15 painted Hanapepe Bay's dumping ground as a solid land-green wash
+    // over the white deep-water ground — owner-read as "land painting up to
+    // the coastline" (2026-08-31). INT1 N23/N24 portrays a dumping ground
+    // as a dashed limit with a label, not an area tint; 0.04 matches the
+    // TSSLPT/TSSRON faintness so the area reads as WATER with a regulated
+    // overlay, at every tier that shows it.
+    style: { type: "fill", paint: { "fill-color": "LITYW", "fill-opacity": 0.04 } },
     viewingGroup: 26230,
     scamin: 22e3
   },
@@ -7514,12 +7684,19 @@ var S52_LOOKUP = {
     // Inherits RESARE (S-57 112) — boundary-only, no flood fill. The stacked
     // magenta wash that motivated RESARE's treatment applies here too: an
     // inland reach can carry overlapping regulated areas just as a harbour can.
+    // ── DASHED, matching RESARE (2026-08-25). The inland twin was missed
+    // when RESARE was dashed the day before, so USACE inland waters kept
+    // drawing restricted areas as a SOLID magenta line running alongside
+    // the bank — the same "second coastline" a user reported on the coastal
+    // chart, still shipping on the inland one. Found by auditing every
+    // lowercase variant against its NOAA parent: of 14, this was the only
+    // pair that diverged.
     objectClass: "resare",
     name: "Restricted Area (Inland)",
     category: "Regulated Areas",
     displayCategory: "STANDARD",
     int1Ref: "N2",
-    style: { type: "line", paint: { "line-color": "TRFCD", "line-width": 1.2, "line-opacity": 0.7 } },
+    style: { type: "line", paint: { "line-color": "TRFCD", "line-width": 1.2, "line-opacity": 0.7, "line-dasharray": [4, 3] } },
     viewingGroup: 26010,
     scamin: 9e4
   },
@@ -22874,14 +23051,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
   };
 }
@@ -22891,15 +23073,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;
+            })
           ]);
         }
       }
@@ -22928,6 +23112,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",
@@ -23001,6 +23198,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;
@@ -23173,21 +23373,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":
@@ -23352,14 +23556,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,
@@ -23383,8 +23629,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": {
@@ -23405,7 +23684,7 @@ function getLabelConfig(layerName, opts = {}) {
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 7,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "RIVERS": {
@@ -23426,7 +23705,7 @@ function getLabelConfig(layerName, opts = {}) {
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 7,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "CANALS":
@@ -23457,21 +23736,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": {
@@ -23496,7 +23785,7 @@ function getLabelConfig(layerName, opts = {}) {
         minzoom: 3,
         layout: orientationLabelLayout({
           "text-letter-spacing": 0.05
-        })
+        }, tierExpr)
       };
     }
     case "BRIDGE":
@@ -23588,7 +23877,7 @@ function getLabelConfig(layerName, opts = {}) {
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
         minzoom: 7,
-        layout: orientationLabelLayout()
+        layout: orientationLabelLayout({}, tierExpr)
       };
     }
     case "SBDARE":
@@ -25972,7 +26261,7 @@ var S52_POINT_SVGS = {
   "LIGHTS14": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.8438" transform="translate(16 16) scale(0.8438) translate(-16 -16)">\n    <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0 Z" fill="CHMGD" />\n    <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0" fill="none" stroke="CHMGD" stroke-width="1.185" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 21.3 5.2 L 21.0 6.6 L 16.3 31.0" fill="none" stroke="CHBLK" stroke-width="1.185" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 16.3 28.0 L 11.5 6.6 L 11.8 5.2 L 12.1 4.1 L 12.9 3.2 L 14.1 2.1 L 15.4 1.9 L 16.3 1.9 L 17.4 2.1 L 18.8 2.7 L 19.6 3.5 L 20.2 4.6 L 20.4 5.7 L 20.2 7.7 L 16.3 28.0" fill="none" stroke="CHMGD" stroke-width="1.185" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 16.3 31.0 L 10.7 6.0 L 11.5 3.5 L 13.8 1.6 L 16.3 1.0 L 18.5 1.9 L 19.9 2.7 L 21.0 4.9" fill="none" stroke="CHBLK" stroke-width="1.185" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
   "LIGHTS81": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.3896" transform="translate(16 16) scale(0.3896) translate(-16 -16)">\n    <path d="M 1.0 25.9 L 6.9 5.9 L 12.9 26.0 L 19.0 5.9 L 25.0 26.1 L 31.0 5.9" fill="none" stroke="CHMGD" stroke-width="2.567" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
   "LIGHTS82": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.6083" transform="translate(16 16) scale(0.6083) translate(-16 -15.98)">\n    <circle cx="6.96" cy="17.80" r="5.96" fill="none" stroke="CHMGD" stroke-width="3.288" />\n    <path d="M 14.9 23.1 L 25.9 23.5" fill="none" stroke="CHMGD" stroke-width="3.288" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 13.3 12.1 L 28.0 8.2" fill="none" stroke="CHMGD" stroke-width="3.288" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 15.8 17.5 L 31.0 16.0" fill="none" stroke="CHMGD" stroke-width="3.288" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
-  "LITDEF11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.7292" transform="translate(16 16) scale(0.7292) translate(-16 -16)">\n    <path d="M 16.3 31.0 L 10.9 6.9 L 10.9 5.8 L 11.2 4.2 L 12.0 2.8 L 12.8 2.1 L 14.1 1.0 L 16.0 1.0 L 17.6 1.0 L 18.7 1.3 L 20.3 2.3 L 20.8 3.9 L 21.1 5.3 L 21.1 6.6 L 16.3 31.0 Z" fill="CHMGD" />\n    <path d="M 16.3 31.0 L 10.9 6.9 L 10.9 5.8 L 11.2 4.2 L 12.0 2.8 L 12.8 2.1 L 14.1 1.0 L 16.0 1.0 L 17.6 1.0 L 18.7 1.3 L 20.3 2.3 L 20.8 3.9 L 21.1 5.3 L 21.1 6.6 L 16.3 31.0" fill="none" stroke="CHMGD" stroke-width="1.371" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 16.3 31.0 L 10.9 6.4 L 10.9 4.7 L 11.4 3.1 L 12.3 2.3 L 13.6 1.3 L 15.2 1.0 L 16.3 1.0 L 17.6 1.0 L 18.9 1.5 L 20.0 2.6 L 20.8 4.2 L 21.1 5.3 L 20.8 7.7 L 16.3 31.0" fill="none" stroke="CHMGD" stroke-width="1.371" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
+  "LITDEF11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.7292" transform="translate(16 16) scale(0.7292) translate(-16.1 -14.95)">\n    <g transform="translate(10 10) rotate(135) scale(0.9) translate(-16.3 -31)">\n      <path d="M 16.3 31.0 L 10.9 6.9 L 10.9 5.8 L 11.2 4.2 L 12.0 2.8 L 12.8 2.1 L 14.1 1.0 L 16.0 1.0 L 17.6 1.0 L 18.7 1.3 L 20.3 2.3 L 20.8 3.9 L 21.1 5.3 L 21.1 6.6 L 16.3 31.0 Z" fill="CHMGD" />\n      <path d="M 16.3 31.0 L 10.9 6.9 L 10.9 5.8 L 11.2 4.2 L 12.0 2.8 L 12.8 2.1 L 14.1 1.0 L 16.0 1.0 L 17.6 1.0 L 18.7 1.3 L 20.3 2.3 L 20.8 3.9 L 21.1 5.3 L 21.1 6.6 L 16.3 31.0" fill="none" stroke="CHMGD" stroke-width="1.371" stroke-linecap="butt" stroke-linejoin="round" />\n      <path d="M 16.3 31.0 L 10.9 6.4 L 10.9 4.7 L 11.4 3.1 L 12.3 2.3 L 13.6 1.3 L 15.2 1.0 L 16.3 1.0 L 17.6 1.0 L 18.9 1.5 L 20.0 2.6 L 20.8 4.2 L 21.1 5.3 L 20.8 7.7 L 16.3 31.0" fill="none" stroke="CHMGD" stroke-width="1.371" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n  </g>\n</svg>\n',
   "LITFLT01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.9375" transform="translate(16 16) scale(0.9375) translate(-16 -15.985)">\n    <circle cx="16.00" cy="18.97" r="2.40" fill="none" stroke="CHBLK" stroke-width="2.133" />\n    <path d="M 1.0 19.0 L 12.7 19.0" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 6.0 19.0 L 2.7 12.3" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 26.0 19.0 L 29.3 12.3" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 11.0 14.0 L 12.7 10.6 L 19.3 10.6 L 21.0 14.0" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 2.7 12.3 L 9.3 14.0 L 22.7 14.0 L 29.3 12.3" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 19.3 19.0 L 31.0 19.0" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
   "LITFLT02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.6385" transform="translate(16 16) scale(0.6385) translate(-16 -16)">\n    <path d="M 1.0 13.0 L 5.6 21.5 L 26.9 21.5 L 31.0 12.9 Z" fill="CHBLK" />\n    <path d="M 1.0 13.0 L 5.6 21.5 L 26.9 21.5 L 31.0 12.9" fill="none" stroke="CHBLK" stroke-width="1.566" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 1.0 12.9 L 5.6 21.5 L 26.9 21.5 L 30.9 12.9 L 1.0 12.9 Z" fill="CHBLK" />\n    <path d="M 1.0 12.9 L 5.6 21.5 L 26.9 21.5 L 30.9 12.9 L 1.0 12.9" fill="none" stroke="CHBLK" stroke-width="1.566" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 10.9 12.9 L 10.9 10.5 L 21.2 10.5 L 21.2 12.9" fill="none" stroke="CHBLK" stroke-width="1.566" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
   "LITVES01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g data-chrt-scale="0.9375" transform="translate(16 16) scale(0.9375) translate(-16 -15.98)">\n    <circle cx="16.00" cy="24.83" r="2.33" fill="none" stroke="CHBLK" stroke-width="2.133" />\n    <path d="M 1.0 24.8 L 12.7 24.8" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 6.0 24.8 L 2.7 16.5" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 26.0 24.8 L 29.3 16.5" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 16.0 19.0 L 16.0 9.8" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 9.3 19.0 L 9.3 13.0" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 22.7 19.0 L 22.7 13.2" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 16.0 9.8 L 16.0 4.8" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 12.7 6.5 L 19.3 9.8" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 12.7 9.8 L 19.3 6.5" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 4.7 21.5 L 10.2 21.5" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 21.8 21.5 L 27.3 21.5" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 2.7 16.5 L 9.2 19.0 L 16.0 19.0 L 22.7 19.0 L 29.3 16.5" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    <path d="M 19.3 24.8 L 31.0 24.8" fill="none" stroke="CHBLK" stroke-width="2.133" stroke-linecap="butt" stroke-linejoin="round" />\n    </g>\n</svg>\n',
@@ -26487,6 +26776,8 @@ var CHRT_GLYPH_SVGS = {
   "cardinal-w": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 6 12 1.5h8Z" fill="#101418"/><path d="M16 6.5 20 11h-8Z" fill="#101418"/><path d="M13 12h6l1 13H12Z" fill="#FFC805"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
   "daymark-square": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><rect x="6" y="6" width="20" height="20" rx="1.5" fill="#fff"/></svg>',
   "daymark-triangle": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 5 28 26H4Z" fill="#fff"/></svg>',
+  "hatch-nocoverage": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M-3 9 L9 -3 M-3 21 L21 -3 M3 27 L27 3 M15 27 L27 15" stroke="#8A97A0" stroke-width="0.8" fill="none"/><path d="M-3 15 L15 33 M-3 3 L21 27 M3 -3 L27 21 M15 -3 L27 9" stroke="#8A97A0" stroke-width="0.8" fill="none"/></svg>',
+  "hatch-uncharted": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M-3 9 L9 -3 M-3 21 L21 -3 M3 27 L27 3 M15 27 L27 15" stroke="#5B7383" stroke-width="0.65" fill="none"/></svg>',
   "isolated-danger": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="3.5" r="2.4" fill="#101418"/><circle cx="16" cy="9.5" r="2.4" fill="#101418"/><path d="M13 13h6l1 12H12Z" fill="#101418"/><rect x="12.4" y="17.5" width="7.2" height="3.4" fill="#E5484D"/><path d="M6 28h20" stroke="#101418" stroke-width="2.4" stroke-linecap="round"/></svg>',
   "light-flare": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><circle cx="11" cy="11" r="3.2" fill="#fff"/><path d="M13.4 13.4 24 19.5a2.6 2.6 0 0 1-4.5 4.5L13.4 13.4Z" fill="#fff"/></svg>',
   "lightship": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M6 20l3-5h14l3 5-3.5 4h-13Z" fill="#fff"/><path d="M16 15V8" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/><circle cx="16" cy="6" r="2.2" fill="#fff"/><path d="M5 28h22" stroke="#fff" stroke-width="2.4" stroke-linecap="round"/></svg>',
@@ -26935,59 +27226,6 @@ function iconExpressionForFamily(objectClass, family) {
   }
 }
 
-// src/atlas/tile-zoom.ts
-var BUILD_MINZOOM = 0;
-var BUILD_MAXZOOM = 14;
-
-// src/atlas/source-registry.ts
-var LAND_REGION = "CHRT_LAND";
-var RELIEF_REGION = "CHRT_RELIEF";
-var RELIEF_MINZOOM = 8;
-var RELIEF_MAXZOOM = 13;
-var RELIEF_TILE_SIZE = 512;
-var DEFAULT_TILE_BASE_URL2 = "https://tiles.chrt.co";
-var DEFAULT_REGION = "NOAA_ENC";
-function buildSources(opts = {}) {
-  const mode = opts.mode ?? "pmtiles";
-  const region = opts.region ?? DEFAULT_REGION;
-  if (mode === "mapbox") {
-    return {
-      [region]: {
-        type: "vector",
-        url: `mapbox://chrt.${region.toLowerCase()}`
-      }
-    };
-  }
-  const base = (opts.tileBaseUrl ?? DEFAULT_TILE_BASE_URL2).replace(/\/+$/, "");
-  const sources = {
-    [region]: {
-      type: "vector",
-      tiles: [`${base}/v1/tiles/${region}/{z}/{x}/{y}.mvt`],
-      minzoom: BUILD_MINZOOM,
-      maxzoom: BUILD_MAXZOOM
-    }
-  };
-  if (opts.land) {
-    sources[LAND_REGION] = {
-      type: "vector",
-      tiles: [`${base}/v1/tiles/${LAND_REGION}/{z}/{x}/{y}.mvt`],
-      minzoom: BUILD_MINZOOM,
-      maxzoom: BUILD_MAXZOOM
-    };
-  }
-  if (opts.relief) {
-    sources[RELIEF_REGION] = {
-      type: "raster-dem",
-      tiles: [`${base}/v1/tiles/${RELIEF_REGION}/{z}/{x}/{y}.png`],
-      encoding: "terrarium",
-      tileSize: RELIEF_TILE_SIZE,
-      minzoom: RELIEF_MINZOOM,
-      maxzoom: RELIEF_MAXZOOM
-    };
-  }
-  return sources;
-}
-
 // src/atlas/layer-builder.ts
 var SCAMIN_DECLUTTER_CLASSES = /* @__PURE__ */ new Set([
   "OFSPLF",
@@ -27315,7 +27553,27 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
         layer.layout = {
           ...layer.layout,
           "icon-allow-overlap": true,
-          "icon-ignore-placement": true
+          "icon-ignore-placement": true,
+          // Flare-specific size (owner ask 2026-08-31: "make the flares a
+          // little smaller — they should scale down a lot as you zoom out").
+          // The safety-critical curve serves buoy/beacon HULLS, whose set
+          // this overrides for LIGHTS only: flares are annotations on a
+          // point, not shapes a mariner ranges against, so they start small
+          // at planning scales and only approach full size at berthing
+          // zooms. Applied after the safety-critical spread so it wins.
+          "icon-size": [
+            "interpolate",
+            ["linear"],
+            ["zoom"],
+            6,
+            0.3,
+            12,
+            0.42,
+            14,
+            0.6,
+            18,
+            1
+          ]
         };
         const valnmrNum = ["to-number", ["coalesce", ["get", "VALNMR"], ["get", "valnmr"], 0], 0];
         const isMajor = [">=", valnmrNum, 10];
@@ -28280,85 +28538,265 @@ function getOrderedClasses() {
   return ordered;
 }
 
-// src/atlas/land-layers.ts
-var FADE_PX = 80;
-var FADE_BANDS = 16;
-function fadeAlpha(r) {
-  return Math.max(0, Math.min(1, (FADE_PX / 2 - Math.abs(r)) / FADE_PX));
-}
-var LAND_THEMES = {
-  DAY: {
-    base: "#e8d9b0",
-    cover: { wood: "#cfd8b4", wetland: "#c9d3c4", urban: "#dedad2", sand: "#efe4c2" },
-    contour: "#a89878",
-    contourIndex: "#8a7a5c",
-    road: "#d9c9a4",
-    roadMajor: "#d2bd8e",
-    label: "#5b4f3a",
-    halo: "#f2ead6",
-    shadow: "#6b5a3e",
-    highlight: "#fffaf0",
-    fade: "#e8f2f8",
-    // Raised from 0.45 on 2026-08-23. ⚠ Above the ~0.5 that
-    // hillshade-style.mjs warns "starts competing with depth areas" — a
-    // deliberate, sighted choice made against rendered evidence, not a
-    // default. If soundings or DEPARE ever read as fighting the terrain,
-    // this number is the first thing to walk back.
-    exaggeration: 0.8
-  },
-  DUSK: {
-    base: "#4a4433",
-    cover: { wood: "#414a38", wetland: "#3f4740", urban: "#4e4a42", sand: "#544c39" },
-    contour: "#6b6250",
-    contourIndex: "#837961",
-    road: "#565040",
-    roadMajor: "#63594440",
-    label: "#c3b898",
-    halo: "#2b2820",
-    shadow: "#2e2a20",
-    highlight: "#8a8068",
-    fade: "#16202a",
-    // Unchanged. DUSK was not the palette the 0.8 decision was made against.
-    exaggeration: 0.45
-  },
-  NIGHT: {
-    base: "#2a2620",
-    cover: { wood: "#242a20", wetland: "#232823", urban: "#2c2925", sand: "#302b22" },
-    contour: "#413b30",
-    contourIndex: "#524a3b",
-    road: "#332f27",
-    roadMajor: "#3d382d",
-    label: "#7d745e",
-    halo: "#15130f",
-    shadow: "#1a1712",
-    highlight: "#4a4436",
-    fade: "#07090b",
-    // ⚠ DELIBERATELY NOT RAISED. See the type's note: a strong hillshade
-    // under red night vision is a grey haze over exactly the contrast a
-    // skipper is navigating by. Left at the shipped value rather than
-    // lowered, because lowering it is a separate decision from this one.
-    exaggeration: 0.45
-  }
+// src/atlas/band-priority.ts
+var BAND_PRIORITY_RANGES = {
+  "1": { minzoom: 0 },
+  "2": { minzoom: 5 },
+  "3": { minzoom: 7 },
+  "4": { minzoom: 9 },
+  "5": { minzoom: 11 },
+  "6": { minzoom: 11 }
 };
-var FITS = ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]];
-var ANCHOR = ["coalesce", ["get", "anchor"], "top"];
-var anchorOffset = (em) => [
-  "match",
-  ["get", "anchor"],
-  "left",
-  ["literal", [0.6, 0]],
-  "right",
-  ["literal", [-0.6, 0]],
-  "bottom",
-  ["literal", [0, -em]],
-  ["literal", [0, em]]
-];
-var FONT = ["Open Sans Regular"];
-var FONT_ITALIC = ["Open Sans Italic"];
-function landLayers(opts = {}) {
-  const palette = opts.palette ?? "DAY";
-  const T = LAND_THEMES[palette] ?? LAND_THEMES.DAY;
-  const src = opts.sourceId ?? LAND_REGION;
+var BAND_DATA_MINZOOM = {
+  "1": 0,
+  "2": 5,
+  "3": 7,
+  "4": 9,
+  "5": 11,
+  "6": 13
+};
+function dominatedVariantMaxzoom(D) {
+  return Math.max(BAND_PRIORITY_RANGES[D].minzoom, BAND_DATA_MINZOOM[D]);
+}
+var DOMINANCE_EXEMPT_FILL_CLASSES = /* @__PURE__ */ new Set([
+  "LNDARE",
+  "DEPARE",
+  "UNSARE",
+  "LAKARE",
+  "DRGARE",
+  "SEAARE"
+]);
+function isExemptOpaqueFill(layer) {
+  if (layer.type !== "fill") return false;
+  for (const cls of DOMINANCE_EXEMPT_FILL_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return true;
+  }
+  return false;
+}
+var FILL_FLOOR_FREE_BANDS = /* @__PURE__ */ new Set([
+  "1",
+  "2",
+  "3"
+]);
+function bandVariantMinzoom(layer, B) {
+  const classMinzoom = layer.minzoom ?? 0;
+  if (isExemptOpaqueFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
+    return classMinzoom;
+  }
+  return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
+}
+var GENERALISED_AREA_FILL_CLASSES = /* @__PURE__ */ new Set([
+  "BUAARE",
+  // 2026-08-28, New York Harbor: the "New York Marine Inspection Zone and
+  // Captain of the Port Zone" RESARE exists at bands 2/3 as a generalized
+  // shore-hugging polygon whose point-sampled dominance tag MISSED (the
+  // Providence-BUAARE failure mode), so its magenta dashed boundary drew
+  // OFFSET over the band-5 detail at z11.5 — read in the field as "a
+  // magenta shoreline bleeding down from a less coarse band". The same
+  // tile carried untagged band-2 ADMARE and CTNARE giants in the same
+  // state. All three are area classes whose coarse-band boundaries hug
+  // shorelines and whose fine-band copies are authoritative.
+  "RESARE",
+  "CTNARE",
+  "ADMARE"
+]);
+var GENERALISED_AREA_MAX_BAND = 3;
+function generalisedAreaCeiling(layer, B) {
+  if (layer.type !== "fill" && layer.type !== "line") return null;
+  if (parseInt(B, 10) > GENERALISED_AREA_MAX_BAND) return null;
+  for (const cls of GENERALISED_AREA_FILL_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return BAND_PRIORITY_RANGES["5"].minzoom;
+  }
+  return null;
+}
+var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
+var CHART_BAND_CODES = {
+  Overview: ["1"],
+  General: ["2"],
+  Coastal: ["3"],
+  Approach: ["4"],
+  Harbor: ["5", "6"]
+};
+var CHART_CASCADE_CODES = {
+  Overview: ["1"],
+  General: ["1", "2"],
+  Coastal: ["1", "2", "3"],
+  Approach: ["1", "2", "3", "4"],
+  Harbor: ["1", "2", "3", "4", "5", "6"]
+};
+var CHRT_STYLE_MODES = [
+  "continuous",
+  ...Object.keys(CHART_BAND_CODES).map(
+    (band) => `chart:${band}`
+  )
+];
+function normalizeStyleMode(raw) {
+  if (raw === null || raw === void 0 || raw === "") return "continuous";
+  const lower = raw.toLowerCase();
+  return CHRT_STYLE_MODES.find((mode) => mode.toLowerCase() === lower) ?? null;
+}
+function styleModeBand(mode) {
+  return mode === "continuous" ? null : mode.slice("chart:".length);
+}
+function bandFilterExpression(codes) {
+  const list = Array.isArray(codes) ? codes : [codes];
+  if (list.length === 1) {
+    return ["==", ["slice", ["get", "_cell_id"], 2, 3], list[0]];
+  }
+  return ["in", ["slice", ["get", "_cell_id"], 2, 3], ["literal", [...list]]];
+}
+function combineWithBandFilter(baseFilter, bandFilter) {
+  if (!baseFilter) return bandFilter;
+  if (baseFilter[0] === "all") {
+    return ["all", ...baseFilter.slice(1), bandFilter];
+  }
+  return ["all", baseFilter, bandFilter];
+}
+var NOT_DOMINATED_FILTER = [
+  "all",
+  ["!", ["has", "_dominated_by_min"]],
+  ["!=", ["get", "_dominated"], true]
+];
+function dominatedByMinFilter(D) {
+  const dInt = parseInt(D, 10);
+  if (D === "6") {
+    return [
+      "any",
+      ["==", ["get", "_dominated_by_min"], dInt],
+      ["==", ["get", "_dominated"], true]
+    ];
+  }
+  return ["==", ["get", "_dominated_by_min"], dInt];
+}
+function withinBboxFilter(bbox) {
+  const [w, s] = bbox.sw;
+  const [e, n] = bbox.ne;
+  return [
+    "within",
+    {
+      type: "Polygon",
+      coordinates: [
+        [
+          [w, s],
+          [e, s],
+          [e, n],
+          [w, n],
+          [w, s]
+        ]
+      ]
+    }
+  ];
+}
+function worldMinusBboxPolygon(bbox) {
+  const [w, s] = bbox.sw;
+  const [e, n] = bbox.ne;
+  return {
+    type: "Polygon",
+    coordinates: [
+      [
+        [-180, -85],
+        [180, -85],
+        [180, 85],
+        [-180, 85],
+        [-180, -85]
+      ],
+      // Inner ring (hole) — winding opposite to outer ring per GeoJSON
+      // spec. MapLibre is permissive but we follow strict winding.
+      [
+        [w, s],
+        [w, n],
+        [e, n],
+        [e, s],
+        [w, s]
+      ]
+    ]
+  };
+}
+
+// src/atlas/land-layers.ts
+var LAND_SURFACE_MINZOOM = BAND_PRIORITY_RANGES["5"].minzoom;
+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) {
+  return Math.max(0, Math.min(1, (FADE_PX / 2 - Math.abs(r)) / FADE_PX));
+}
+function landBaseColor(palette) {
+  return (LAND_THEMES[palette] ?? LAND_THEMES.DAY).base;
+}
+var LAND_THEMES = {
+  DAY: {
+    base: "#e8d9b0",
+    cover: { wood: "#cfd8b4", wetland: "#c9d3c4", urban: "#dedad2", sand: "#efe4c2" },
+    contour: "#a89878",
+    contourIndex: "#8a7a5c",
+    road: "#d9c9a4",
+    roadMajor: "#d2bd8e",
+    label: "#5b4f3a",
+    halo: "#f2ead6",
+    shadow: "#6b5a3e",
+    highlight: "#fffaf0",
+    fade: "#e8f2f8",
+    // Raised from 0.45 on 2026-08-23. ⚠ Above the ~0.5 that
+    // hillshade-style.mjs warns "starts competing with depth areas" — a
+    // deliberate, sighted choice made against rendered evidence, not a
+    // default. If soundings or DEPARE ever read as fighting the terrain,
+    // this number is the first thing to walk back.
+    exaggeration: 0.8
+  },
+  DUSK: {
+    base: "#4a4433",
+    cover: { wood: "#414a38", wetland: "#3f4740", urban: "#4e4a42", sand: "#544c39" },
+    contour: "#6b6250",
+    contourIndex: "#837961",
+    road: "#565040",
+    roadMajor: "#63594440",
+    label: "#c3b898",
+    halo: "#2b2820",
+    shadow: "#2e2a20",
+    highlight: "#8a8068",
+    fade: "#16202a",
+    // Unchanged. DUSK was not the palette the 0.8 decision was made against.
+    exaggeration: 0.45
+  },
+  NIGHT: {
+    base: "#2a2620",
+    cover: { wood: "#242a20", wetland: "#232823", urban: "#2c2925", sand: "#302b22" },
+    contour: "#413b30",
+    contourIndex: "#524a3b",
+    road: "#332f27",
+    roadMajor: "#3d382d",
+    label: "#7d745e",
+    halo: "#15130f",
+    shadow: "#1a1712",
+    highlight: "#4a4436",
+    fade: "#07090b",
+    // ⚠ DELIBERATELY NOT RAISED. See the type's note: a strong hillshade
+    // under red night vision is a grey haze over exactly the contrast a
+    // skipper is navigating by. Left at the shipped value rather than
+    // lowered, because lowering it is a separate decision from this one.
+    exaggeration: 0.45
+  }
+};
+var FITS = ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]];
+var ANCHOR = ["coalesce", ["get", "anchor"], "top"];
+var anchorOffset = (em) => [
+  "match",
+  ["get", "anchor"],
+  "left",
+  ["literal", [0.6, 0]],
+  "right",
+  ["literal", [-0.6, 0]],
+  "bottom",
+  ["literal", [0, -em]],
+  ["literal", [0, em]]
+];
+var FONT = ["Open Sans Regular"];
+var FONT_ITALIC = ["Open Sans Italic"];
+function landLayers(opts = {}) {
+  const palette = opts.palette ?? "DAY";
+  const T = LAND_THEMES[palette] ?? LAND_THEMES.DAY;
+  const src = opts.sourceId ?? LAND_REGION;
   const demSrc = opts.reliefSourceId ?? RELIEF_REGION;
   const L = (o) => o;
   const layers = [
@@ -28396,6 +28834,8 @@ 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,
@@ -28451,12 +28891,12 @@ function landLayers(opts = {}) {
     }
   }));
   layers.push(L({
-    id: "chrtland-town",
+    id: "chrtland-city-major",
     type: "symbol",
     source: src,
     "source-layer": "land_town",
-    minzoom: 9,
-    filter: FITS,
+    minzoom: 6.5,
+    filter: [">=", ["coalesce", ["get", "prank"], 0], 10],
     layout: {
       "text-field": [
         "case",
@@ -28465,211 +28905,526 @@ function landLayers(opts = {}) {
         ["get", "name"]
       ],
       "text-font": FONT,
-      "text-size": ["interpolate", ["linear"], ["zoom"], 9, 10, 14, 13.5],
-      "text-letter-spacing": ["case", ["==", ["get", "upcase"], true], 0.14, 0],
+      "text-size": [
+        "interpolate",
+        ["linear"],
+        ["zoom"],
+        6.5,
+        11.5,
+        9,
+        ["+", 10, ["*", 0.4, ["coalesce", ["get", "prank"], 10]]],
+        13,
+        ["+", 13, ["*", 0.5, ["coalesce", ["get", "prank"], 10]]]
+      ],
+      "text-letter-spacing": ["case", ["==", ["get", "upcase"], true], 0.14, 0.02],
       "text-offset": anchorOffset(0.75),
       "text-anchor": ANCHOR,
-      "text-padding": 6,
+      "text-padding": 10,
       "text-allow-overlap": false,
-      "symbol-sort-key": 2
+      "symbol-sort-key": ["*", -1, ["coalesce", ["get", "pop"], 0]]
     },
-    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
+    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.6 }
   }));
   layers.push(L({
-    id: "chrtland-summit",
+    id: "chrtland-town-port",
     type: "symbol",
     source: src,
-    "source-layer": "land_summit",
-    minzoom: 11.5,
-    filter: ["all", FITS, [">=", ["get", "peak_m"], 40]],
+    "source-layer": "land_town",
+    minzoom: 8.5,
+    filter: [
+      "all",
+      ["==", ["get", "enc_dup"], true],
+      ["<", ["coalesce", ["get", "prank"], 0], 10]
+    ],
     layout: {
-      "text-field": ["concat", ["get", "name"], "\n", ["to-string", ["get", "peak_m"]], " m"],
+      "text-field": ["get", "name"],
       "text-font": FONT,
-      "text-size": ["interpolate", ["linear"], ["zoom"], 11.5, 8.5, 14, 11],
-      "text-offset": anchorOffset(0.8),
+      "text-size": ["interpolate", ["linear"], ["zoom"], 8.5, 11, 12, 13.5],
+      "text-offset": anchorOffset(0.75),
       "text-anchor": ANCHOR,
-      "text-padding": 5,
+      "text-padding": 8,
       "text-allow-overlap": false,
-      "symbol-sort-key": 3
+      // Within the tier, the bigger place wins the space: without this the
+      // tie broke on data order and "West Gloucester" beat Gloucester.
+      "symbol-sort-key": ["*", -1, ["coalesce", ["get", "pop"], 0]]
     },
-    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
+    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.4 }
   }));
   layers.push(L({
-    id: "chrtland-poi",
+    id: "chrtland-town",
     type: "symbol",
     source: src,
-    "source-layer": "land_poi",
-    minzoom: 13,
-    filter: FITS,
+    "source-layer": "land_town",
+    minzoom: 9,
+    filter: [
+      "all",
+      FITS,
+      ["<", ["coalesce", ["get", "prank"], 0], 10],
+      ["!=", ["get", "enc_dup"], true]
+    ],
     layout: {
-      "text-field": ["get", "name"],
-      "text-font": FONT_ITALIC,
-      "text-size": ["interpolate", ["linear"], ["zoom"], 13, 8, 14, 9.5],
-      "text-offset": anchorOffset(0.7),
+      "text-field": [
+        "case",
+        ["==", ["get", "upcase"], true],
+        ["upcase", ["get", "name"]],
+        ["get", "name"]
+      ],
+      "text-font": FONT,
+      "text-size": ["interpolate", ["linear"], ["zoom"], 9, 10, 14, 13.5],
+      "text-letter-spacing": ["case", ["==", ["get", "upcase"], true], 0.14, 0],
+      "text-offset": anchorOffset(0.75),
       "text-anchor": ANCHOR,
-      "text-padding": 5,
+      "text-padding": 6,
       "text-allow-overlap": false,
-      "symbol-sort-key": 5
+      "symbol-sort-key": 2
     },
     paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
   }));
-  return layers;
-}
-
-// src/atlas/band-priority.ts
-var BAND_PRIORITY_RANGES = {
-  "1": { minzoom: 0 },
-  "2": { minzoom: 5 },
-  "3": { minzoom: 7 },
-  "4": { minzoom: 9 },
-  "5": { minzoom: 11 },
-  "6": { minzoom: 11 }
-};
-var BAND_DATA_MINZOOM = {
-  "1": 0,
-  "2": 5,
-  "3": 7,
-  "4": 9,
-  "5": 11,
-  "6": 13
-};
-function dominatedVariantMaxzoom(D) {
-  return Math.max(BAND_PRIORITY_RANGES[D].minzoom, BAND_DATA_MINZOOM[D]);
-}
-var DOMINANCE_EXEMPT_FILL_CLASSES = /* @__PURE__ */ new Set([
-  "LNDARE",
-  "DEPARE",
-  "UNSARE",
-  "LAKARE",
-  "DRGARE",
-  "SEAARE"
-]);
-function isExemptOpaqueFill(layer) {
-  if (layer.type !== "fill") return false;
-  for (const cls of DOMINANCE_EXEMPT_FILL_CLASSES) {
-    if (layer.id.startsWith(`s52-${cls}-`)) return true;
-  }
-  return false;
-}
-var FILL_FLOOR_FREE_BANDS = /* @__PURE__ */ new Set([
-  "1",
-  "2",
-  "3"
-]);
-function bandVariantMinzoom(layer, B) {
-  const classMinzoom = layer.minzoom ?? 0;
-  if (isExemptOpaqueFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
-    return classMinzoom;
-  }
-  return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
-}
-var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
-var CHART_BAND_CODES = {
-  Overview: ["1"],
-  General: ["2"],
-  Coastal: ["3"],
-  Approach: ["4"],
-  Harbor: ["5", "6"]
-};
-var CHART_CASCADE_CODES = {
-  Overview: ["1"],
-  General: ["1", "2"],
-  Coastal: ["1", "2", "3"],
-  Approach: ["1", "2", "3", "4"],
-  Harbor: ["1", "2", "3", "4", "5", "6"]
-};
-var CHRT_STYLE_MODES = [
-  "continuous",
-  ...Object.keys(CHART_BAND_CODES).map(
-    (band) => `chart:${band}`
-  )
-];
-function normalizeStyleMode(raw) {
-  if (raw === null || raw === void 0 || raw === "") return "continuous";
-  const lower = raw.toLowerCase();
-  return CHRT_STYLE_MODES.find((mode) => mode.toLowerCase() === lower) ?? null;
-}
-function styleModeBand(mode) {
-  return mode === "continuous" ? null : mode.slice("chart:".length);
-}
-function bandFilterExpression(codes) {
-  const list = Array.isArray(codes) ? codes : [codes];
-  if (list.length === 1) {
-    return ["==", ["slice", ["get", "_cell_id"], 2, 3], list[0]];
-  }
-  return ["in", ["slice", ["get", "_cell_id"], 2, 3], ["literal", [...list]]];
-}
-function combineWithBandFilter(baseFilter, bandFilter) {
-  if (!baseFilter) return bandFilter;
-  if (baseFilter[0] === "all") {
-    return ["all", ...baseFilter.slice(1), bandFilter];
+  layers.push(L({
+    id: "chrtland-summit",
+    type: "symbol",
+    source: src,
+    "source-layer": "land_summit",
+    minzoom: 11.5,
+    filter: ["all", FITS, [">=", ["get", "peak_m"], 40]],
+    layout: {
+      "text-field": ["concat", ["get", "name"], "\n", ["to-string", ["get", "peak_m"]], " m"],
+      "text-font": FONT,
+      "text-size": ["interpolate", ["linear"], ["zoom"], 11.5, 8.5, 14, 11],
+      "text-offset": anchorOffset(0.8),
+      "text-anchor": ANCHOR,
+      "text-padding": 5,
+      "text-allow-overlap": false,
+      "symbol-sort-key": 3
+    },
+    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
+  }));
+  layers.push(L({
+    id: "chrtland-poi",
+    type: "symbol",
+    source: src,
+    "source-layer": "land_poi",
+    minzoom: 13,
+    filter: FITS,
+    layout: {
+      "text-field": ["get", "name"],
+      "text-font": FONT_ITALIC,
+      "text-size": ["interpolate", ["linear"], ["zoom"], 13, 8, 14, 9.5],
+      "text-offset": anchorOffset(0.7),
+      "text-anchor": ANCHOR,
+      "text-padding": 5,
+      "text-allow-overlap": false,
+      "symbol-sort-key": 5
+    },
+    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
+  }));
+  for (const layer of layers) {
+    const l = layer;
+    if (!LAND_SURFACE_LAYERS(l.id)) continue;
+    l.minzoom = Math.max(l.minzoom ?? 0, LAND_SURFACE_MINZOOM);
   }
-  return ["all", baseFilter, bandFilter];
+  return layers;
 }
-var NOT_DOMINATED_FILTER = [
-  "all",
-  ["!", ["has", "_dominated_by_min"]],
-  ["!=", ["get", "_dominated"], true]
-];
-function dominatedByMinFilter(D) {
-  const dInt = parseInt(D, 10);
-  if (D === "6") {
-    return [
-      "any",
-      ["==", ["get", "_dominated_by_min"], dInt],
-      ["==", ["get", "_dominated"], true]
-    ];
+
+// src/atlas/base-layers.ts
+var NOCOVERAGE_PATTERN = "chrt:hatch-nocoverage";
+var UNCHARTED_PATTERN = "chrt:hatch-uncharted";
+var BASE_THEMES = {
+  DAY: {
+    earth: "#2A3439",
+    water: "#1B2328",
+    river: "#24313A",
+    boundary: "#4A575E",
+    jurisdiction: "#E8D9B0",
+    // CHRTland's own tan — one land colour
+    inlandWater: "#B9CFDD",
+    // muted, unmistakably not a charted blue
+    // State furniture. These three were referenced by the layers but missing
+    // from this table (and its type — the long-standing TS2339 trio), so the
+    // lines shipped on MapLibre's DEFAULT black. Now deliberate: a hairline
+    // a shade deeper than the tan, quiet caps, tan halo.
+    stateLine: "#C4B389",
+    stateLabel: "#8E8468",
+    stateHalo: "#E8D9B0",
+    // Rough-lake furniture (owner ask 2026-08-28: "the lakes need labels,
+    // and shorelines drawn"): a shoreline a shade deeper than the rough
+    // water, and a name in the water's own voice, haloed by the water.
+    inlandShore: "#8FA9BA",
+    inlandLabel: "#54707F",
+    inlandHalo: "#B9CFDD"
+  },
+  DUSK: {
+    earth: "#232B30",
+    water: "#161D21",
+    river: "#1E2930",
+    boundary: "#3E4A50",
+    jurisdiction: "#C9BC96",
+    inlandWater: "#93A9B7",
+    stateLine: "#A6976F",
+    stateLabel: "#776E55",
+    stateHalo: "#C9BC96",
+    inlandShore: "#74899A",
+    inlandLabel: "#41586A",
+    inlandHalo: "#93A9B7"
+  },
+  NIGHT: {
+    earth: "#1A2125",
+    water: "#10161A",
+    river: "#182228",
+    boundary: "#333E44",
+    jurisdiction: "#8F866C",
+    inlandWater: "#5F7280",
+    stateLine: "#6B6350",
+    stateLabel: "#565040",
+    stateHalo: "#8F866C",
+    inlandShore: "#4A5C68",
+    inlandLabel: "#8CA2B0",
+    inlandHalo: "#5F7280"
   }
-  return ["==", ["get", "_dominated_by_min"], dInt];
-}
-function withinBboxFilter(bbox) {
-  const [w, s] = bbox.sw;
-  const [e, n] = bbox.ne;
+};
+function baseLayers(opts = {}) {
+  const palette = opts.palette ?? "DAY";
+  const T = BASE_THEMES[palette] ?? BASE_THEMES.DAY;
+  const src = opts.sourceId ?? BASE_REGION;
+  const L = (o) => o;
   return [
-    "within",
-    {
-      type: "Polygon",
-      coordinates: [
-        [
-          [w, s],
-          [e, s],
-          [e, n],
-          [w, n],
-          [w, s]
-        ]
-      ]
-    }
+    // 1. Geography — the world as it is, in the quiet dark voice. The OCEAN
+    //    is a background, not a polygon: the archive ships land and lakes,
+    //    and "everything else is sea" is exactly what a background expresses
+    //    — geometry-free, gap-free at every antimeridian and pole. Without
+    //    it the sea outside coverage was bare S-52 NODTA, a light grey that
+    //    read as "charted ground" with a hatch on it.
+    L({
+      id: "chrtbase-ocean",
+      type: "background",
+      paint: { "background-color": T.water }
+    }),
+    L({
+      id: "chrtbase-earth",
+      type: "fill",
+      source: src,
+      "source-layer": "base_earth",
+      paint: { "fill-color": T.earth }
+    }),
+    L({
+      id: "chrtbase-water",
+      type: "fill",
+      source: src,
+      "source-layer": "base_water",
+      paint: { "fill-color": T.water }
+    }),
+    L({
+      id: "chrtbase-river",
+      type: "line",
+      source: src,
+      "source-layer": "base_river",
+      minzoom: 9,
+      paint: {
+        "line-color": T.river,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 9, 0.6, 14, 1.6]
+      }
+    }),
+    L({
+      id: "chrtbase-boundary",
+      type: "line",
+      source: src,
+      "source-layer": "base_boundary",
+      paint: { "line-color": T.boundary, "line-width": 0.6, "line-opacity": 0.8 }
+    }),
+    // 2. THE DEFAULT: no coverage, everywhere, as a geometry-free background.
+    //    Constant opacity by design — see the header. What kills it is being
+    //    painted OVER, never fading.
+    L({
+      id: "chrtbase-nocoverage",
+      type: "background",
+      paint: { "background-pattern": NOCOVERAGE_PATTERN, "background-opacity": 0.55 }
+    }),
+    // 3. The jurisdiction: countries whose charts CHRT carries go tan — the
+    //    same tan as CHRTland, so "land in our world" is ONE colour. Opaque,
+    //    so it takes the crosshatch off its ground entirely.
+    L({
+      id: "chrtbase-jurisdiction",
+      type: "fill",
+      source: src,
+      "source-layer": "jurisdiction",
+      paint: { "fill-color": T.jurisdiction }
+    }),
+    // 4. States — internal boundaries and names, inside the jurisdiction
+    //    only (owner decision 2026-08-28). A hairline a shade deeper than the
+    //    tan, and quiet letter-spaced caps that fade as harbour detail takes
+    //    over. The one deliberate exception to no-names-on-the-basemap:
+    //    ADMIN furniture, nothing else — see the fence test.
+    L({
+      id: "chrtbase-state-boundary",
+      type: "line",
+      source: src,
+      "source-layer": "state_boundary",
+      minzoom: 4,
+      paint: {
+        "line-color": T.stateLine,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 1],
+        "line-dasharray": [3, 2],
+        "line-opacity": 0.8
+      }
+    }),
+    // 5. Country borders, drawn to be HOISTED above the whole chart by the
+    //    generator (owner, 2026-08-31: "where there is charted land, can we
+    //    add country borders on top of everything? I want it clear where
+    //    there is a boarder."). Sourced from NE boundary_lines_land — land
+    //    borders only, never coastline — so riding on top cannot stroke a
+    //    coast. Dashed so it reads as an administrative line, not chart
+    //    linework.
+    L({
+      id: "chrtbase-country-boundary",
+      type: "line",
+      source: src,
+      "source-layer": "country_boundary",
+      paint: {
+        "line-color": T.boundary,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 3, 0.8, 8, 1.4, 12, 2.2],
+        "line-dasharray": [4, 2],
+        "line-opacity": 0.9
+      }
+    }),
+    L({
+      id: "chrtbase-state-label",
+      type: "symbol",
+      source: src,
+      "source-layer": "state_label",
+      minzoom: 4,
+      maxzoom: 10,
+      layout: {
+        "text-field": ["upcase", ["get", "name"]],
+        "text-font": ["Open Sans Regular"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 9, 8, 12],
+        "text-letter-spacing": 0.25,
+        "text-allow-overlap": false,
+        "text-padding": 8
+      },
+      paint: {
+        "text-color": T.stateLabel,
+        "text-halo-color": T.stateHalo,
+        "text-halo-width": 1.2,
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 4, 0.7, 8, 0.85, 10, 0.4]
+      }
+    })
   ];
 }
-function worldMinusBboxPolygon(bbox) {
-  const [w, s] = bbox.sw;
-  const [e, n] = bbox.ne;
-  return {
-    type: "Polygon",
-    coordinates: [
-      [
-        [-180, -85],
-        [180, -85],
-        [180, 85],
-        [-180, 85],
-        [-180, -85]
-      ],
-      // Inner ring (hole) — winding opposite to outer ring per GeoJSON
-      // spec. MapLibre is permissive but we follow strict winding.
-      [
-        [w, s],
-        [w, n],
-        [e, n],
-        [e, s],
-        [w, s]
-      ]
-    ]
-  };
+function baseInlandWaterLayers(opts = {}) {
+  const palette = opts.palette ?? "DAY";
+  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({
+      id: "chrtbase-inland-hatch",
+      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
+    // the edge stays crisp through the texture, and BELOW the charted-water
+    // repaint clones the generator splices in after it — so wherever the
+    // chart repaints its own water, the rough NE10m line yields to the
+    // chart's COALNE instead of double-striking it.
+    //
+    // NE-tier geometry ONLY (`kind` absent): the planet detail tier joins
+    // the same source-layer from z9 as MANY polygons whose chunk-clip seams
+    // rejoin invisibly as FILLS — but a line layer strokes every seam, and
+    // Winnipesaukee rendered as a mesh of internal edges. Planet features
+    // carry `kind` (the INLAND_KINDS filter's own field); NE's carry only
+    // `name`, so the absence of `kind` IS the tier discriminator.
+    L({
+      id: "chrtbase-inland-shore",
+      type: "line",
+      source: src,
+      "source-layer": "inland_water",
+      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
+    // charted lakes the chart's own SEAARE label takes over at detail zooms
+    // and collision culls the echo.
+    //
+    // The archive's `inland_water_label` anchors (v3+). v3 shipped ONE
+    // PointOnSurface anchor per lake, and a big lake's single anchor pans
+    // off-viewport — Winnipesaukee at z11.7 read nameless with its name two
+    // tiles west of the screen (owner-reported). Labelling the polygons
+    // instead is NOT the fix: tippecanoe's coalescing drops the NE polygon
+    // from some z11 tiles (measured: 11/619/747 carries only planet pieces),
+    // so a polygon-sourced label vanishes tile by tile. v4 therefore bakes a
+    // 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",
+      source: src,
+      "source-layer": "inland_water_label",
+      minzoom: 5,
+      layout: {
+        "text-field": ["get", "name"],
+        "text-font": ["Open Sans Regular"],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 5, 9.5, 10, 12],
+        "text-max-width": 7,
+        "text-allow-overlap": false,
+        // Zoom-scaled spacing for the anchor GRID: at z8.9 the 0.08-deg
+        // anchors sit ~54 px apart and a flat padding let six copies of
+        // "Lake Ontario" crowd one screen (owner-reported 2026-08-30).
+        // Wide collision boxes at low zoom thin the grid to the repeat-
+        // by-convention cadence; by z12 the anchors are ~850 px apart and
+        // the padding relaxes to normal.
+        "text-padding": ["interpolate", ["linear"], ["zoom"], 5, 80, 9, 64, 12, 16]
+      },
+      paint: {
+        "text-color": T.inlandLabel,
+        "text-halo-color": T.inlandHalo,
+        "text-halo-width": 1.1
+      }
+    })
+  ];
 }
 
 // src/atlas/band-collapse.ts
-function collapsedDominanceGate(B, minzoom) {
-  const clauses = [NOT_DOMINATED_FILTER];
+function collapsedDominanceGate(B, minzoom, notDominatedCeiling = null) {
+  const clauses = [
+    notDominatedCeiling !== null && notDominatedCeiling > minzoom ? ["all", NOT_DOMINATED_FILTER, ["<", ["zoom"], notDominatedCeiling]] : NOT_DOMINATED_FILTER
+  ];
   const bInt = parseInt(B, 10);
   for (const D of BAND_DRAW_ORDER) {
     const dInt = parseInt(D, 10);
@@ -28698,7 +29453,7 @@ function makeCollapsedBandVariant(layer, B, isExempt) {
     filter: combineWithBandFilter(layer.filter, [
       "all",
       bandFilterExpression(B),
-      collapsedDominanceGate(B, minzoom)
+      collapsedDominanceGate(B, minzoom, generalisedAreaCeiling(layer, B))
     ]),
     minzoom
   };
@@ -28833,6 +29588,7 @@ function makeBandVariants(layer, B) {
     delete exempt.maxzoom;
     return [exempt];
   }
+  const ceiling = generalisedAreaCeiling(layer, B);
   const notDom = {
     ...layer,
     id: `${layer.id}-band${B}`,
@@ -28843,6 +29599,7 @@ function makeBandVariants(layer, B) {
     minzoom
   };
   delete notDom.maxzoom;
+  if (ceiling !== null && ceiling > minzoom) notDom.maxzoom = ceiling;
   variants.push(notDom);
   const bInt = parseInt(B, 10);
   for (const D of BAND_DRAW_ORDER) {
@@ -28865,14 +29622,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]]
 };
-function fanOrientationLabelByCellBand(label, bandFan) {
+var ORIENTATION_OPACITY_SCALE = {
+  LNDARE: 1.45,
+  LNDRGN: 1.4,
+  BUAARE: 1.25
+};
+var ORIENTATION_OPACITY_MAX = 0.92;
+var ORIENTATION_BOOST_MINZOOM = 11;
+function fanOrientationLabelByCellBand(label, bandFan, objectClass) {
   const cellBandExpr = [
     "slice",
     ["coalesce", ["get", "_cell_id"], "??9???"],
@@ -28880,11 +29644,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]
@@ -28931,6 +29699,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)
@@ -28992,13 +29787,45 @@ function generateStyle(palette = "DAY", opts = {}) {
     paint: { "background-color": resolveColor("NODTA", palette) }
   };
   const layers = [backgroundLayer];
+  if (opts.base) {
+    const base = baseLayers({ palette });
+    const coverageGround = {
+      id: "s52-coverage-ground",
+      type: "fill",
+      source: sourceId,
+      "source-layer": "M_COVR",
+      filter: [
+        "all",
+        ["any", ["==", ["geometry-type"], "Polygon"], ["==", ["geometry-type"], "MultiPolygon"]],
+        ["==", ["to-number", ["coalesce", ["get", "CATCOV"], 0]], 1]
+      ],
+      paint: { "fill-color": resolveColor("DEPDW", palette) },
+      metadata: { "s52:objectClass": "M_COVR", "s52:role": "coverage-ground" }
+    };
+    const jurisdictionAt = base.findIndex(
+      (l) => l.id === "chrtbase-jurisdiction"
+    );
+    if (jurisdictionAt === -1) {
+      layers.push(...base, coverageGround);
+    } else {
+      layers.push(
+        ...base.slice(0, jurisdictionAt),
+        coverageGround,
+        ...base.slice(jurisdictionAt)
+      );
+    }
+  }
   if (opts.land) {
     layers.push(...landLayers({
       palette,
       ...opts.relief ? { relief: true } : {}
     }));
   }
+  if (opts.base) {
+    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";
@@ -29114,13 +29941,44 @@ function generateStyle(palette = "DAY", opts = {}) {
         }
       }
     }
+    {
+      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") {
       labelLayers.push(...buildPlaceNameLayers(sourceId));
     } else {
       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));
         }
       }
     }
@@ -29129,7 +29987,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;
@@ -29138,18 +30001,121 @@ function generateStyle(palette = "DAY", opts = {}) {
         labelLayers.push(...emitBand(label, code));
       }
     }
+    if (!majorsEmitted) labelLayers.push(...majorWaterLayers);
     layers.push(...labelLayers);
   }
   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 isWaterBaseFill = (l) => /^s52-(DEPARE|DRGARE|UNSARE)-fill-band\d+$/.test(l.id);
+  const bandOf = (l) => {
+    const m = /-band(\d+)$/.exec(l.id);
+    return m ? Number(m[1]) : 0;
+  };
   const emitted = opts.land ? (() => {
-    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)];
+    const relocated = layers.filter((l) => isLndareFill(l) || isWaterBaseFill(l));
+    const others = layers.filter((l) => !isLndareFill(l) && !isWaterBaseFill(l));
+    const isSeaareFill = (l) => /^s52-SEAARE-fill-band\d+$/.test(l.id);
+    const seaare = others.filter(isSeaareFill);
+    const rest = others.filter((l) => !isSeaareFill(l));
+    const isBaseLayer = (l) => {
+      const id = l.id;
+      if (id.startsWith("chrtbase-inland-")) return false;
+      return id.startsWith("chrtbase-") || id === "s52-coverage-ground";
+    };
+    const baseBlock = rest.filter(isBaseLayer);
+    const restAbove = rest.filter((l) => !isBaseLayer(l));
+    const bands = [...new Set(relocated.map(bandOf))].sort((a, b) => a - b);
+    const oneTan = landBaseColor(palette);
+    const asBaseTan = (l) => ({
+      ...l,
+      paint: {
+        ...l.paint ?? {},
+        "fill-color": oneTan
+      }
+    });
+    const ordered = [];
+    for (const b of bands) {
+      ordered.push(...relocated.filter((l) => bandOf(l) === b && isWaterBaseFill(l)));
+      ordered.push(...relocated.filter((l) => bandOf(l) === b && isLndareFill(l)).map(asBaseTan));
+    }
+    const findRest = (id) => restAbove.findIndex((l) => l.id === id);
+    const shoreAt = findRest("chrtbase-inland-shore");
+    const pairAt = shoreAt !== -1 ? shoreAt : findRest("chrtbase-inland-hatch");
+    let restFinal = restAbove;
+    if (pairAt !== -1) {
+      const repaint = [];
+      for (const b of bands) {
+        for (const l of relocated.filter((x) => bandOf(x) === b && isWaterBaseFill(x))) {
+          const src = l;
+          const meta = { ...src.metadata ?? {}, "chrt:role": "charted-water-repaint" };
+          const notDom = {
+            ...l,
+            id: `${src.id}-overpair`,
+            filter: ["all", src.filter, NOT_DOMINATED_FILTER],
+            metadata: meta
+          };
+          delete notDom.maxzoom;
+          delete notDom.minzoom;
+          repaint.push(notDom);
+          for (const D of BAND_DRAW_ORDER) {
+            if (parseInt(D, 10) <= b) continue;
+            const dMaxzoom = dominatedVariantMaxzoom(D);
+            if (dMaxzoom <= 0) continue;
+            const domVariant = {
+              ...l,
+              id: `${src.id}-overpair-domBy${D}`,
+              filter: ["all", src.filter, dominatedByMinFilter(D)],
+              metadata: meta,
+              maxzoom: dMaxzoom
+            };
+            delete domVariant.minzoom;
+            repaint.push(domVariant);
+          }
+        }
+      }
+      const isCoalneLine = (l) => /^s52-COALNE-line-band\d(-domBy\d)?$/.test(l.id);
+      for (const l of layers.filter(isCoalneLine)) {
+        const src = l;
+        const meta = { ...src.metadata ?? {}, "chrt:role": "charted-water-repaint" };
+        const banded = {
+          ...l,
+          id: `${src.id}-overpair`,
+          metadata: meta,
+          minzoom: 9
+        };
+        repaint.push(banded);
+        const terminal = {
+          ...l,
+          id: `${src.id}-overpair-terminal`,
+          filter: ["all", src.filter, ["==", ["get", "_terminal_shore"], true]],
+          metadata: meta
+        };
+        delete terminal.minzoom;
+        terminal.maxzoom = 9;
+        repaint.push(terminal);
+      }
+      restFinal = [
+        ...restAbove.slice(0, pairAt + 1),
+        ...repaint,
+        ...restAbove.slice(pairAt + 1)
+      ];
+    }
+    return [restFinal[0], ...baseBlock, ...seaare, ...ordered, ...restFinal.slice(1)];
   })() : layers;
+  for (const id of [
+    "chrtbase-country-boundary",
+    "chrtland-town-port",
+    "chrtland-city-major"
+  ]) {
+    const at = emitted.findIndex(
+      (l) => l.id === id
+    );
+    if (at !== -1) {
+      const [layer] = emitted.splice(at, 1);
+      emitted.push(layer);
+    }
+  }
   const style = {
     version: 8,
     name: `CHRT ${SYMBOL_SET_LABELS[symbolSet]} ${PALETTE_NAMES[palette]}${opts.chartMode ? ` \u2014 chart:${opts.chartMode.band}` : ""}`,
@@ -29161,6 +30127,7 @@ function generateStyle(palette = "DAY", opts = {}) {
       "chrt:layer-count": emitted.length,
       "chrt:land": Boolean(opts.land),
       "chrt:relief": Boolean(opts.relief),
+      "chrt:base": Boolean(opts.base),
       "chrt:render-mode": opts.chartMode ? `chart:${opts.chartMode.band}` : "continuous",
       "chrt:description": "IHO S-52 portrayal rules for Electronic Navigational Charts (ENCs). Generated from the CHRT atlas engine."
     },
@@ -29654,6 +30621,7 @@ var Chrt = class {
   interact;
   featuresEp;
   searchEp;
+  poiEp;
   queryEp;
   http;
   tileAuth;
@@ -29675,6 +30643,7 @@ var Chrt = class {
     this.weather = new WeatherEndpoint(this.http);
     this.featuresEp = new FeaturesEndpoint(this.http);
     this.searchEp = new SearchEndpoint(this.http);
+    this.poiEp = new PoiEndpoint(this.http);
     this.queryEp = new QueryEndpoint(this.http);
     this.offline = new OfflineEndpoint(this.http, config.deviceId, config.manifestPath);
     this.interact = new InteractClient(this.http);
@@ -29710,6 +30679,26 @@ var Chrt = class {
   async search(options) {
     return this.searchEp.find(options);
   }
+  /**
+   * CHRTpoi — charted marine facilities in a viewport or radius.
+   *
+   * v1 serves marinas, derived from the ENC's own HRBFAC facility class —
+   * the chart's data, with the source cell's currency inline per POI.
+   *
+   * ```ts
+   * const { pois, coverage } = await chrt.pois({ bbox: [-70.7, 41.4, -70.5, 41.6] });
+   * ```
+   *
+   * **Read `coverage.state` before interpreting an empty list.** `covered` +
+   * empty means no marinas are charted there — a real answer. `none` means
+   * CHRT cannot answer for that area at all, and an empty list means nothing.
+   * The two must never be shown the same way, and `coverage.message` is
+   * written to be relayed unedited. Metered on its own allowance
+   * (`poi_called`), separate from features and search; not gated by tier.
+   */
+  async pois(options) {
+    return this.poiEp.list(options);
+  }
   /** Spatial proximity query around a point */
   async query(options) {
     return this.queryEp.nearby(options);
@@ -29880,6 +30869,18 @@ var Chrt = class {
     return generateStyle(palette, {
       region: this.region,
       tileBaseUrl: this.tileBaseUrl,
+      // Pin each source's tile URL to the build it serves, from whatever the
+      // token cache already holds. Without a discriminator one URL is shared
+      // by every build, so after a cutover a map keeps painting already-fetched
+      // tiles from the OLD build beside newly-fetched ones from the new.
+      //
+      // BEFORE the spread, so an explicit `buildTags` wins — and only ever a
+      // warm-cache read: this method is synchronous and must not mint. A cold
+      // cache yields `{}`, i.e. exactly the URLs this SDK emitted before the
+      // discriminator existed. Warm it with `chrt.transformRequest()` (which
+      // kicks off a mint) or `await chrt.styleUrl()`; `await chrt.warmTiles()`
+      // is the explicit form, and it returns the map.
+      buildTags: this.tileAuth.peekBuildTags(this.region),
       ...styleOpts,
       // The vessel's safety depth IS the style's safety contour — same number, same
       // meaning. Threading it here is what stops the chart shading at one depth while
@@ -29953,9 +30954,21 @@ var Chrt = class {
    * Pre-mint the tile token for a region. Optional — `transformRequest()` warms
    * the cache automatically — but useful if you want to surface a mint error
    * (e.g. `region_not_licensed`, `tile_quota_exceeded`) before the map loads.
+   *
+   * Returns what it minted, so a caller building its own sources can take the
+   * `buildTags` map straight from here:
+   *
+   * ```ts
+   * const { buildTags } = await chrt.warmTiles();
+   * map.addSource("chrt", buildSources({ region: "NOAA_ENC", buildTags })["NOAA_ENC"]);
+   * ```
+   *
+   * That pins each tile URL to the build it serves, so a build cutover gets its
+   * own client cache namespace instead of leaving old and new tiles mixed on
+   * screen. `chrt.style()` reads the same cache and needs no argument.
    */
   async warmTiles(region) {
-    await this.tileAuth.getToken(region);
+    return this.tileAuth.getToken(region);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -29966,9 +30979,13 @@ var Chrt = class {
   ATON_EXPRESSION_CLASSES,
   BAND_DRAW_ORDER,
   BAND_PRIORITY_RANGES,
+  BASE_MAXZOOM,
+  BASE_MINZOOM,
+  BASE_REGION,
   BRIDGE_QUERY_LAYERS,
   BUILD_MAXZOOM,
   BUILD_MINZOOM,
+  BUILD_PARAM,
   CHART_BAND_CODES,
   CHART_CASCADE_CODES,
   CHART_SECTIONS,
@@ -30150,6 +31167,7 @@ var Chrt = class {
   scaleSizeValue,
   scaminToMinZoom,
   styleModeBand,
+  tileTemplate,
   withinBboxFilter,
   worldMinusBboxPolygon
 });