@chrtco/sdk 0.10.29 → 0.10.31

package/dist/index.cjs

@@ -28842,328 +28842,12 @@ function worldMinusBboxPolygon(bbox) {
   };
 }
 
-// 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 = [
-    // 1. The land itself — LNDARE ∩ coverage, so it can never outrun the chart.
-    L({
-      id: "chrtland-base",
-      type: "fill",
-      source: src,
-      "source-layer": "land_base",
-      paint: { "fill-color": T.base }
-    })
-  ];
-  layers.push(L({
-    id: "chrtland-cover",
-    type: "fill",
-    source: src,
-    "source-layer": "land_cover",
-    filter: ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]],
-    paint: {
-      "fill-color": [
-        "match",
-        ["get", "class"],
-        "wood",
-        T.cover.wood,
-        "wetland",
-        T.cover.wetland,
-        "urban",
-        T.cover.urban,
-        "sand",
-        T.cover.sand,
-        T.base
-      ],
-      "fill-opacity": 0.85
-    }
-  }));
-  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,
-      paint: {
-        "hillshade-exaggeration": T.exaggeration,
-        "hillshade-shadow-color": T.shadow,
-        "hillshade-highlight-color": T.highlight,
-        "hillshade-accent-color": T.shadow
-      }
-    }));
-  }
-  const isIndexContour = [
-    "any",
-    ["<=", ["coalesce", ["get", "index_z"], 99], ["zoom"]],
-    ["==", ["get", "is_index"], 1]
-  ];
-  layers.push(L({
-    id: "chrtland-contour",
-    type: "line",
-    source: src,
-    "source-layer": "land_contour",
-    filter: ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]],
-    paint: {
-      "line-color": ["case", isIndexContour, T.contourIndex, T.contour],
-      "line-width": ["case", isIndexContour, 0.8, 0.4],
-      "line-opacity": 0.7
-    }
-  }));
-  const d = FADE_PX / 2 / FADE_BANDS;
-  for (let k = 0; k < FADE_BANDS; k++) {
-    const width = k === 0 ? { "line-width": 2 * d } : { "line-width": d, "line-gap-width": 2 * k * d };
-    layers.push(L({
-      id: `chrtland-fade-${k}`,
-      type: "line",
-      source: src,
-      "source-layer": "land_edge",
-      layout: { "line-join": "bevel" },
-      paint: { "line-color": T.fade, "line-blur": 0, "line-opacity": fadeAlpha(k * d + d / 2), ...width }
-    }));
-  }
-  layers.push(L({
-    id: "chrtland-road",
-    type: "line",
-    source: src,
-    "source-layer": "land_road",
-    minzoom: 10,
-    paint: {
-      "line-color": ["match", ["get", "kind"], "highway", T.roadMajor, T.road],
-      "line-width": [
-        "interpolate",
-        ["linear"],
-        ["zoom"],
-        10,
-        ["match", ["get", "kind"], "highway", 0.8, 0.4],
-        14,
-        ["match", ["get", "kind"], "highway", 2.4, 1.2]
-      ],
-      "line-opacity": 0.8
-    }
-  }));
-  layers.push(L({
-    id: "chrtland-city-major",
-    type: "symbol",
-    source: src,
-    "source-layer": "land_town",
-    minzoom: 6.5,
-    filter: [">=", ["coalesce", ["get", "prank"], 0], 10],
-    layout: {
-      "text-field": [
-        "case",
-        ["==", ["get", "upcase"], true],
-        ["upcase", ["get", "name"]],
-        ["get", "name"]
-      ],
-      "text-font": FONT,
-      "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": 10,
-      "text-allow-overlap": false,
-      "symbol-sort-key": ["*", -1, ["coalesce", ["get", "pop"], 0]]
-    },
-    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.6 }
-  }));
-  layers.push(L({
-    id: "chrtland-town-port",
-    type: "symbol",
-    source: src,
-    "source-layer": "land_town",
-    minzoom: 8.5,
-    filter: [
-      "all",
-      ["==", ["get", "enc_dup"], true],
-      ["<", ["coalesce", ["get", "prank"], 0], 10]
-    ],
-    layout: {
-      "text-field": ["get", "name"],
-      "text-font": FONT,
-      "text-size": ["interpolate", ["linear"], ["zoom"], 8.5, 11, 12, 13.5],
-      "text-offset": anchorOffset(0.75),
-      "text-anchor": ANCHOR,
-      "text-padding": 8,
-      "text-allow-overlap": false,
-      // 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.4 }
-  }));
-  layers.push(L({
-    id: "chrtland-town",
-    type: "symbol",
-    source: src,
-    "source-layer": "land_town",
-    minzoom: 9,
-    filter: [
-      "all",
-      FITS,
-      ["<", ["coalesce", ["get", "prank"], 0], 10],
-      ["!=", ["get", "enc_dup"], true]
-    ],
-    layout: {
-      "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": 6,
-      "text-allow-overlap": false,
-      "symbol-sort-key": 2
-    },
-    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
-  }));
-  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 layers;
-}
-
 // src/atlas/base-layers.ts
 var NOCOVERAGE_PATTERN = "chrt:hatch-nocoverage";
 var UNCHARTED_PATTERN = "chrt:hatch-uncharted";
+function inlandWaterColor(palette) {
+  return (BASE_THEMES[palette] ?? BASE_THEMES.DAY).inlandWater;
+}
 var BASE_THEMES = {
   DAY: {
     // ── `earth` is the jurisdiction tan DIMMED (~0.55), not a blue-grey ──
@@ -29182,7 +28866,7 @@ var BASE_THEMES = {
     water: "#1B2328",
     river: "#24313A",
     boundary: "#4A575E",
-    jurisdiction: "#E8D9B0",
+    jurisdiction: "#D4C69D",
     // CHRTland's own tan — one land colour
     inlandWater: "#B9CFDD",
     // muted, unmistakably not a charted blue
@@ -29190,9 +28874,9 @@ var BASE_THEMES = {
     // 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",
+    stateLine: "#B1A077",
     stateLabel: "#8E8468",
-    stateHalo: "#E8D9B0",
+    stateHalo: "#D4C69D",
     // 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.
@@ -29570,29 +29254,357 @@ function baseInlandWaterLayers(opts = {}) {
       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]
-      },
+      "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/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 === "chrtland-water" || id.startsWith("chrtland-fade-");
+var isLandGroundOverlay = (id) => LAND_SURFACE_LAYERS(id) && id !== "chrtland-base" || id === "chrtland-road";
+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: "#d4c69d",
+    cover: { wood: "#bcc5a1", wetland: "#b6c0b1", urban: "#cac6bf", sand: "#dbd0af" },
+    contour: "#958666",
+    contourIndex: "#78694b",
+    road: "#c5b691",
+    roadMajor: "#beaa7c",
+    label: "#5b4f3a",
+    halo: "#ded6c3",
+    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 = [
+    // 1. The land itself — LNDARE ∩ coverage, so it can never outrun the chart.
+    L({
+      id: "chrtland-base",
+      type: "fill",
+      source: src,
+      "source-layer": "land_base",
+      paint: { "fill-color": T.base }
+    })
+  ];
+  layers.push(L({
+    id: "chrtland-cover",
+    type: "fill",
+    source: src,
+    "source-layer": "land_cover",
+    filter: ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]],
+    paint: {
+      "fill-color": [
+        "match",
+        ["get", "class"],
+        "wood",
+        T.cover.wood,
+        "wetland",
+        T.cover.wetland,
+        "urban",
+        T.cover.urban,
+        "sand",
+        T.cover.sand,
+        T.base
+      ],
+      "fill-opacity": 0.85
+    }
+  }));
+  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,
       paint: {
-        "text-color": T.inlandLabel,
-        "text-halo-color": T.inlandHalo,
-        "text-halo-width": 1.1
+        "hillshade-exaggeration": T.exaggeration,
+        "hillshade-shadow-color": T.shadow,
+        "hillshade-highlight-color": T.highlight,
+        "hillshade-accent-color": T.shadow
       }
-    })
+    }));
+  }
+  const isIndexContour = [
+    "any",
+    ["<=", ["coalesce", ["get", "index_z"], 99], ["zoom"]],
+    ["==", ["get", "is_index"], 1]
   ];
+  layers.push(L({
+    id: "chrtland-contour",
+    type: "line",
+    source: src,
+    "source-layer": "land_contour",
+    filter: ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]],
+    paint: {
+      "line-color": ["case", isIndexContour, T.contourIndex, T.contour],
+      "line-width": ["case", isIndexContour, 0.8, 0.4],
+      "line-opacity": 0.7
+    }
+  }));
+  layers.push(L({
+    id: "chrtland-water",
+    type: "fill",
+    source: src,
+    "source-layer": "land_water",
+    filter: ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]],
+    paint: { "fill-color": inlandWaterColor(palette) }
+  }));
+  const d = FADE_PX / 2 / FADE_BANDS;
+  for (let k = 0; k < FADE_BANDS; k++) {
+    const width = k === 0 ? { "line-width": 2 * d } : { "line-width": d, "line-gap-width": 2 * k * d };
+    layers.push(L({
+      id: `chrtland-fade-${k}`,
+      type: "line",
+      source: src,
+      "source-layer": "land_edge",
+      layout: { "line-join": "bevel" },
+      paint: { "line-color": T.fade, "line-blur": 0, "line-opacity": fadeAlpha(k * d + d / 2), ...width }
+    }));
+  }
+  layers.push(L({
+    id: "chrtland-road",
+    type: "line",
+    source: src,
+    "source-layer": "land_road",
+    minzoom: 10,
+    paint: {
+      "line-color": ["match", ["get", "kind"], "highway", T.roadMajor, T.road],
+      "line-width": [
+        "interpolate",
+        ["linear"],
+        ["zoom"],
+        10,
+        ["match", ["get", "kind"], "highway", 0.8, 0.4],
+        14,
+        ["match", ["get", "kind"], "highway", 2.4, 1.2]
+      ],
+      "line-opacity": 0.8
+    }
+  }));
+  layers.push(L({
+    id: "chrtland-city-major",
+    type: "symbol",
+    source: src,
+    "source-layer": "land_town",
+    minzoom: 6.5,
+    filter: [">=", ["coalesce", ["get", "prank"], 0], 10],
+    layout: {
+      "text-field": [
+        "case",
+        ["==", ["get", "upcase"], true],
+        ["upcase", ["get", "name"]],
+        ["get", "name"]
+      ],
+      "text-font": FONT,
+      "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": 10,
+      "text-allow-overlap": false,
+      "symbol-sort-key": ["*", -1, ["coalesce", ["get", "pop"], 0]]
+    },
+    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.6 }
+  }));
+  layers.push(L({
+    id: "chrtland-town-port",
+    type: "symbol",
+    source: src,
+    "source-layer": "land_town",
+    minzoom: 8.5,
+    filter: [
+      "all",
+      ["==", ["get", "enc_dup"], true],
+      ["<", ["coalesce", ["get", "prank"], 0], 10]
+    ],
+    layout: {
+      "text-field": ["get", "name"],
+      "text-font": FONT,
+      "text-size": ["interpolate", ["linear"], ["zoom"], 8.5, 11, 12, 13.5],
+      "text-offset": anchorOffset(0.75),
+      "text-anchor": ANCHOR,
+      "text-padding": 8,
+      "text-allow-overlap": false,
+      // 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.4 }
+  }));
+  layers.push(L({
+    id: "chrtland-town",
+    type: "symbol",
+    source: src,
+    "source-layer": "land_town",
+    minzoom: 9,
+    filter: [
+      "all",
+      FITS,
+      ["<", ["coalesce", ["get", "prank"], 0], 10],
+      ["!=", ["get", "enc_dup"], true]
+    ],
+    layout: {
+      "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": 6,
+      "text-allow-overlap": false,
+      "symbol-sort-key": 2
+    },
+    paint: { "text-color": T.label, "text-halo-color": T.halo, "text-halo-width": 1.2 }
+  }));
+  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 layers;
 }
 
 // src/atlas/band-collapse.ts
@@ -30295,21 +30307,37 @@ function generateStyle(palette = "DAY", opts = {}) {
       ];
     }
     {
-      const hsAt = restFinal.findIndex(
-        (l) => l.type === "hillshade"
-      );
+      const assembled = [
+        restFinal[0],
+        ...baseBlock,
+        ...seaare,
+        ...ordered,
+        ...restFinal.slice(1)
+      ];
+      const idOf = (l) => l.id;
+      const isRepaint = (l) => /-overpair(-|$)/.test(idOf(l));
       let lastRepaint = -1;
-      restFinal.forEach((l, i) => {
-        if (/-overpair(-|$)/.test(l.id)) lastRepaint = i;
+      assembled.forEach((l, i) => {
+        if (isRepaint(l)) lastRepaint = i;
       });
-      if (hsAt !== -1 && lastRepaint > hsAt) {
-        const reordered = [...restFinal];
-        const [hs] = reordered.splice(hsAt, 1);
-        reordered.splice(lastRepaint, 0, hs);
-        restFinal = reordered;
-      }
+      if (lastRepaint === -1) return assembled;
+      const surface = [];
+      const kept = [];
+      assembled.forEach((l, i) => {
+        if (i < lastRepaint && isLandGroundOverlay(idOf(l))) surface.push(l);
+        else kept.push(l);
+      });
+      if (surface.length === 0) return assembled;
+      let landing = -1;
+      kept.forEach((l, i) => {
+        if (isRepaint(l)) landing = i;
+      });
+      return [
+        ...kept.slice(0, landing + 1),
+        ...surface,
+        ...kept.slice(landing + 1)
+      ];
     }
-    return [restFinal[0], ...baseBlock, ...seaare, ...ordered, ...restFinal.slice(1)];
   })() : layers;
   for (const id of [
     "chrtbase-country-boundary",