@chrtco/sdk 0.7.3 → 0.7.4

package/dist/index.js

@@ -1307,6 +1307,32 @@ var S52_LOOKUP = {
     viewingGroup: 13050,
     scamin: 45e3
   },
+  // Unsurveyed area — a polygon where no reliable hydrographic survey
+  // exists. The IHO S-52 PresLib portrayal is the hatched pattern
+  // UNSURV03 (diagonal lines over a faint grey wash); we don't carry
+  // that sprite, so we lean on the existing OPAQUE_FILLS treatment in
+  // `layer-builder.ts` to force a fully-opaque grey fill that visibly
+  // suppresses anything underneath. The "no data here — don't assume
+  // safe water" signal is the entire point; UNSARE rendering is a BASE
+  // display-category obligation, not an optional cue.
+  //
+  // Note: `UNSARE` is already a member of `OPAQUE_FILLS` and
+  // `OPAQUE_FILL_LAYERS` in `layer-builder.ts` and `style-resolver.ts`
+  // — half-wired before this entry landed. Adding the lookup entry +
+  // draw-order slot completes the wire-up. Surfaced by the
+  // `Audit S-57 Layer Coverage (Weekly)` workflow (issue #575); 5
+  // features in the NOAA corpus, all in remote-Alaska coverage gaps
+  // where survey is genuinely absent.
+  UNSARE: {
+    objectClass: "UNSARE",
+    name: "Unsurveyed Area",
+    category: "Depths",
+    displayCategory: "BASE",
+    int1Ref: "I27",
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 1 } },
+    viewingGroup: 13050,
+    scamin: 0
+  },
   // ── Land & Shoreline (INT1 Section C) ───────────────────
   LNDARE: {
     objectClass: "LNDARE",
@@ -1459,6 +1485,51 @@ var S52_LOOKUP = {
     viewingGroup: 12050,
     scamin: 45e3
   },
+  // Rapids — direct navigation hazard in narrows / river constrictions. S-52
+  // INT1 C24 portrayal: a stylised wavy line representing turbulent water.
+  // We use a blue dashed line (DEPVS) so the feature reads as a water
+  // disturbance — same colour family as the depth tints, distinct from the
+  // black coastal-construction line family. Surfaced by the weekly layer-
+  // coverage audit (issue #575); 4 features in the NOAA corpus, all in
+  // freshwater approaches where a small craft could be swept onto rocks.
+  RAPIDS: {
+    objectClass: "RAPIDS",
+    name: "Rapids",
+    category: "Hazards",
+    displayCategory: "STANDARD",
+    int1Ref: "C24",
+    style: { type: "line", paint: { "line-color": "DEPVS", "line-width": 1, "line-dasharray": [3, 2] } },
+    viewingGroup: 24020,
+    scamin: 45e3
+  },
+  // Dyke — physical earth/stone embankment that confines water. Same
+  // black-line family as SLCONS / FNCLNE / CAUSWY: solid CHBLK so the
+  // structure reads as a hard man-made shoreline modification. INT1 F8.
+  // Surfaced by the weekly layer-coverage audit (issue #575); 13 features
+  // in the NOAA corpus.
+  DYKCON: {
+    objectClass: "DYKCON",
+    name: "Dyke",
+    category: "Land",
+    displayCategory: "STANDARD",
+    int1Ref: "F8",
+    style: { type: "line", paint: { "line-color": "CHBLK", "line-width": 1 } },
+    viewingGroup: 12410,
+    scamin: 22e3
+  },
+  // Causeway — raised road or rail bed across tidal flats or shallow water
+  // (Cape Cod, the Florida Keys, etc.). Black-line family alongside DYKCON.
+  // INT1 F3. Surfaced by the weekly layer-coverage audit (issue #575).
+  CAUSWY: {
+    objectClass: "CAUSWY",
+    name: "Causeway",
+    category: "Infrastructure",
+    displayCategory: "STANDARD",
+    int1Ref: "F3",
+    style: { type: "line", paint: { "line-color": "CHBLK", "line-width": 1 } },
+    viewingGroup: 12410,
+    scamin: 22e3
+  },
   TUNNEL: {
     objectClass: "TUNNEL",
     name: "Tunnel",
@@ -1656,6 +1727,13 @@ var S52_LOOKUP = {
     scamin: 9e4
   },
   LNDELV: {
+    // LineString variant (land contours) renders normally with the line
+    // style below. Point variant ≈ spot elevation ("12m") on land — per
+    // S-52 PresLib convention, marine displays suppress land spot heights
+    // so they don't compete with safety-critical hydrography. The
+    // `auditIgnore` flag silences the weekly layer-coverage audit for the
+    // Point geom-type only; it does not disable the line rendering. See
+    // #575 triage matrix for the full rationale.
     objectClass: "LNDELV",
     name: "Land Elevation",
     category: "Land",
@@ -1663,7 +1741,8 @@ var S52_LOOKUP = {
     int1Ref: "C10",
     style: { type: "line", paint: { "line-color": "CHBRN", "line-width": 0.5 } },
     viewingGroup: 12070,
-    scamin: 22e3
+    scamin: 22e3,
+    auditIgnore: true
   },
   // ── Hazards (INT1 Section K) ────────────────────────────
   OBSTRN: {
@@ -1749,7 +1828,15 @@ var S52_LOOKUP = {
     int1Ref: "J1",
     style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0.15 } },
     viewingGroup: 14010,
-    scamin: 22e3
+    scamin: 22e3,
+    // Point variant (NOAA encodes 2,709 SBDARE Points) is rendered as a
+    // seabed-quality text label ("S"/"M"/"R" per S-52 INT1 J) via the
+    // labels.ts path — see layer-builder.ts SBDARE special-case routing.
+    // The layer-coverage audit script only inspects MapLibre layer filters
+    // from buildLayersForClass(), so it can't see that the Point variant
+    // is in fact rendered. Matches the SOUNDG precedent (auditIgnore +
+    // text-via-labels.ts rendering — see s52-lookup.ts SOUNDG entry).
+    auditIgnore: true
   },
   WEDKLP: {
     // Translucent green fill suggests kelp/vegetation; Point variant (the
@@ -1766,6 +1853,23 @@ var S52_LOOKUP = {
     viewingGroup: 14010,
     scamin: 22e3
   },
+  // Oil barrier — a deployed containment boom corralling spilled oil or
+  // marking the perimeter of a spill-response operation. Operational
+  // hazard: small craft must avoid crossing the line (and the polluted
+  // water it contains). S-52 has no formal INT1 entry, but PresLib
+  // convention for spill-response gear is magenta — matches the rest of
+  // the regulated/operational-area portrayal family. Dashed line so it
+  // reads as a temporary/operational marker rather than a permanent
+  // structure. Surfaced by the weekly layer-coverage audit (issue #575).
+  OILBAR: {
+    objectClass: "OILBAR",
+    name: "Oil Barrier",
+    category: "Hazards",
+    displayCategory: "STANDARD",
+    style: { type: "line", paint: { "line-color": "CHMGD", "line-width": 1, "line-dasharray": [4, 2] } },
+    viewingGroup: 24020,
+    scamin: 45e3
+  },
   // ── Regulated Areas (INT1 Section N) ────────────────────
   ACHARE: {
     // Anchorages are conventionally rendered as a subtle filled region in
@@ -1939,6 +2043,196 @@ var S52_LOOKUP = {
     viewingGroup: 26050,
     scamin: 9e4
   },
+  // ── Jurisdictional zones (INT1 Section N) ───────────────
+  // ADMARE / COSARE / CONZNE / EXEZNE / TESARE share an S-52 portrayal
+  // family: magenta dashed boundary, no fill. These are vast offshore
+  // polygons (EEZ extends 200nm, contiguous zone 24nm) where a flood fill
+  // — even at 0.05 opacity — would visibly tint half the chart and stack
+  // with overlapping jurisdictions into a purple wash. Same boundary-only
+  // pattern as TESARE / RESARE / CTNARE via LINE_FROM_POLYGON_LAYERS.
+  // Surfaced by the weekly layer-coverage audit (issue #575 rows 8–15).
+  ADMARE: {
+    // Administration area — state/national waters, the broadest
+    // jurisdictional polygon class. INT1 N40 maps it into the same
+    // magenta-dashed family as territorial-sea / EEZ / contiguous-zone.
+    objectClass: "ADMARE",
+    name: "Administration Area",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "N40",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1,
+        "line-dasharray": [6, 4],
+        "line-opacity": 0.6
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  COSARE: {
+    // Coastal area — jurisdictional polygon delineating a coastal-state
+    // administrative region. Previously suppressed via META_LAYERS in
+    // style-generator.ts; promoted here to render as a magenta dashed
+    // boundary alongside the rest of the N-section jurisdiction family.
+    objectClass: "COSARE",
+    name: "Coastal Area",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "N40",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1,
+        "line-dasharray": [6, 4],
+        "line-opacity": 0.6
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  CONZNE: {
+    // Contiguous Zone — 24nm offshore boundary. Same magenta dashed
+    // portrayal as territorial sea; boundary-only because the polygon is
+    // vast and a flood fill would obscure huge swathes of chart data.
+    objectClass: "CONZNE",
+    name: "Contiguous Zone",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "N44",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1,
+        "line-dasharray": [6, 4],
+        "line-opacity": 0.6
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  EXEZNE: {
+    // Exclusive Economic Zone — 200nm offshore boundary. Largest of the
+    // jurisdictional polygons; flood-filling even at 0.05 opacity would
+    // tint half the chart at coastal zooms. Boundary-only is the only
+    // sensible portrayal at scale.
+    objectClass: "EXEZNE",
+    name: "Exclusive Economic Zone",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "N47",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1,
+        "line-dasharray": [6, 4],
+        "line-opacity": 0.6
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  // ── IMO routing measures (INT1 Section M) ───────────────
+  // TSEZNE / DWRTPT / DWRTCL / TWRTPT are IMO-adopted routing measures
+  // (Traffic Separation Scheme zones, deepwater routes, two-way routes).
+  // S-52 portrayal: magenta dashed boundary for polygons, dashed centerline
+  // for the LineString. The INT1 M-section spec calls for additional
+  // diagonal hatching (TSSCRS01 sprite) on TSEZNE and "DW" centroid text
+  // on DWRTPT — both are deferred follow-ups (TSSCRS01 not in the atlas
+  // sprite set; centroid text belongs in labels.ts). Boundary visibility
+  // is the priority cue here; routing-text augmentation comes later.
+  TSEZNE: {
+    // Traffic Separation Zone — the buffer band between opposing lanes of
+    // a TSS. S-52 INT1 M14 calls for T-pattern diagonal hatching
+    // (TSSCRS01) but that sprite isn't in our generated atlas; fall back
+    // to a magenta dashed boundary so the zone is at least visible.
+    objectClass: "TSEZNE",
+    name: "Traffic Separation Zone",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "M14",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1.2,
+        "line-dasharray": [4, 3],
+        "line-opacity": 0.7
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  DWRTPT: {
+    // Deepwater Route Part — polygon segment of an IMO-adopted deepwater
+    // route. S-52 INT1 M27 portrayal includes "DW" centroid text; that's
+    // a labels.ts addition deferred to a follow-up. Boundary-only here.
+    objectClass: "DWRTPT",
+    name: "Deepwater Route Part",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "M27",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1.2,
+        "line-dasharray": [4, 3],
+        "line-opacity": 0.7
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  DWRTCL: {
+    // Deepwater Route Centerline — LineString feature (not a polygon
+    // boundary) running down the middle of a DWRTPT. Same magenta dashed
+    // style as MAGVAR isogonic lines but slightly heavier so the
+    // route-axis cue reads against busy water.
+    objectClass: "DWRTCL",
+    name: "Deepwater Route Centerline",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "M27",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 0.8,
+        "line-dasharray": [6, 3],
+        "line-opacity": 0.7
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
+  TWRTPT: {
+    // Two-Way Route Part — polygon segment of an IMO-adopted two-way
+    // route. S-52 INT1 M28 portrayal includes paired arrow centroid
+    // symbols (TWRTPT52 / TWRTPT53 sprites exist in the atlas but are a
+    // labels.ts follow-up). Boundary-only here.
+    objectClass: "TWRTPT",
+    name: "Two-Way Route Part",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "M28",
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "CHMGD",
+        "line-width": 1.2,
+        "line-dasharray": [4, 3],
+        "line-opacity": 0.7
+      }
+    },
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
   // ── Infrastructure (INT1 Sections D, F, L) ──────────────
   BRIDGE: {
     objectClass: "BRIDGE",
@@ -2247,6 +2541,56 @@ var S52_LOOKUP = {
     viewingGroup: 12410,
     scamin: 22e3
   },
+  // Coast Guard station — emergency-response context. Mariners look for
+  // these when navigating unfamiliar coastline or planning a distress-call
+  // contingency. INT1 F62. Symbolised with the same generic tower glyph
+  // (BCNTOW01) used by BUISGL and the CATLMK=17 LNDMRK variant — a
+  // dedicated CGUSTA SVG is a reasonable follow-up but not required for
+  // the structural-presence cue. Surfaced by the weekly layer-coverage
+  // audit (issue #575); 17 Point features in the NOAA corpus.
+  CGUSTA: {
+    objectClass: "CGUSTA",
+    name: "Coast Guard Station",
+    category: "Infrastructure",
+    displayCategory: "OTHER",
+    int1Ref: "F62",
+    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.6, "icon-allow-overlap": true }, iconImage: "BCNTOW01" },
+    viewingGroup: 12410,
+    scamin: 22e3
+  },
+  // "New Object" — S-57 placeholder class for features the issuing HO has
+  // identified but not yet classified into a more specific class. S-52
+  // PresLib does NOT formally define a portrayal because the class is by
+  // construction not-yet-portrayable, so any distinctive symbol is
+  // permissible — we use a vivid magenta-filled circle with a bold black
+  // stroke so a mariner sees clearly that "there is something unclassified
+  // here." Hiding this class would amount to hiding the HO's own
+  // uncertainty marker, which is the exact opposite of what a chart user
+  // needs. displayCategory: STANDARD (not OTHER) so a default-display
+  // mariner cannot accidentally suppress it; scamin: 0 so the marker
+  // stays visible at every scale band. Surfaced by the weekly layer-
+  // coverage audit (issue #575); 8 Point features in the NOAA corpus.
+  // SAFETY CONTRACT: any future "clean up unused magenta point classes"
+  // pass MUST NOT delete or hide this entry — read the comment block on
+  // issue #575 row 22 before touching.
+  NEWOBJ: {
+    objectClass: "NEWOBJ",
+    name: "New Object (Unclassified)",
+    category: "Hazards",
+    displayCategory: "STANDARD",
+    style: {
+      type: "circle",
+      paint: {
+        "circle-color": "CHMGD",
+        "circle-radius": 5,
+        "circle-stroke-color": "CHBLK",
+        "circle-stroke-width": 1.2,
+        "circle-opacity": 0.85
+      }
+    },
+    viewingGroup: 24020,
+    scamin: 0
+  },
   // ── Overhead & Underground (INT1 Section L) ─────────────
   // Overhead cable — S-52 INT1 L31 portrayal: solid thin magenta line
   // (not dashed) because overhead cables are an in-air navigation hazard
@@ -2298,6 +2642,11 @@ var S52_LOOKUP = {
     // when the sprite image is missing; `fill-pattern` here is the default
     // used if the conditional expression isn't applied for some reason
     // (e.g. a consumer that bypasses `resolvePaint`).
+    //
+    // Polygon (vegetation fill) is the primary variant. The Point variant
+    // ≈ a single marker tree; sub-marine-relevance, so `auditIgnore`
+    // silences the audit for the Point geom-type without touching the
+    // Polygon rendering. See #575 triage matrix.
     style: {
       type: "fill",
       paint: { "fill-color": "LANDF", "fill-opacity": 0.6, "fill-pattern": "VEGATN03" }
@@ -2305,7 +2654,8 @@ var S52_LOOKUP = {
     hasConditional: true,
     conditionalAttributes: ["CATVEG"],
     viewingGroup: 12050,
-    scamin: 22e3
+    scamin: 22e3,
+    auditIgnore: true
   },
   SEAARE: {
     // Cross-band water base. SEAARE polygons tile the sea below the
@@ -2484,6 +2834,42 @@ var S52_LOOKUP = {
     viewingGroup: 23010,
     scamin: 0
   },
+  // ── Audit-ignored stubs (non-metadata) ──────────────────
+  // Classes whose non-rendering is a deliberate S-52 portrayal choice
+  // rather than a real gap, but which aren't S-57 metadata. Each is
+  // present here only so the weekly layer-coverage audit (#575) stops
+  // flagging it as missing. Paint is a transparent fill — no visible
+  // output. Swapping `auditIgnore: true` for a real style is a one-line
+  // change if the call ever needs to be reversed.
+  SLOTOP: {
+    // Top of slope — land terrain feature, low marine relevance.
+    objectClass: "SLOTOP",
+    name: "Top of Slope",
+    category: "Land",
+    displayCategory: "OTHER",
+    int1Ref: "C12",
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
+  },
+  SNDWAV: {
+    // Sand waves — niche bathymetric texture feature, not a hazard.
+    objectClass: "SNDWAV",
+    name: "Sand Waves",
+    category: "Depths",
+    displayCategory: "OTHER",
+    int1Ref: "J14",
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
+  },
+  CTRPNT: {
+    // Centerline point — geometric helper, not a feature on the chart.
+    objectClass: "CTRPNT",
+    name: "Centerline Point",
+    category: "Meta",
+    displayCategory: "OTHER",
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
+  },
   // ── Meta (hidden by default) ────────────────────────────
   // M_* and DSID are S-57 metadata classes — they describe the dataset
   // (coverage extent, survey reliability, source publication, etc.) and
@@ -2522,6 +2908,17 @@ var S52_LOOKUP = {
     style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
     auditIgnore: true
   },
+  M_SDAT: {
+    // Sounding Datum — S-57 metadata describing the vertical datum used
+    // for soundings (typically LAT). Click-query attribute carrier; no
+    // visible shape on its own.
+    objectClass: "M_SDAT",
+    name: "Sounding Datum",
+    category: "Meta",
+    displayCategory: "META",
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
+  },
   M_SREL: {
     objectClass: "M_SREL",
     name: "Survey Reliability",
@@ -2561,6 +2958,16 @@ var S52_DRAW_ORDER = [
   // paired paint-spec change (fill-opacity 0 → 1, color → DEPDW).
   "SEAARE",
   "DEPARE",
+  // 2a. Unsurveyed area — opaque grey wash painted ON TOP of any DEPARE
+  // tile within its extent so depth-tier colours can never imply the area
+  // is surveyed-and-safe. If both DEPARE and UNSARE cover the same pixel,
+  // UNSARE wins on purpose: the hydrographic office classified the polygon
+  // as unsurveyed, so any depth data within it is suspect at best. Sits
+  // below dredged / swept (which represent active survey work) so those
+  // appear if they overlap UNSARE — but in practice they don't, and the
+  // ordering is the safer fallback. Surfaced by the weekly layer-coverage
+  // audit (issue #575); see s52-lookup.ts UNSARE entry for context.
+  "UNSARE",
   // 3. Dredged / swept areas (fill)
   "DRGARE",
   "SWPARE",
@@ -2598,6 +3005,17 @@ var S52_DRAW_ORDER = [
   "LOGPON",
   "CBLARE",
   "PIPARE",
+  // 6a. Jurisdictional zones + IMO routing measures (boundary-only via
+  // LINE_FROM_POLYGON_LAYERS). Slotted at the end of the regulated-area
+  // band so the dashed magenta boundaries paint above the fill family
+  // but below shoreline / depth-contour lines. Closes #575 rows 8–15.
+  "ADMARE",
+  "COSARE",
+  "CONZNE",
+  "EXEZNE",
+  "TSEZNE",
+  "DWRTPT",
+  "TWRTPT",
   // 7. Infrastructure areas (fill)
   "PONTON",
   "HULKES",
@@ -2607,8 +3025,13 @@ var S52_DRAW_ORDER = [
   "PYLONS",
   "FORSTC",
   // 8. Coastline / shore (line)
+  // DYKCON (dyke) and CAUSWY (causeway) join the SLCONS family — solid
+  // black lines representing man-made shoreline modifications. Drawn in
+  // the same band so they layer consistently with adjacent SLCONS edges.
   "COALNE",
   "SLCONS",
+  "DYKCON",
+  "CAUSWY",
   "FNCLNE",
   // 9. Depth contours (line)
   "DEPCNT",
@@ -2619,13 +3042,20 @@ var S52_DRAW_ORDER = [
   // routing and aids-to-nav win the visual hierarchy).
   "MAGVAR",
   // 10. Navigation lines (line)
+  // RAPIDS and OILBAR are direct/operational water hazards. RAPIDS uses
+  // the depth-blue palette (DEPVS dashed) so the feature reads as a
+  // water-surface disturbance; OILBAR uses CHMGD to fit the operational-
+  // hazard family alongside cables / pipelines.
   "NAVLNE",
   "TSSBND",
+  "DWRTCL",
   "ROADWY",
   "RAILWY",
   "TUNNEL",
   "FERYRT",
   "RECTRC",
+  "RAPIDS",
+  "OILBAR",
   "PIPSOL",
   "PIPOHD",
   "CBLSUB",
@@ -2634,6 +3064,11 @@ var S52_DRAW_ORDER = [
   "DAMCON",
   "BERTHS",
   // 11. Point features
+  // CGUSTA (coast guard station, emergency-context) sits with the building
+  // / landmark family — a structural-presence cue rather than a routing
+  // signal. NEWOBJ ("something here we haven't classified yet") goes at
+  // the END of the point list so the distinctive magenta marker stays on
+  // top of neighbouring point features and cannot be visually swallowed.
   "SOUNDG",
   "MORFAC",
   "PILPNT",
@@ -2647,6 +3082,8 @@ var S52_DRAW_ORDER = [
   "CRANES",
   "DISMAR",
   "ACHBRT",
+  "CGUSTA",
+  "NEWOBJ",
   // 12. Nav aids (on top)
   "FOGSIG",
   "RTPBCN",
@@ -5264,6 +5701,7 @@ var SYMBOL_MAP = {
   PILBOP: "PILBOP02",
   SISTAT: "SISTAT02",
   SMCFAC: "ACHARE02",
+  CGUSTA: "BCNTOW01",
   // Land infrastructure
   SILTNK: "TNKCON02",
   BUISGL: "BCNTOW01",
@@ -5920,6 +6358,124 @@ function buildSeabedLabelExpression() {
   const natsurJoined = ["slice", natsurParts, 1];
   return ["concat", natquaPrefix, natsurJoined];
 }
+function buildSeaAreaTierExpression() {
+  const catsea = ["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).
+    [">=", ["index-of", "Anchorage Area", objnam], 0],
+    4,
+    // OBJNAM-substring promotion shims (run AFTER tier 4 demotion):
+    [">=", ["index-of", "Atlantic Ocean", objnam], 0],
+    1,
+    [">=", ["index-of", "Pacific Ocean", objnam], 0],
+    1,
+    [">=", ["index-of", "Arctic Ocean", objnam], 0],
+    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],
+    3,
+    [">=", ["index-of", " Strait", objnam], 0],
+    3,
+    [">=", ["index-of", " Sea", objnam], 0],
+    2,
+    5
+  ];
+}
+function buildBuiltUpAreaTierExpression() {
+  const catbua = ["coalesce", ["get", "CATBUA"], ["get", "catbua"], 0];
+  const objnam = ["coalesce", ["get", "OBJNAM"], ""];
+  const nameLen = ["length", objnam];
+  return [
+    "case",
+    ["==", ["to-number", catbua], 1],
+    1,
+    ["==", ["to-number", catbua], 5],
+    2,
+    ["<=", nameLen, 8],
+    1,
+    ["<=", nameLen, 14],
+    2,
+    3
+  ];
+}
+function buildLandRegionTierExpression() {
+  const objnam = ["coalesce", ["get", "OBJNAM"], ""];
+  const nameLen = ["length", objnam];
+  return [
+    "case",
+    ["all", ["<=", nameLen, 12], ["==", ["index-of", ",", objnam], -1]],
+    1,
+    2
+  ];
+}
+function buildLandAreaTierExpression() {
+  const objnam = ["coalesce", ["get", "OBJNAM"], ""];
+  return [
+    "case",
+    ["<=", ["length", objnam], 12],
+    1,
+    2
+  ];
+}
+function buildLakeTierExpression() {
+  const catlak = ["coalesce", ["get", "CATLAK"], ["get", "catlak"], 0];
+  const objnam = ["coalesce", ["get", "OBJNAM"], ""];
+  return [
+    "case",
+    ["==", ["to-number", catlak], 1],
+    1,
+    ["any", ["==", ["to-number", catlak], 2], ["==", ["to-number", catlak], 3]],
+    2,
+    ["<=", ["length", objnam], 12],
+    1,
+    2
+  ];
+}
+function buildRiverTierExpression() {
+  const objnam = ["coalesce", ["get", "OBJNAM"], ""];
+  return [
+    "case",
+    [
+      "all",
+      ["<=", ["length", objnam], 15],
+      ["==", ["index-of", ",", objnam], -1]
+    ],
+    1,
+    2
+  ];
+}
+function buildAirportTierExpression() {
+  const objnam = ["coalesce", ["get", "OBJNAM"], ""];
+  return [
+    "case",
+    ["<=", ["length", objnam], 25],
+    1,
+    2
+  ];
+}
 var COLOR = {
   WATER: "#9ec1d8",
   WATER_DEEP: "#8fb8d0",
@@ -5940,6 +6496,30 @@ var ORIENTATION_BAND_SORT_KEY = [
   ["slice", ["coalesce", ["get", "_cell_id"], "??9???"], 2, 3],
   9
 ];
+function orientationLabelLayout(extras = {}) {
+  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,
+    ...extras
+  };
+}
+var ORIENTATION_HALO_WIDTH = [
+  "interpolate",
+  ["linear"],
+  ["zoom"],
+  8,
+  1.6,
+  11,
+  1.5,
+  14,
+  1,
+  16,
+  0.7
+];
 var LABEL_BEHAVIOR = {
   // Orientation labels — render once across all bands.
   SEAARE: "orientation-cross-band",
@@ -6054,7 +6634,17 @@ function getLabelConfig(layerName, opts = {}) {
         }
       };
     }
-    case "LNDRGN":
+    case "LNDRGN": {
+      const tierExpr = buildLandRegionTierExpression();
+      const sizeAt = (t1, t2) => [
+        "match",
+        tierExpr,
+        1,
+        t1,
+        2,
+        t2,
+        t2
+      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
@@ -6062,27 +6652,28 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
-          8,
-          10,
-          12,
-          12,
-          15,
-          14
+          5,
+          sizeAt(9, 0),
+          7,
+          sizeAt(11, 0),
+          9,
+          sizeAt(12, 0),
+          11,
+          sizeAt(12, 9),
+          13,
+          sizeAt(11, 11),
+          16,
+          sizeAt(10, 10)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.LAND_REGION,
-        textHaloWidth: 1.4,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
-        minzoom: 8,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 6,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        minzoom: 5,
+        layout: orientationLabelLayout()
       };
+    }
     case "LNDMRK":
       return {
         type: "symbol",
@@ -6211,40 +6802,72 @@ function getLabelConfig(layerName, opts = {}) {
         }
       };
     }
-    case "SEAARE":
+    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"],
+        // Default tier (CATSEA=0, uncategorised: canyons, seamounts, fishing
+        // banks etc.) is suppressed at overview/general/coastal scales because
+        // 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,
-          8,
+          sizeAt(10, 12, 13, 0, 11),
           13,
-          11,
-          15,
-          14,
-          17
+          sizeAt(9, 11, 12, 10, 11),
+          16,
+          sizeAt(9, 10, 11, 11, 10)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER_DEEP,
-        textHaloWidth: 1.8,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 5,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 10,
-          "text-optional": true,
+        layout: orientationLabelLayout({
           "text-letter-spacing": 0.15,
-          "text-max-width": 9,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+          "text-max-width": 9
+        })
       };
-    case "LAKARE":
+    }
+    case "LAKARE": {
+      const tierExpr = buildLakeTierExpression();
+      const sizeAt = (t1, t2) => [
+        "match",
+        tierExpr,
+        1,
+        t1,
+        2,
+        t2,
+        t2
+      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
@@ -6252,28 +6875,37 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
-          8,
-          10,
-          12,
-          12,
-          15,
-          14
+          7,
+          sizeAt(9, 0),
+          9,
+          sizeAt(11, 0),
+          11,
+          sizeAt(11, 9),
+          13,
+          sizeAt(10, 11),
+          16,
+          sizeAt(9, 10)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER,
-        textHaloWidth: 1.5,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
-        minzoom: 8,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 6,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        minzoom: 7,
+        layout: orientationLabelLayout()
       };
-    case "RIVERS":
+    }
+    case "RIVERS": {
+      const tierExpr = buildRiverTierExpression();
+      const sizeAt = (t1, t2) => [
+        "match",
+        tierExpr,
+        1,
+        t1,
+        2,
+        t2,
+        t2
+      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
@@ -6281,27 +6913,26 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
+          7,
+          sizeAt(9, 0),
           9,
-          9,
-          12,
+          sizeAt(11, 0),
           11,
-          15,
-          13
+          sizeAt(11, 9),
+          13,
+          sizeAt(10, 10),
+          16,
+          sizeAt(9, 10)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER,
-        textHaloWidth: 1.4,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
-        minzoom: 9,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 4,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        minzoom: 7,
+        layout: orientationLabelLayout()
       };
+    }
     case "CANALS":
       return {
         type: "symbol",
@@ -6311,25 +6942,31 @@ function getLabelConfig(layerName, opts = {}) {
           ["linear"],
           ["zoom"],
           11,
+          10,
+          13,
           9,
-          14,
-          11
+          16,
+          9
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.WATER,
-        textHaloWidth: 1.3,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 11,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 4,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        layout: orientationLabelLayout()
       };
-    case "LNDARE":
+    case "LNDARE": {
+      const tierExpr = buildLandAreaTierExpression();
+      const sizeAt = (t1, t2) => [
+        "match",
+        tierExpr,
+        1,
+        t1,
+        2,
+        t2,
+        t2
+      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
@@ -6337,28 +6974,41 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
-          8,
+          5,
+          sizeAt(8, 0),
+          7,
+          sizeAt(10, 0),
           9,
-          12,
+          sizeAt(11, 0),
           11,
-          15,
-          13
+          sizeAt(11, 9),
+          13,
+          sizeAt(10, 10),
+          16,
+          sizeAt(9, 10)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.LAND_NATURAL,
-        textHaloWidth: 1.4,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
-        minzoom: 8,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 6,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        minzoom: 5,
+        layout: orientationLabelLayout()
       };
-    case "BUAARE":
+    }
+    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"],
@@ -6366,28 +7016,32 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
+          3,
+          sizeAt(11, 0, 0),
+          5,
+          sizeAt(13, 0, 0),
           7,
+          sizeAt(13, 9, 0),
+          9,
+          sizeAt(12, 12, 0),
           11,
-          10,
+          sizeAt(11, 12, 10),
           13,
-          13,
-          15
+          sizeAt(10, 11, 12),
+          16,
+          sizeAt(10, 10, 11)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.CITY,
-        textHaloWidth: 1.6,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
-        minzoom: 7,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 8,
-          "text-optional": true,
-          "text-letter-spacing": 0.05,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        minzoom: 3,
+        layout: orientationLabelLayout({
+          "text-letter-spacing": 0.05
+        })
       };
+    }
     case "BRIDGE":
       return {
         type: "symbol",
@@ -6455,7 +7109,17 @@ function getLabelConfig(layerName, opts = {}) {
           "text-optional": true
         }
       };
-    case "AIRARE":
+    case "AIRARE": {
+      const tierExpr = buildAirportTierExpression();
+      const sizeAt = (t1, t2) => [
+        "match",
+        tierExpr,
+        1,
+        t1,
+        2,
+        t2,
+        t2
+      ];
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
@@ -6463,25 +7127,26 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
+          7,
+          sizeAt(9, 0),
           9,
-          9,
+          sizeAt(11, 0),
+          11,
+          sizeAt(11, 9),
           13,
-          11
+          sizeAt(10, 10),
+          16,
+          sizeAt(9, 9)
         ],
         textColor: DARK_BG,
         textHaloColor: COLOR.AIRPORT,
-        textHaloWidth: 1.4,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Regular"],
-        minzoom: 9,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 5,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        minzoom: 7,
+        layout: orientationLabelLayout()
       };
+    }
     case "SBDARE":
       return {
         type: "symbol",
@@ -6554,26 +7219,20 @@ function getLabelConfig(layerName, opts = {}) {
           "interpolate",
           ["linear"],
           ["zoom"],
+          11,
+          9,
+          13,
           8,
-          10,
-          12,
-          12,
-          15,
-          14
+          16,
+          8
         ],
         textColor: "#c545c3",
         textHaloColor: DARK_BG,
-        textHaloWidth: 1.4,
+        textHaloWidth: ORIENTATION_HALO_WIDTH,
         textOffset: [0, 0],
         textFont: ["Open Sans Italic"],
         minzoom: 8,
-        layout: {
-          "text-anchor": "center",
-          "text-allow-overlap": false,
-          "text-padding": 6,
-          "text-optional": true,
-          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
-        }
+        layout: orientationLabelLayout()
       };
     case "WEDKLP":
       return {
@@ -8680,7 +9339,21 @@ var LINE_FROM_POLYGON_LAYERS = /* @__PURE__ */ new Set([
   "MIPARE",
   "TESARE",
   "MAGVAR",
-  "PRDARE"
+  "PRDARE",
+  "TUNNEL",
+  // Jurisdictional zones (INT1 N40–N47) and IMO routing measures
+  // (INT1 M14, M27, M28) — magenta dashed boundary, no fill. Vast
+  // offshore polygons would tint half the chart if flood-filled, so
+  // every member here renders as boundary-only. DWRTCL is not listed
+  // because it's a native LineString class, not a polygon-as-line.
+  // Closes issue #575 rows 8–15.
+  "ADMARE",
+  "COSARE",
+  "CONZNE",
+  "EXEZNE",
+  "TSEZNE",
+  "DWRTPT",
+  "TWRTPT"
 ]);
 var ZOOM_SCALED_LINES2 = {
   DEPCNT: [8, 0.3, 14, 0.8],
@@ -9668,6 +10341,87 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
         metadata: { "s52:objectClass": "RECTRC", "s52:role": "polygon" }
       });
     }
+    if (objectClass === "PONTON" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-PONTON-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "PONTON",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHGRF", ct),
+          "line-width": 1.5
+        },
+        metadata: { "s52:objectClass": "PONTON", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "SILTNK" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-SILTNK-symbol-polygon`,
+        type: "symbol",
+        source: sourceId,
+        "source-layer": "SILTNK",
+        filter: GEOM_FILTERS.fill,
+        layout: {
+          "icon-image": "TNKCON02",
+          "icon-size": 0.6,
+          "icon-allow-overlap": true,
+          "icon-ignore-placement": false,
+          "symbol-placement": "point"
+        },
+        paint: {},
+        metadata: { "s52:objectClass": "SILTNK", "s52:role": "symbol-polygon" }
+      });
+    }
+    if (objectClass === "ACHBRT" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-ACHBRT-symbol-polygon`,
+        type: "symbol",
+        source: sourceId,
+        "source-layer": "ACHBRT",
+        filter: GEOM_FILTERS.fill,
+        layout: {
+          "icon-image": "ACHARE02",
+          "icon-size": 0.5,
+          "icon-allow-overlap": true,
+          "icon-ignore-placement": false,
+          "symbol-placement": "point"
+        },
+        paint: {},
+        metadata: { "s52:objectClass": "ACHBRT", "s52:role": "symbol-polygon" }
+      });
+    }
+    if (objectClass === "BERTHS" && resolved.type === "line") {
+      layers.push({
+        id: `s52-BERTHS-circle`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "BERTHS",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBLK", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.5, 14, 2.2, 17, 3],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.5
+        },
+        metadata: { "s52:objectClass": "BERTHS", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "TUNNEL" && resolved.type === "line") {
+      layers.push({
+        id: `s52-TUNNEL-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "TUNNEL",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHGRD", ct),
+          "line-width": 1,
+          "line-dasharray": [2, 2]
+        },
+        metadata: { "s52:objectClass": "TUNNEL", "s52:role": "line" }
+      });
+    }
   }
   return layers;
 }
@@ -9903,9 +10657,21 @@ var META_LAYERS = /* @__PURE__ */ new Set([
   "M_CSCL",
   "TS_FEB",
   "TS_TIS",
-  "COSARE",
-  "NEWOBJ",
   "LOCMAG"
+  // COSARE was previously suppressed here as meta. The weekly layer-
+  // coverage audit (issue #575) classified it as a jurisdictional polygon
+  // (S-52 INT1 N40, same family as ADMARE / TESARE). It now has an
+  // S52_LOOKUP entry and renders as a magenta dashed boundary; suppressing
+  // it as meta would defeat that wire-up.
+  //
+  // NEWOBJ was likewise previously suppressed here. That was the source
+  // of audit gap row 22: NEWOBJ is the S-57 placeholder for features the
+  // HO has identified but not yet classified. Skipping it silently hid
+  // the HO's own "we don't know what this is, but it is here" signal —
+  // the opposite of what mariners need. The class now renders via its
+  // S52_LOOKUP entry as a vivid magenta circle, displayCategory STANDARD,
+  // scamin 0. Do not put it back here — see the lookup entry for the
+  // safety contract.
 ]);
 var PALETTE_NAMES = {
   DAY: "DAY_BRIGHT",
@@ -9996,21 +10762,45 @@ function makeBandVariants(layer, B) {
   }
   return variants;
 }
-function fanOrientationLabelByDominator(label) {
+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]]
+};
+function fanOrientationLabelByCellBand(label) {
+  const cellBandExpr = [
+    "slice",
+    ["coalesce", ["get", "_cell_id"], "??9???"],
+    2,
+    3
+  ];
   const variants = [];
-  variants.push({
-    ...label,
-    id: `${label.id}-notdom`,
-    filter: combineWithBandFilter(label.filter, NOT_DOMINATED_FILTER)
-  });
-  for (const D of BAND_DRAW_ORDER) {
-    if (D === "1") continue;
-    variants.push({
+  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);
+    const variant = {
       ...label,
-      id: `${label.id}-domBy${D}`,
-      filter: combineWithBandFilter(label.filter, dominatedByMinFilter(D)),
-      maxzoom: BAND_PRIORITY_RANGES[D].minzoom
-    });
+      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
+      }
+    };
+    delete variant.maxzoom;
+    variants.push(variant);
   }
   return variants;
 }
@@ -10134,7 +10924,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     for (const { objectClass, label } of bundles) {
       if (!label) continue;
       if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-        labelLayers.push(...fanOrientationLabelByDominator(label));
+        labelLayers.push(...fanOrientationLabelByCellBand(label));
       }
     }
     for (const code of BAND_DRAW_ORDER) {