@chrtco/sdk 0.7.4 → 0.7.6

package/dist/index.cjs

@@ -3248,18 +3248,37 @@ function depareFillExpression(ct = "DAY") {
     resolveColor("DEPDW", ct)
   ];
 }
-function colourCodeCase(cases, fallback) {
-  const colourStr = ["to-string", ["coalesce", ["get", "COLOUR"], ["get", "colour"], ""]];
+function listAttrString(attr) {
+  return ["to-string", ["coalesce", ["get", attr], ["get", attr.toLowerCase()], ""]];
+}
+function listAttrCase(attr, cases, fallback) {
+  const attrStr = listAttrString(attr);
   const expr = ["case"];
   for (const [code, value] of cases) {
-    expr.push([">=", ["index-of", `"${code}"`, colourStr], 0], value);
+    expr.push([">=", ["index-of", `"${code}"`, attrStr], 0], value);
+  }
+  for (const [code, value] of cases) {
+    expr.push(["==", attrStr, code], value);
   }
   for (const [code, value] of cases) {
-    expr.push(["==", colourStr, code], value);
+    expr.push(["==", attrStr, `[${code}]`], value);
   }
   expr.push(fallback);
   return expr;
 }
+function listAttrHas(attr, codes) {
+  const attrStr = listAttrString(attr);
+  const clauses = [];
+  for (const code of codes) {
+    clauses.push([">=", ["index-of", `"${code}"`, attrStr], 0]);
+    clauses.push(["==", attrStr, code]);
+    clauses.push(["==", attrStr, `[${code}]`]);
+  }
+  return ["any", ...clauses];
+}
+function colourCodeCase(cases, fallback) {
+  return listAttrCase("COLOUR", cases, fallback);
+}
 function lightColor(props, ct = "DAY") {
   const raw = props.COLOUR ?? props.colour;
   const code = Array.isArray(raw) ? Number(raw[0]) : typeof raw === "string" && raw.startsWith("[") ? Number(JSON.parse(raw)[0]) : Number(raw ?? 0);
@@ -5298,7 +5317,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Church spire or steeple, conspicuous from seaward. Useful for visual fixing.",
     s52PlRef: "LNDMRK17",
     attributeKey: "CATLMK",
-    attributeValue: 17,
+    attributeValue: 20,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Spire, building, position circle" }],
     lineStyles: [{ element: "Building outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5315,7 +5334,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Tower conspicuous from seaward. General-purpose landmark symbol.",
     s52PlRef: "LNDMRK20",
     attributeKey: "CATLMK",
-    attributeValue: 20,
+    attributeValue: 17,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower body, cap, position circle" }],
     lineStyles: [{ element: "Tower outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5332,7 +5351,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Industrial chimney or smokestack visible from the sea.",
     s52PlRef: "LNDMRK01",
     attributeKey: "CATLMK",
-    attributeValue: 1,
+    attributeValue: 3,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Chimney body, smoke, position circle" }],
     lineStyles: [{ element: "Body outline", width: 0.8, color: "#000000" }, { element: "Smoke plume", width: 1, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5349,7 +5368,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Flagstaff or flagpole conspicuous from seaward.",
     s52PlRef: "LNDMRK03",
     attributeKey: "CATLMK",
-    attributeValue: 3,
+    attributeValue: 5,
     renderSize: "32x32",
     colors: [
       { token: "CHBLK", hex: "#000000", usage: "Pole and position circle" },
@@ -5369,7 +5388,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Monument or memorial conspicuous from the sea.",
     s52PlRef: "LNDMRK05",
     attributeKey: "CATLMK",
-    attributeValue: 5,
+    attributeValue: 9,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Monument body, base, position circle" }],
     lineStyles: [{ element: "Body outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5384,9 +5403,9 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkWindmill,
     group: "landmarks",
     description: "Traditional windmill with rotating vanes. Conspicuous landmark.",
-    s52PlRef: "LNDMRK21",
+    s52PlRef: "WNDMIL12",
     attributeKey: "CATLMK",
-    attributeValue: 7,
+    attributeValue: 18,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, vanes, hub, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Vane arms", width: 1.2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5401,9 +5420,9 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkWindTurbine,
     group: "landmarks",
     description: "Modern 3-blade wind turbine. Increasingly common offshore landmark.",
-    s52PlRef: "LNDMRK22",
+    s52PlRef: "WIMCON11",
     attributeKey: "CATLMK",
-    attributeValue: 26,
+    attributeValue: 19,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, blades, hub, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Blades", width: 1.2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5420,7 +5439,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Dome or cupola (e.g., observatory, mosque) visible from the sea.",
     s52PlRef: "LNDMRK03",
     attributeKey: "CATLMK",
-    attributeValue: 6,
+    attributeValue: 15,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Dome, base, position circle" }],
     lineStyles: [{ element: "Base outline", width: 0.8, color: "#000000" }, { element: "Dome curve", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5437,7 +5456,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Radar scanner antenna conspicuous from seaward.",
     s52PlRef: "LNDMRK12",
     attributeKey: "CATLMK",
-    attributeValue: 9,
+    attributeValue: 16,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, scanner dish, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Scanner frame", width: 1.5, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5454,7 +5473,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Satellite dish or parabolic antenna visible from the sea.",
     s52PlRef: "LNDMRK12",
     attributeKey: "CATLMK",
-    attributeValue: 12,
+    attributeValue: 4,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, dish, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Dish curve", width: 1.5, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5469,9 +5488,9 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkWaterTower,
     group: "landmarks",
     description: "Water tower. Elevated tank on supporting structure, conspicuous landmark.",
-    s52PlRef: "LNDMRK19",
-    attributeKey: "CATLMK",
-    attributeValue: 15,
+    s52PlRef: "TOWERS12",
+    attributeKey: "CATSIL",
+    attributeValue: 4,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tank, legs, position circle" }],
     lineStyles: [{ element: "Leg outlines", width: 1.2, color: "#000000" }, { element: "Tank outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5488,7 +5507,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Radio or television transmission mast with horizontal cross-arms.",
     s52PlRef: "LNDMRK10",
     attributeKey: "CATLMK",
-    attributeValue: 8,
+    attributeValue: 7,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Mast, cross-arms, top, position circle" }],
     lineStyles: [{ element: "Main mast", width: 1.5, color: "#000000" }, { element: "Cross-arms", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5505,7 +5524,7 @@ var NAUTICAL_SYMBOLS = [
     description: "Religious cross or calvary conspicuous from seaward.",
     s52PlRef: "LNDMRK05",
     attributeKey: "CATLMK",
-    attributeValue: 10,
+    attributeValue: 14,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Cross arms and position circle" }],
     lineStyles: [{ element: "Vertical arm", width: 2, color: "#000000" }, { element: "Horizontal arm", width: 2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5522,7 +5541,7 @@ var NAUTICAL_SYMBOLS = [
     description: "General mast (not radio/TV). Pole with spherical top.",
     s52PlRef: "LNDMRK10",
     attributeKey: "CATLMK",
-    attributeValue: 14,
+    attributeValue: 7,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Mast pole, top ball, position circle" }],
     lineStyles: [{ element: "Mast pole", width: 2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5537,9 +5556,9 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkSilo,
     group: "landmarks",
     description: "Silo, grain elevator, or storage tank conspicuous from the sea.",
-    s52PlRef: "LNDMRK17",
-    attributeKey: "CATLMK",
-    attributeValue: 33,
+    s52PlRef: "SILBUI01",
+    attributeKey: "CATSIL",
+    attributeValue: 1,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Body, dome top, position circle" }],
     lineStyles: [{ element: "Body outline", width: 0.8, color: "#000000" }, { element: "Dome curve", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5941,27 +5960,18 @@ function getIconExpression(layerName) {
     ];
   }
   if (layerName === "LNDMRK") {
-    return [
-      "match",
-      ["coalesce", ["get", "CATLMK"], ["get", "catlmk"], 0],
-      1,
-      "CAIRNS11",
-      // Cairn
-      17,
-      "BCNTOW01",
-      // Tower
-      18,
-      "LNDMRK18",
+    return listAttrCase("CATLMK", [
+      ["18", "LNDMRK18"],
       // Windmill (4-vane)
-      19,
-      "LNDMRK19",
+      ["19", "LNDMRK19"],
       // Wind motor / turbine (3-blade)
-      20,
-      "BCNTOW01",
+      ["1", "CAIRNS11"],
+      // Cairn
+      ["17", "BCNTOW01"],
+      // Tower
+      ["20", "BCNTOW01"]
       // Spire → tower
-      "BCNTOW01"
-      // Default: tower
-    ];
+    ], "BCNTOW01");
   }
   if (layerName === "DAYMAR") {
     return [
@@ -6101,18 +6111,12 @@ function getIconExpression(layerName) {
     ];
   }
   if (layerName === "LIGHTS") {
-    return [
-      "match",
-      ["coalesce", ["get", "CATLIT"], ["get", "catlit"], 0],
-      8,
-      "LIGHTS82",
-      // Aero light
-      9,
-      "LIGHTS82",
-      // Air obstruction light
-      "LIGHTS11"
-      // Default: major light
-    ];
+    return listAttrCase("CATLIT", [
+      ["8", "LIGHTS82"],
+      // Floodlight
+      ["9", "LIGHTS82"]
+      // Strip light
+    ], "LIGHTS11");
   }
   return SYMBOL_MAP[layerName] ?? "";
 }
@@ -6463,30 +6467,141 @@ function buildSeabedLabelExpression() {
   const natsurJoined = ["slice", natsurParts, 1];
   return ["concat", natquaPrefix, natsurJoined];
 }
+function underseaFeatureNameMatch(objnam) {
+  const terms = [
+    "Canyon",
+    "Seamount",
+    "Ridge",
+    "Basin",
+    "Swell",
+    "Knoll",
+    "Shoal",
+    "Ledge",
+    "Bank",
+    "Valley",
+    "Spur",
+    "Escarpment"
+  ];
+  return ["any", ...terms.map((t) => [">=", ["index-of", t, objnam], 0])];
+}
+var CATSEA_RELIEF_CODES = [
+  2,
+  // gat
+  3,
+  // bank
+  4,
+  // deep
+  6,
+  // trench
+  7,
+  // basin
+  8,
+  // mud flats
+  9,
+  // reef
+  10,
+  // ledge
+  11,
+  // canyon
+  13,
+  // shoal
+  14,
+  // knoll
+  15,
+  // ridge
+  16,
+  // seamount
+  17,
+  // pinnacle
+  18,
+  // abyssal plain
+  19,
+  // plateau
+  20,
+  // spur
+  21,
+  // shelf
+  22,
+  // trough
+  23,
+  // saddle
+  24,
+  // abyssal hills
+  25,
+  // apron
+  26,
+  // archipelagic apron
+  27,
+  // borderland
+  28,
+  // continental margin
+  29,
+  // continental rise
+  30,
+  // escarpment
+  31,
+  // fan
+  32,
+  // fracture zone
+  33,
+  // gap
+  34,
+  // guyot
+  35,
+  // hill
+  36,
+  // hole
+  37,
+  // hollow
+  39,
+  // levee
+  40,
+  // median valley
+  41,
+  // moat
+  42,
+  // mountains
+  43,
+  // peak
+  44,
+  // province
+  45,
+  // rise
+  47,
+  // seamount chain
+  48,
+  // shelf-edge
+  49,
+  // sill
+  50,
+  // slope
+  51,
+  // terrace
+  52
+  // valley
+];
 function buildSeaAreaTierExpression() {
-  const catsea = ["coalesce", ["get", "CATSEA"], ["get", "catsea"], 0];
+  const catsea = ["to-number", ["coalesce", ["get", "CATSEA"], ["get", "catsea"], 0]];
   const objnam = ["coalesce", ["get", "OBJNAM"], ""];
   return [
     "case",
-    // Tier 1 — Ocean (CATSEA=31 OR OBJNAM contains "Ocean", excluding
-    // anchorage-area-style compound names which we filter on later).
-    ["==", ["to-number", catsea], 31],
-    1,
-    ["any", ["==", ["to-number", catsea], 29], ["==", ["to-number", catsea], 30]],
-    2,
-    [
-      "any",
-      ["==", ["to-number", catsea], 4],
-      ["==", ["to-number", catsea], 11],
-      ["==", ["to-number", catsea], 27],
-      ["==", ["to-number", catsea], 28]
-    ],
-    3,
-    // Tier 4 — Anchorage detail (must be checked before OBJNAM-substring
-    // promotion so "Boston Harbor, MA …" anchorages don't bubble up).
+    // Tier 4 — Anchorage detail (before all promotions so "Boston Harbor,
+    // MA …" anchorage compound names don't bubble up).
     [">=", ["index-of", "Anchorage Area", objnam], 0],
     4,
-    // OBJNAM-substring promotion shims (run AFTER tier 4 demotion):
+    // Tier 5 — undersea relief, by authoritative CATSEA code first
+    // (Georges Bank=3, Georges Shoal=13, …), then by name for
+    // uncategorised features. Before promotion shims; see
+    // underseaFeatureNameMatch.
+    ["match", catsea, CATSEA_RELIEF_CODES, true, false],
+    5,
+    underseaFeatureNameMatch(objnam),
+    5,
+    // Tier 3 by authoritative CATSEA: bay / narrows.
+    ["match", catsea, [5, 12], true, false],
+    3,
+    // OBJNAM promotion shims (CATSEA has no ocean/sea/gulf/sound/strait
+    // codes, so names are the only signal for the headline tiers):
     [">=", ["index-of", "Atlantic Ocean", objnam], 0],
     1,
     [">=", ["index-of", "Pacific Ocean", objnam], 0],
@@ -6495,9 +6610,6 @@ function buildSeaAreaTierExpression() {
     1,
     [">=", ["index-of", "Gulf of", objnam], 0],
     2,
-    // Bay/Sound/Sea/Strait/Channel as a tier-3 shim (matches "Massachusetts
-    // Bay", "Buzzards Bay", "Long Island Sound", "Block Island Sound",
-    // "Vineyard Sound", "Cape Cod Bay", etc. without needing CATSEA).
     [">=", ["index-of", " Bay", objnam], 0],
     3,
     [">=", ["index-of", " Sound", objnam], 0],
@@ -6531,6 +6643,11 @@ function buildLandRegionTierExpression() {
   const nameLen = ["length", objnam];
   return [
     "case",
+    // NOAA also encodes undersea relief names (e.g. "Block Canyon", 12
+    // chars, no comma) as LNDRGN — without this demotion they'd qualify
+    // as tier-1 "major region" and paint at overview zoom.
+    underseaFeatureNameMatch(objnam),
+    2,
     ["all", ["<=", nameLen, 12], ["==", ["index-of", ",", objnam], -1]],
     1,
     2
@@ -6612,6 +6729,36 @@ function orientationLabelLayout(extras = {}) {
     ...extras
   };
 }
+function tieredSizeCurve(tierExpr, stops) {
+  const withHolds = [];
+  for (let i = 0; i < stops.length; i++) {
+    if (i > 0) {
+      const [pz, pv] = stops[i - 1];
+      const [nz, nv] = stops[i];
+      if (pv.some((v, t) => 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
+            )
+          ]);
+        }
+      }
+    }
+    withHolds.push(stops[i]);
+  }
+  const expr = ["interpolate", ["linear"], ["zoom"]];
+  for (const [z, vals] of withHolds) {
+    const m = ["match", tierExpr];
+    for (let t = 0; t < vals.length - 1; t++) m.push(t + 1, vals[t]);
+    m.push(vals[vals.length - 1]);
+    expr.push(z, m);
+  }
+  return expr;
+}
 var ORIENTATION_HALO_WIDTH = [
   "interpolate",
   ["linear"],
@@ -6661,6 +6808,11 @@ var LABEL_BEHAVIOR = {
 function getLabelBehavior(layerName) {
   return LABEL_BEHAVIOR[layerName] ?? "feature-band-gated";
 }
+var LABEL_ANCHOR_FILTER = [
+  "!=",
+  ["get", "_label_anchor"],
+  false
+];
 function getLabelConfig(layerName, opts = {}) {
   const ct = opts.colorTable ?? "DAY";
   switch (layerName) {
@@ -6741,35 +6893,23 @@ function getLabelConfig(layerName, opts = {}) {
     }
     case "LNDRGN": {
       const tierExpr = buildLandRegionTierExpression();
-      const sizeAt = (t1, t2) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        t2
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          5,
-          sizeAt(9, 0),
-          7,
-          sizeAt(11, 0),
-          9,
-          sizeAt(12, 0),
-          11,
-          sizeAt(12, 9),
-          13,
-          sizeAt(11, 11),
-          16,
-          sizeAt(10, 10)
-        ],
+        // Tier-1 entry moved from z5 to z7: undersea-relief names without a
+        // generic keyword ("Three Dory", "Outer Fall") can't be demoted by
+        // pattern, so the overview/general bands stay clean by holding ALL
+        // 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).
+        textSize: tieredSizeCurve(tierExpr, [
+          [5, [0, 0]],
+          [7, [11, 0]],
+          [9, [12, 0]],
+          [11, [12, 9]],
+          [13, [11, 11]],
+          [16, [10, 10]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.LAND_REGION,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -6909,19 +7049,6 @@ function getLabelConfig(layerName, opts = {}) {
     }
     case "SEAARE": {
       const tierExpr = buildSeaAreaTierExpression();
-      const sizeAt = (t1, t2, t3, t4, def) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        3,
-        t3,
-        4,
-        t4,
-        def
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
@@ -6930,26 +7057,17 @@ function getLabelConfig(layerName, opts = {}) {
         // it floods the overview with hundreds of small italic labels that
         // crowd out the headline Ocean/Sea/Gulf names. It becomes visible only
         // at approach scale (z9) when the user has zoomed in enough that
-        // individual banks are useful context.
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          3,
-          sizeAt(14, 8, 0, 0, 0),
-          5,
-          sizeAt(16, 13, 9, 0, 0),
-          7,
-          sizeAt(14, 14, 12, 0, 0),
-          9,
-          sizeAt(12, 13, 14, 0, 9),
-          11,
-          sizeAt(10, 12, 13, 0, 11),
-          13,
-          sizeAt(9, 11, 12, 10, 11),
-          16,
-          sizeAt(9, 10, 11, 11, 10)
-        ],
+        // individual banks are useful context. 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]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER_DEEP,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -6958,39 +7076,38 @@ function getLabelConfig(layerName, opts = {}) {
         minzoom: 5,
         layout: orientationLabelLayout({
           "text-letter-spacing": 0.15,
-          "text-max-width": 9
+          "text-max-width": 9,
+          // SEAARE is always-paint, unlike the other orientation classes.
+          // MapLibre places symbols topmost-layer-first, so with
+          // allow-overlap:false the dense sounding field (drawn above)
+          // collision-starves big-water names — observed on staging at z8:
+          // only 2 SEAARE labels survived viewport-wide, with Cape Cod Bay
+          // and Gulf of Maine dropped entirely. Always-paint is safe for
+          // this class because (a) the dominance composition in
+          // fanOrientationLabelByCellBand suppresses cross-band duplicate
+          // copies, and (b) tier sizing zeroes relief/anchorage names at
+          // the zooms where density is a problem. Rivers/lakes/land keep
+          // collision-dedup — their within-band multi-polygon stacking was
+          // the original complaint, and they lack big-water headline value.
+          "text-allow-overlap": true,
+          "text-ignore-placement": true,
+          "text-optional": false,
+          "text-padding": 2
         })
       };
     }
     case "LAKARE": {
       const tierExpr = buildLakeTierExpression();
-      const sizeAt = (t1, t2) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        t2
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          7,
-          sizeAt(9, 0),
-          9,
-          sizeAt(11, 0),
-          11,
-          sizeAt(11, 9),
-          13,
-          sizeAt(10, 11),
-          16,
-          sizeAt(9, 10)
-        ],
+        textSize: tieredSizeCurve(tierExpr, [
+          [7, [9, 0]],
+          [9, [11, 0]],
+          [11, [11, 9]],
+          [13, [10, 11]],
+          [16, [9, 10]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -7002,33 +7119,16 @@ function getLabelConfig(layerName, opts = {}) {
     }
     case "RIVERS": {
       const tierExpr = buildRiverTierExpression();
-      const sizeAt = (t1, t2) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        t2
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          7,
-          sizeAt(9, 0),
-          9,
-          sizeAt(11, 0),
-          11,
-          sizeAt(11, 9),
-          13,
-          sizeAt(10, 10),
-          16,
-          sizeAt(9, 10)
-        ],
+        textSize: tieredSizeCurve(tierExpr, [
+          [7, [9, 0]],
+          [9, [11, 0]],
+          [11, [11, 9]],
+          [13, [10, 10]],
+          [16, [9, 10]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -7063,35 +7163,17 @@ function getLabelConfig(layerName, opts = {}) {
       };
     case "LNDARE": {
       const tierExpr = buildLandAreaTierExpression();
-      const sizeAt = (t1, t2) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        t2
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          5,
-          sizeAt(8, 0),
-          7,
-          sizeAt(10, 0),
-          9,
-          sizeAt(11, 0),
-          11,
-          sizeAt(11, 9),
-          13,
-          sizeAt(10, 10),
-          16,
-          sizeAt(9, 10)
-        ],
+        textSize: tieredSizeCurve(tierExpr, [
+          [5, [8, 0]],
+          [7, [10, 0]],
+          [9, [11, 0]],
+          [11, [11, 9]],
+          [13, [10, 10]],
+          [16, [9, 10]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.LAND_NATURAL,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -7103,39 +7185,18 @@ function getLabelConfig(layerName, opts = {}) {
     }
     case "BUAARE": {
       const tierExpr = buildBuiltUpAreaTierExpression();
-      const sizeAt = (t1, t2, t3) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        3,
-        t3,
-        t3
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          3,
-          sizeAt(11, 0, 0),
-          5,
-          sizeAt(13, 0, 0),
-          7,
-          sizeAt(13, 9, 0),
-          9,
-          sizeAt(12, 12, 0),
-          11,
-          sizeAt(11, 12, 10),
-          13,
-          sizeAt(10, 11, 12),
-          16,
-          sizeAt(10, 10, 11)
-        ],
+        textSize: tieredSizeCurve(tierExpr, [
+          [3, [11, 0, 0]],
+          [5, [13, 0, 0]],
+          [7, [13, 9, 0]],
+          [9, [12, 12, 0]],
+          [11, [11, 12, 10]],
+          [13, [10, 11, 12]],
+          [16, [10, 10, 11]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.CITY,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -7216,33 +7277,16 @@ function getLabelConfig(layerName, opts = {}) {
       };
     case "AIRARE": {
       const tierExpr = buildAirportTierExpression();
-      const sizeAt = (t1, t2) => [
-        "match",
-        tierExpr,
-        1,
-        t1,
-        2,
-        t2,
-        t2
-      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: [
-          "interpolate",
-          ["linear"],
-          ["zoom"],
-          7,
-          sizeAt(9, 0),
-          9,
-          sizeAt(11, 0),
-          11,
-          sizeAt(11, 9),
-          13,
-          sizeAt(10, 10),
-          16,
-          sizeAt(9, 9)
-        ],
+        textSize: tieredSizeCurve(tierExpr, [
+          [7, [9, 0]],
+          [9, [11, 0]],
+          [11, [11, 9]],
+          [13, [10, 10]],
+          [16, [9, 9]]
+        ]),
         textColor: DARK_BG,
         textHaloColor: COLOR.AIRPORT,
         textHaloWidth: ORIENTATION_HALO_WIDTH,
@@ -7560,6 +7604,18 @@ function preprocessSoundings(fc) {
   }
   return { type: "FeatureCollection", features };
 }
+function firstListCode(raw) {
+  if (raw == null) return NaN;
+  if (Array.isArray(raw)) return Number(raw[0]);
+  if (typeof raw === "string" && raw.startsWith("[")) {
+    try {
+      const arr = JSON.parse(raw);
+      if (Array.isArray(arr)) return Number(arr[0]);
+    } catch {
+    }
+  }
+  return Number(raw);
+}
 function preprocessLights(fc) {
   return {
     type: "FeatureCollection",
@@ -7568,7 +7624,7 @@ function preprocessLights(fc) {
       const parts = [];
       const litchr = Number(props.LITCHR);
       if (litchr && LITCHR_ABBR[litchr]) parts.push(LITCHR_ABBR[litchr]);
-      const colour = Number(props.COLOUR);
+      const colour = firstListCode(props.COLOUR);
       if (colour && COLOUR_ABBR[colour]) parts.push(COLOUR_ABBR[colour]);
       const sigper = Number(props.SIGPER);
       if (sigper && sigper > 0) parts.push(sigper + "s");
@@ -7642,7 +7698,7 @@ function preprocessNavAids(fc) {
       const match = objnam.match(/(\d+[A-Z]?)\s*$/);
       if (!match) return f;
       const designation = match[1];
-      const colourCode = Number(props.COLOUR);
+      const colourCode = firstListCode(props.COLOUR);
       const prefix = NAV_COLOUR_PREFIX[colourCode];
       const label = prefix ? `${prefix} "${designation}"` : `"${designation}"`;
       return {
@@ -9721,23 +9777,30 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
     }
     if (objectClass === "LNDMRK" && resolved.type === "symbol") {
       const baseFilterParts = layer.filter && layer.filter[0] === "all" ? layer.filter.slice(1) : layer.filter ? [layer.filter] : [];
-      const catlmk = ["coalesce", ["get", "CATLMK"], ["get", "catlmk"], 0];
-      const isWind = ["any", ["==", catlmk, 18], ["==", catlmk, 19]];
-      const isLighthouse = ["==", catlmk, 17];
+      const isWind = listAttrHas("CATLMK", ["18", "19"]);
+      const isLighthouse = listAttrHas("CATLMK", ["17"]);
       const scaminFloor = scaminToMinZoom(entry?.scamin);
       const windLayer = {
         ...layer,
         id: `s52-${objectClass}-wind-symbol`,
-        filter: ["all", ...baseFilterParts, isWind]
+        filter: ["all", ...baseFilterParts, isWind],
+        // Explicit, not inherited: turbines share exact coordinates with
+        // their aviation-light LIGHTS feature; without allow-overlap the
+        // turbine icon loses collision to the LIGHTS flare and vanishes.
+        // (The value currently also arrives via the entry-layout
+        // spread-last chain, but that chain is fragile — see s52-lookup
+        // LNDMRK entry — so the intent is pinned here.)
+        layout: { ...layer.layout ?? {}, "icon-allow-overlap": true }
       };
       delete windLayer.minzoom;
       const lighthouseLayer = {
         ...layer,
         id: `s52-${objectClass}-lighthouse-symbol`,
-        filter: ["all", ...baseFilterParts, isLighthouse],
+        filter: ["all", ...baseFilterParts, isLighthouse, ["!", isWind]],
         layout: {
           ...layer.layout ?? {},
-          "icon-image": "LIGHTHOUSE01"
+          "icon-image": "LIGHTHOUSE01",
+          "icon-allow-overlap": true
         }
       };
       delete lighthouseLayer.minzoom;
@@ -10514,7 +10577,10 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
     }
     if (objectClass === "TUNNEL" && resolved.type === "line") {
       layers.push({
-        id: `s52-TUNNEL-line`,
+        // NOT `s52-TUNNEL-line` — that id is already taken by the main layer
+        // (`s52-${objectClass}-${resolved.type}`), and duplicate layer ids
+        // are a Mapbox style-spec violation (caught by style-integrity.test).
+        id: `s52-TUNNEL-linestring`,
         type: "line",
         source: sourceId,
         "source-layer": "TUNNEL",
@@ -10615,7 +10681,7 @@ function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION, depthUnits
     delete layer.filter;
   }
   if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-    delete layer.filter;
+    layer.filter = LABEL_ANCHOR_FILTER;
   }
   return layer;
 }
@@ -10888,24 +10954,37 @@ function fanOrientationLabelByCellBand(label) {
     const curve = CELL_BAND_OPACITY_CURVE[code];
     const opacityExpr = ["interpolate", ["linear"], ["zoom"]];
     for (const [z, o] of curve) opacityExpr.push(z, o);
-    const variant = {
-      ...label,
-      id: `${label.id}-cell${code}`,
-      filter: combineWithBandFilter(
-        label.filter,
-        ["==", cellBandExpr, code]
-      ),
-      minzoom: Math.max(
-        label.minzoom ?? range.minzoom,
-        range.minzoom
-      ),
-      paint: {
-        ...label.paint ?? {},
-        "text-opacity": opacityExpr
-      }
+    const cellFiltered = combineWithBandFilter(
+      label.filter,
+      ["==", cellBandExpr, code]
+    );
+    const minzoom = Math.max(
+      label.minzoom ?? range.minzoom,
+      range.minzoom
+    );
+    const paint = {
+      ...label.paint ?? {},
+      "text-opacity": opacityExpr
     };
-    delete variant.maxzoom;
-    variants.push(variant);
+    variants.push({
+      ...label,
+      id: `${label.id}-cell${code}-notdom`,
+      filter: combineWithBandFilter(cellFiltered, NOT_DOMINATED_FILTER),
+      minzoom,
+      paint
+    });
+    for (const D of BAND_DRAW_ORDER) {
+      const dom = BAND_PRIORITY_RANGES[D];
+      if (dom.minzoom <= minzoom) continue;
+      variants.push({
+        ...label,
+        id: `${label.id}-cell${code}-domBy${D}`,
+        filter: combineWithBandFilter(cellFiltered, dominatedByMinFilter(D)),
+        minzoom,
+        maxzoom: dom.minzoom,
+        paint
+      });
+    }
   }
   return variants;
 }