@chrtco/sdk 0.6.0 → 0.7.1

package/dist/index.cjs

@@ -20,14 +20,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  BAND_DRAW_ORDER: () => BAND_DRAW_ORDER,
+  BAND_PRIORITY_RANGES: () => BAND_PRIORITY_RANGES,
   BUILD_MAXZOOM: () => BUILD_MAXZOOM,
   BUILD_MINZOOM: () => BUILD_MINZOOM,
+  CHART_BAND_CODES: () => CHART_BAND_CODES,
+  CHART_CASCADE_CODES: () => CHART_CASCADE_CODES,
   CHART_SECTIONS: () => CHART_SECTIONS,
   Chrt: () => Chrt,
   ChrtError: () => ChrtError,
   DEFAULT_REGION: () => DEFAULT_REGION,
   DEFAULT_TILE_BASE_URL: () => DEFAULT_TILE_BASE_URL,
   LABELED_LAYERS: () => LABELED_LAYERS,
+  LABEL_BEHAVIOR: () => LABEL_BEHAVIOR,
   NAUTICAL_SYMBOLS: () => NAUTICAL_SYMBOLS,
   OfflineError: () => OfflineError,
   OfflineStyleError: () => OfflineStyleError,
@@ -44,10 +49,12 @@ __export(index_exports, {
   SYMBOL_GROUPS: () => SYMBOL_GROUPS,
   SYMBOL_MAP: () => SYMBOL_MAP,
   applyColorTheme: () => applyColorTheme,
+  bandFilterExpression: () => bandFilterExpression,
   buildLabelLayer: () => buildLabelLayer,
   buildLayersForClass: () => buildLayersForClass,
   buildOfflineStyle: () => buildOfflineStyle,
   buildSources: () => buildSources,
+  combineWithBandFilter: () => combineWithBandFilter,
   daymarkColor: () => daymarkColor,
   decimateFeatures: () => decimateFeatures,
   depareColor: () => depareColor,
@@ -64,6 +71,7 @@ __export(index_exports, {
   getDrawPriority: () => getDrawPriority,
   getGridSizeForZoom: () => getGridSizeForZoom,
   getIconExpression: () => getIconExpression,
+  getLabelBehavior: () => getLabelBehavior,
   getLabelConfig: () => getLabelConfig,
   getLookupEntry: () => getLookupEntry,
   getMaxCellsForZoom: () => getMaxCellsForZoom,
@@ -89,7 +97,9 @@ __export(index_exports, {
   preprocessWaterBodies: () => preprocessWaterBodies,
   resolveColor: () => resolveColor,
   resolveStyle: () => resolveStyle,
-  scaminToMinZoom: () => scaminToMinZoom
+  scaminToMinZoom: () => scaminToMinZoom,
+  withinBboxFilter: () => withinBboxFilter,
+  worldMinusBboxPolygon: () => worldMinusBboxPolygon
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -1376,9 +1386,11 @@ var S52_LOOKUP = {
     category: "Depths",
     displayCategory: "BASE",
     int1Ref: "I10",
+    // Rendered as depth-number text via labels.ts, not as a visible dot.
     style: { type: "circle", paint: { "circle-color": "CHBLK", "circle-radius": 0, "circle-opacity": 0, "circle-stroke-width": 0 } },
     viewingGroup: 13010,
-    scamin: 0
+    scamin: 0,
+    auditIgnore: true
   },
   DRGARE: {
     objectClass: "DRGARE",
@@ -1439,8 +1451,28 @@ var S52_LOOKUP = {
     category: "Land",
     displayCategory: "OTHER",
     int1Ref: "C20",
+    // Rendered as region NAME label only via labels.ts — no visible shape.
+    // scamin raised from 45_000 → 90_000 so place-name labels (Provincetown,
+    // Plymouth, Marblehead, …) surface at coastal scale (z10) instead of
+    // waiting for z11. NOAA paper charts show major place names at this
+    // scale; one-step-down was masking landfall context for mariners.
     style: { type: "circle", paint: { "circle-color": "CHBRN", "circle-radius": 0, "circle-opacity": 0 } },
     viewingGroup: 12070,
+    scamin: 9e4,
+    auditIgnore: true
+  },
+  SLOGRD: {
+    // Sloping ground — beach gradient / sloping terrain at landfall. Subtle
+    // LANDA tint so it reads as a beach-context cue without competing with
+    // safety-critical layers. Polygon main + Point variant (NOAA encodes 7
+    // Point and 8 Polygon SLOGRD features).
+    objectClass: "SLOGRD",
+    name: "Sloping Ground",
+    category: "Land",
+    displayCategory: "OTHER",
+    int1Ref: "C8",
+    style: { type: "fill", paint: { "fill-color": "LANDA", "fill-opacity": 0.3 } },
+    viewingGroup: 12070,
     scamin: 45e3
   },
   BUAARE: {
@@ -1449,9 +1481,13 @@ var S52_LOOKUP = {
     category: "Land",
     displayCategory: "STANDARD",
     int1Ref: "D1",
+    // scamin dropped (was 45_000 → z11): built-up areas are infrequent at
+    // low zooms and the label config's text-size interpolation already keeps
+    // them readable. Without this drop, town labels were hidden until z11,
+    // one step too aggressive for coastal-scale orientation.
     style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0.25 } },
     viewingGroup: 12210,
-    scamin: 45e3
+    scamin: 0
   },
   BUISGL: {
     objectClass: "BUISGL",
@@ -1463,6 +1499,21 @@ var S52_LOOKUP = {
     viewingGroup: 12210,
     scamin: 22e3
   },
+  FORSTC: {
+    // Fortified structure — coastal fortifications and historic forts. Useful
+    // for visual orientation at landfall. Treated like a building footprint
+    // (CHBRN fill + darker outline) per S-52 F13 portrayal. NOAA encodes 2
+    // Line and 2 Polygon FORSTC features; the Line variant is added in
+    // layer-builder.ts following the LNDARE Line pattern.
+    objectClass: "FORSTC",
+    name: "Fortified Structure",
+    category: "Land",
+    displayCategory: "OTHER",
+    int1Ref: "F13",
+    style: { type: "fill", paint: { "fill-color": "CHBRN", "fill-opacity": 0.4 } },
+    viewingGroup: 12410,
+    scamin: 22e3
+  },
   LAKARE: {
     objectClass: "LAKARE",
     name: "Lake",
@@ -1726,7 +1777,10 @@ var S52_LOOKUP = {
     category: "Hazards",
     displayCategory: "STANDARD",
     int1Ref: "K40",
-    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.6, "icon-allow-overlap": true }, iconImage: "OBSTRN01" },
+    // Step expression hides rocks below zoom 12 (where dense coastal fields render
+    // as solid black masses), then scales linearly through harbor-approach zooms.
+    // Aligns with typical NOAA ENC SCAMIN of 22000 (≈ zoom 12) for these features.
+    style: { type: "symbol", paint: {}, layout: { "icon-size": ["interpolate", ["linear"], ["zoom"], 11.99, 0, 12, 0.3, 14, 0.5, 16, 0.7], "icon-allow-overlap": true }, iconImage: "OBSTRN01" },
     hasConditional: true,
     conditionalAttributes: ["WATLEV", "VALSOU"],
     viewingGroup: 24020,
@@ -1738,7 +1792,7 @@ var S52_LOOKUP = {
     category: "Hazards",
     displayCategory: "STANDARD",
     int1Ref: "K12",
-    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.6, "icon-allow-overlap": true }, iconImage: "UWTROC03" },
+    style: { type: "symbol", paint: {}, layout: { "icon-size": ["interpolate", ["linear"], ["zoom"], 11.99, 0, 12, 0.3, 14, 0.5, 16, 0.7], "icon-allow-overlap": true }, iconImage: "UWTROC03" },
     hasConditional: true,
     conditionalAttributes: ["WATLEV", "VALSOU"],
     viewingGroup: 24020,
@@ -1756,6 +1810,42 @@ var S52_LOOKUP = {
     viewingGroup: 24020,
     scamin: 0
   },
+  WATTUR: {
+    // Water turbulence (tide rips, eddies, overfalls, breakers, bombora) per
+    // S-52 PresLib H44. Safety-relevant for small craft — these features can
+    // swamp a boat that didn't expect them. NOAA paper-chart convention is a
+    // small wavy-line cluster with the abbreviation noted in the label
+    // (`Br` for breakers, `Eddies`, `Overfalls`, `Tide rips`).
+    //
+    // Symbol layer drives the dominant Point geometry; the Polygon variant is
+    // emitted from layer-builder via the same multi-geom pattern as PR #388.
+    objectClass: "WATTUR",
+    name: "Water Turbulence",
+    category: "Hazards",
+    displayCategory: "STANDARD",
+    int1Ref: "H44",
+    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.7, "icon-allow-overlap": true }, iconImage: "WATTUR01" },
+    hasConditional: true,
+    conditionalAttributes: ["CATWAT"],
+    viewingGroup: 24020,
+    scamin: 22e3
+  },
+  FSHFAC: {
+    // Fishing facility — weirs, stake fences, fish traps. Small-craft hazard,
+    // so safety-critical viewing group 24020 (matches OBSTRN/UWTROC/WRECKS).
+    // Subtle water-feature tint (DEPVS @0.25) + Point variant for stake-fence
+    // markers. NOAA encodes 1 Point and 3 Polygon FSHFAC features.
+    objectClass: "FSHFAC",
+    name: "Fishing Facility",
+    category: "Hazards",
+    displayCategory: "STANDARD",
+    int1Ref: "K44",
+    style: { type: "fill", paint: { "fill-color": "DEPVS", "fill-opacity": 0.25 } },
+    hasConditional: true,
+    conditionalAttributes: ["CATFIF"],
+    viewingGroup: 24020,
+    scamin: 22e3
+  },
   SBDARE: {
     objectClass: "SBDARE",
     name: "Seabed Area",
@@ -1766,8 +1856,32 @@ var S52_LOOKUP = {
     viewingGroup: 14010,
     scamin: 22e3
   },
+  WEDKLP: {
+    // Translucent green fill suggests kelp/vegetation; Point variant (the
+    // dominant geometry — 85 of 88 features) is emitted by layer-builder as
+    // a circle, mirroring the LNDARE Point precedent from PR #388.
+    objectClass: "WEDKLP",
+    name: "Weed / Kelp",
+    category: "Land",
+    displayCategory: "STANDARD",
+    int1Ref: "K43",
+    style: { type: "fill", paint: { "fill-color": "CHGRN", "fill-opacity": 0.35 } },
+    hasConditional: true,
+    conditionalAttributes: ["CATWED", "WATLEV"],
+    viewingGroup: 14010,
+    scamin: 22e3
+  },
   // ── Regulated Areas (INT1 Section N) ────────────────────
   ACHARE: {
+    // Anchorages are conventionally rendered as a subtle filled region in
+    // S-52 with an anchor symbol at centroid and a dashed magenta boundary
+    // (PresLib N12, NOAA Chart No. 1 §N). The fill stays low-opacity so
+    // multiple overlapping anchorages can't compound into a flood — see
+    // comments on CTNARE / RESARE below — but 0.04 left the area effectively
+    // invisible. 0.10 produces a faint NOAA-style tint that still reads
+    // against a busy harbor without stacking into purple wash; the dashed
+    // magenta boundary and centroid anchor icon are emitted as companion
+    // layers in layer-builder.ts so the "anchorage here" cue is unambiguous.
     objectClass: "ACHARE",
     name: "Anchorage Area",
     category: "Regulated Areas",
@@ -1778,32 +1892,71 @@ var S52_LOOKUP = {
     scamin: 9e4
   },
   RESARE: {
+    // S-52 spec: restricted areas render as a solid magenta boundary line
+    // (often with T-marks pointing inward). The previous flood-fill at
+    // opacity 0.12 was a major source of the Boston Harbor purple wash —
+    // Logan Airport's aircraft-vicinity restricted zones are RESARE
+    // polygons that overlap the security-zone CTNARE polygons; with both
+    // as flood fills, the harbor inner waters disappeared under stacked
+    // magenta. Same boundary-only treatment as CTNARE.
     objectClass: "RESARE",
     name: "Restricted Area",
     category: "Regulated Areas",
     displayCategory: "STANDARD",
     int1Ref: "N2",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.12 } },
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "TRFCD",
+        "line-width": 1.2,
+        "line-opacity": 0.7
+      }
+    },
     viewingGroup: 26040,
     scamin: 9e4
   },
   CTNARE: {
+    // S-52 IHO INT1 N30 spec: caution areas render as a magenta dashed
+    // boundary + centroid "!" symbol — NOT a flood fill. Our previous
+    // `type: "fill"` with `fill-opacity: 0.08` looked harmless in
+    // isolation but Boston-area Harbor cells have many overlapping CTNARE
+    // features (Logan Airport security zones, harbor traffic regulated
+    // areas, etc.). Each at 8% stacks: 5+ overlapping features → a 35%+
+    // magenta wash that obliterates the underlying depth shading.
+    //
+    // Boundary-only (line) is the correct S-52 portrayal and removes the
+    // stacking-flood-fill problem entirely. Hit-testing for the polygon
+    // interior is lost — if we want it back, add a separate invisible
+    // fill layer with `fill-opacity: 0`. Not worth the cost yet.
     objectClass: "CTNARE",
     name: "Caution Area",
     category: "Regulated Areas",
     displayCategory: "STANDARD",
     int1Ref: "N30",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.08 } },
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "TRFCD",
+        "line-width": 1.2,
+        "line-dasharray": [4, 3],
+        "line-opacity": 0.7
+      }
+    },
     viewingGroup: 26050,
     scamin: 9e4
   },
   FAIRWY: {
+    // Fairways stay as a subtle fill (S-52 convention: very low-opacity
+    // tint so ships can see the bounds of the navigable channel without
+    // obscuring soundings). Reduced from 0.06 → 0.03 to limit stacking.
+    // Long-term: fairway color should arguably be a neutral grey rather
+    // than TRFCD magenta — separate followup.
     objectClass: "FAIRWY",
     name: "Fairway",
     category: "Regulated Areas",
     displayCategory: "STANDARD",
     int1Ref: "M18",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.06 } },
+    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.03 } },
     viewingGroup: 25020,
     scamin: 9e4
   },
@@ -1818,12 +1971,15 @@ var S52_LOOKUP = {
     scamin: 22e3
   },
   TSSLPT: {
+    // Traffic separation lane. Light fill so the directional arrows (rendered
+    // separately) read against it; reduced from 0.08 → 0.04 to avoid stacking
+    // with adjacent TSSLPT/TSSRON polygons.
     objectClass: "TSSLPT",
     name: "TSS Lane Part",
     category: "Regulated Areas",
     displayCategory: "STANDARD",
     int1Ref: "M25",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.08 } },
+    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.04 } },
     viewingGroup: 25010,
     scamin: 9e4
   },
@@ -1833,7 +1989,7 @@ var S52_LOOKUP = {
     category: "Regulated Areas",
     displayCategory: "STANDARD",
     int1Ref: "M26",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.08 } },
+    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.04 } },
     viewingGroup: 25010,
     scamin: 9e4
   },
@@ -1848,22 +2004,43 @@ var S52_LOOKUP = {
     scamin: 9e4
   },
   TESARE: {
+    // S-52 spec: territorial sea boundaries render as a magenta dashed
+    // line (not a fill). Same reasoning as CTNARE/RESARE — even at 0.04
+    // opacity, multiple territorial-sea lobes can stack.
     objectClass: "TESARE",
     name: "Territorial Sea Area",
     category: "Regulated Areas",
     displayCategory: "OTHER",
     int1Ref: "N40",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.04 } },
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "TRFCD",
+        "line-width": 1,
+        "line-dasharray": [6, 4],
+        "line-opacity": 0.6
+      }
+    },
     viewingGroup: 26050,
     scamin: 9e4
   },
   MIPARE: {
+    // S-52 spec: military practice area renders as a magenta dashed
+    // boundary + centroid symbol — boundary-only here, matches CTNARE.
     objectClass: "MIPARE",
     name: "Military Practice Area",
     category: "Regulated Areas",
     displayCategory: "OTHER",
     int1Ref: "N30",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.1 } },
+    style: {
+      type: "line",
+      paint: {
+        "line-color": "TRFCD",
+        "line-width": 1.2,
+        "line-dasharray": [4, 3],
+        "line-opacity": 0.7
+      }
+    },
     viewingGroup: 26050,
     scamin: 9e4
   },
@@ -1880,45 +2057,101 @@ var S52_LOOKUP = {
     hasConditional: true,
     conditionalAttributes: ["CATBRG", "VERCLR"]
   },
+  PYLONS: {
+    objectClass: "PYLONS",
+    name: "Pylon / Bridge Support",
+    category: "Infrastructure",
+    displayCategory: "STANDARD",
+    int1Ref: "D27",
+    // Default fill style — layer-builder emits the Point variant via the
+    // same multi-geom pattern from PR #388 (LNDARE Point fix).
+    style: { type: "fill", paint: { "fill-color": "CHBRN", "fill-opacity": 0.5 } },
+    hasConditional: true,
+    conditionalAttributes: ["CATPYL", "VERLEN"],
+    viewingGroup: 12410,
+    scamin: 22e3
+  },
+  // Submarine cable — S-52 INT1 L30 portrayal: thin dashed CHMGD line.
+  // Matches NOAA ENC Online's portrayal — a clean continuous dashed line,
+  // no periodic pictogram overlays (those proved visually noisy at z14+ when
+  // many parallel cables run in a corridor). Previous TRFCD colour was wrong:
+  // submarine cables are charted in CHMGD per S-52.
+  // scamin 90_000 (→ z10) matches the regulated-area family (CTNARE, FAIRWY,
+  // RESARE, PRDARE) so cables appear at Approach scale alongside the other
+  // navigation hazards mariners route around. Previous 22_000 (→ z12) hid
+  // them at Approach band even though the data is in tiles from z7.
   CBLSUB: {
     objectClass: "CBLSUB",
     name: "Submarine Cable",
     category: "Infrastructure",
-    displayCategory: "OTHER",
+    displayCategory: "STANDARD",
     int1Ref: "L30",
-    style: { type: "line", paint: { "line-color": "TRFCD", "line-width": 1, "line-dasharray": [5, 3] } },
-    viewingGroup: 24010,
-    scamin: 22e3
+    style: { type: "line", paint: { "line-color": "CHMGD", "line-width": 0.8, "line-dasharray": [6, 3] } },
+    hasConditional: true,
+    conditionalAttributes: ["CATCBL", "STATUS"],
+    viewingGroup: 24090,
+    scamin: 9e4
   },
   CBLARE: {
     objectClass: "CBLARE",
     name: "Cable Area",
-    category: "Infrastructure",
-    displayCategory: "OTHER",
-    int1Ref: "L31",
-    style: { type: "fill", paint: { "fill-color": "TRFCD", "fill-opacity": 0.08 } },
-    viewingGroup: 24010,
-    scamin: 22e3
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "L32",
+    // S-52 PresLib L32: dashed magenta boundary + diagonal hatching pattern.
+    // The CHMGD fill is a low-opacity wash under the pattern; layer-builder
+    // emits a dashed CHMGD boundary line for the polygon edge (see
+    // REGULATED_AREA_BOUNDARY_LAYERS).
+    style: { type: "fill", paint: { "fill-color": "CHMGD", "fill-opacity": 0.08, "fill-pattern": "CBLARE01" } },
+    hasConditional: true,
+    conditionalAttributes: ["CATCBL", "STATUS"],
+    viewingGroup: 26010,
+    scamin: 9e4
   },
+  // Submarine pipeline — S-52 INT1 L40 portrayal: thin dashed PIPLN line.
+  // Same family as CBLSUB but PIPLN-coloured. Clean continuous dashed line
+  // without periodic pictograms — matches NOAA portrayal.
   PIPSOL: {
     objectClass: "PIPSOL",
-    name: "Pipeline, Submarine",
+    name: "Submarine Pipeline",
     category: "Infrastructure",
-    displayCategory: "OTHER",
+    displayCategory: "STANDARD",
     int1Ref: "L40",
-    style: { type: "line", paint: { "line-color": "PIPLN", "line-width": 1, "line-dasharray": [6, 3] } },
-    viewingGroup: 24010,
-    scamin: 22e3
+    style: { type: "line", paint: { "line-color": "PIPLN", "line-width": 0.8, "line-dasharray": [6, 3] } },
+    hasConditional: true,
+    conditionalAttributes: ["CATPIP", "STATUS"],
+    viewingGroup: 24090,
+    scamin: 9e4
+  },
+  // Overhead pipeline — S-52 INT1 L41 portrayal: solid thin PIPLN line.
+  // VERCLR clearance label rendered along the line via labels.ts.
+  // Previously absent from the lookup entirely — the 2 NOAA LineString
+  // features were silently dropped.
+  PIPOHD: {
+    objectClass: "PIPOHD",
+    name: "Overhead Pipeline",
+    category: "Infrastructure",
+    displayCategory: "STANDARD",
+    int1Ref: "L41",
+    style: { type: "line", paint: { "line-color": "PIPLN", "line-width": 1 } },
+    hasConditional: true,
+    conditionalAttributes: ["CATPIP", "VERCLR", "STATUS"],
+    viewingGroup: 24070,
+    scamin: 9e4
   },
   PIPARE: {
     objectClass: "PIPARE",
     name: "Pipeline Area",
-    category: "Infrastructure",
-    displayCategory: "OTHER",
-    int1Ref: "L41",
-    style: { type: "fill", paint: { "fill-color": "PIPLN", "fill-opacity": 0.08 } },
-    viewingGroup: 24010,
-    scamin: 22e3
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "L42",
+    // S-52 PresLib L42: dashed pipeline-colour boundary + diagonal hatching.
+    // PIPLN wash under the pattern; layer-builder emits the dashed boundary.
+    style: { type: "fill", paint: { "fill-color": "PIPLN", "fill-opacity": 0.08, "fill-pattern": "PIPARE01" } },
+    hasConditional: true,
+    conditionalAttributes: ["CATPIP", "STATUS"],
+    viewingGroup: 26010,
+    scamin: 9e4
   },
   MORFAC: {
     objectClass: "MORFAC",
@@ -2006,7 +2239,9 @@ var S52_LOOKUP = {
     category: "Land",
     displayCategory: "OTHER",
     int1Ref: "E33",
-    style: { type: "circle", paint: { "circle-color": "CHBLK", "circle-radius": 3, "circle-stroke-width": 0 } },
+    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.6, "icon-allow-overlap": true }, iconImage: "TNKCON02" },
+    hasConditional: true,
+    conditionalAttributes: ["CATSIL", "CONVIS"],
     viewingGroup: 12210,
     scamin: 22e3
   },
@@ -2118,15 +2353,22 @@ var S52_LOOKUP = {
     scamin: 22e3
   },
   // ── 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
+  // (mast clearance), not a submerged one. The VERCLR clearance label is
+  // emitted along the line via labels.ts. Previous CHBLK + dash pattern
+  // was wrong.
   CBLOHD: {
     objectClass: "CBLOHD",
-    name: "Cable, Overhead",
+    name: "Overhead Cable",
     category: "Infrastructure",
     displayCategory: "STANDARD",
-    int1Ref: "D26",
-    style: { type: "line", paint: { "line-color": "CHBLK", "line-width": 1, "line-dasharray": [4, 2] } },
-    viewingGroup: 24010,
-    scamin: 22e3
+    int1Ref: "L31",
+    style: { type: "line", paint: { "line-color": "CHMGD", "line-width": 1 } },
+    hasConditional: true,
+    conditionalAttributes: ["CATCBL", "VERCLR", "STATUS"],
+    viewingGroup: 24070,
+    scamin: 9e4
   },
   // ── Routes (INT1 Section M) ─────────────────────────────
   FERYRT: {
@@ -2156,19 +2398,41 @@ var S52_LOOKUP = {
     category: "Land",
     displayCategory: "OTHER",
     int1Ref: "C31",
-    style: { type: "fill", paint: { "fill-color": "LANDF", "fill-opacity": 0.2 } },
+    // Pattern fill driven by CATVEG (resolved in `style-resolver.ts` via
+    // `vegatnPatternExpression`). `fill-color` is the MapLibre fallback for
+    // 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`).
+    style: {
+      type: "fill",
+      paint: { "fill-color": "LANDF", "fill-opacity": 0.6, "fill-pattern": "VEGATN03" }
+    },
+    hasConditional: true,
+    conditionalAttributes: ["CATVEG"],
     viewingGroup: 12050,
     scamin: 22e3
   },
   SEAARE: {
+    // Cross-band water base. SEAARE polygons tile the sea below the
+    // detailed DEPARE depth-area features, so where DEPARE has coverage
+    // the depth bins win on top; where it doesn't (the coverage hole
+    // between Coastal and Approach cells, etc.), SEAARE paints the
+    // "deep water" colour instead of leaving the basemap to bleed
+    // through. Drawn before DEPARE — see `draw-order.ts`. Opaque,
+    // forced via `OPAQUE_FILL_LAYERS` in `style-resolver.ts`.
+    //
+    // `scamin: 0` so the base fill renders at every continuous zoom,
+    // gated only by the band-priority window. The label config in
+    // `labels.ts` keeps its own `minzoom: 5` so the OBJNAM doesn't
+    // splash at low zooms.
     objectClass: "SEAARE",
     name: "Sea Area",
     category: "Depths",
     displayCategory: "OTHER",
     int1Ref: "O1",
-    style: { type: "fill", paint: { "fill-color": "DEPMD", "fill-opacity": 0 } },
+    style: { type: "fill", paint: { "fill-color": "DEPDW", "fill-opacity": 1 } },
     viewingGroup: 12070,
-    scamin: 9e4
+    scamin: 0
   },
   MARCUL: {
     objectClass: "MARCUL",
@@ -2230,6 +2494,27 @@ var S52_LOOKUP = {
     viewingGroup: 25010,
     scamin: 9e4
   },
+  PRDARE: {
+    // Production Area — offshore oil/gas platforms, offshore wind farms (or
+    // their exclusion zones), aquaculture, and other industrial production
+    // areas mariners must not enter. Safety-critical: a vessel transiting
+    // Boston-NYC should see Block Island / Vineyard Wind exclusion zones.
+    //
+    // Boundary-only dashed magenta — matches RESARE/CTNARE/MIPARE/TESARE
+    // convention via LINE_FROM_POLYGON_LAYERS (see layer-builder.ts). Avoids
+    // the flood-fill stacking problem where multiple regulated areas overlap
+    // and obliterate underlying depth shading.
+    objectClass: "PRDARE",
+    name: "Production Area",
+    category: "Regulated Areas",
+    displayCategory: "STANDARD",
+    int1Ref: "L5",
+    style: { type: "line", paint: { "line-color": "CHMGD", "line-width": 1.4, "line-dasharray": [4, 2] } },
+    hasConditional: true,
+    conditionalAttributes: ["CATPRA", "STATUS"],
+    viewingGroup: 26010,
+    scamin: 9e4
+  },
   OSPARE: {
     objectClass: "OSPARE",
     name: "Offshore Production Area",
@@ -2260,6 +2545,21 @@ var S52_LOOKUP = {
     viewingGroup: 12210,
     scamin: 22e3
   },
+  RUNWAY: {
+    // Airport runway near coast — navigation reference, not a navigable
+    // feature. Distinct from ROADWY (which is `type: "line"`) — runways are
+    // typically polygon-encoded showing the actual paved extent. NOAA encodes
+    // 1 Line and 5 Polygon RUNWAY features; the Line variant is added in
+    // layer-builder.ts so neither geometry type is silently dropped.
+    objectClass: "RUNWAY",
+    name: "Runway",
+    category: "Infrastructure",
+    displayCategory: "OTHER",
+    int1Ref: "D20",
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0.3 } },
+    viewingGroup: 12250,
+    scamin: 22e3
+  },
   DAMCON: {
     objectClass: "DAMCON",
     name: "Dam",
@@ -2270,48 +2570,78 @@ var S52_LOOKUP = {
     viewingGroup: 12410,
     scamin: 22e3
   },
+  // ── Magnetic Variation (INT1 Section B) ─────────────────
+  // Polygon features (~136 in NOAA corpus) are isogonic zones — areas of
+  // constant magnetic variation. The line style here is drawn as the
+  // polygon BOUNDARY (LINE_FROM_POLYGON_LAYERS in layer-builder.ts), giving
+  // the faint dashed magenta isogonic lines mariners read for compass
+  // correction. Point features (~58) get their own circle layer in
+  // layer-builder.ts. The VALMAG label is rendered via labels.ts.
+  MAGVAR: {
+    objectClass: "MAGVAR",
+    name: "Magnetic Variation",
+    category: "Meta",
+    displayCategory: "OTHER",
+    int1Ref: "B68",
+    style: { type: "line", paint: { "line-color": "CHMGD", "line-width": 0.5, "line-opacity": 0.5, "line-dasharray": [4, 2] } },
+    hasConditional: true,
+    conditionalAttributes: ["VALMAG", "VALACM", "RYRMGV"],
+    viewingGroup: 23010,
+    scamin: 0
+  },
   // ── Meta (hidden by default) ────────────────────────────
+  // M_* and DSID are S-57 metadata classes — they describe the dataset
+  // (coverage extent, survey reliability, source publication, etc.) and
+  // carry attributes for click-query lookups, but never draw a visible
+  // shape. `auditIgnore` keeps the layer-coverage audit from flagging
+  // their geometry-type rows as gaps.
   M_COVR: {
     objectClass: "M_COVR",
     name: "Coverage",
     category: "Meta",
     displayCategory: "META",
-    style: { type: "line", paint: { "line-color": "CHGRF", "line-width": 0.5, "line-opacity": 0.3 } }
+    style: { type: "line", paint: { "line-color": "CHGRF", "line-width": 0.5, "line-opacity": 0.3 } },
+    auditIgnore: true
   },
   M_NPUB: {
     objectClass: "M_NPUB",
     name: "Nautical Publication",
     category: "Meta",
     displayCategory: "META",
-    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } }
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
   },
   M_NSYS: {
     objectClass: "M_NSYS",
     name: "Nav System of Marks",
     category: "Meta",
     displayCategory: "META",
-    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } }
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
   },
   M_QUAL: {
     objectClass: "M_QUAL",
     name: "Quality of Data",
     category: "Meta",
     displayCategory: "META",
-    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } }
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
   },
   M_SREL: {
     objectClass: "M_SREL",
     name: "Survey Reliability",
     category: "Meta",
     displayCategory: "META",
-    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } }
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
   },
   DSID: {
     objectClass: "DSID",
     name: "Dataset ID",
     category: "Meta",
     displayCategory: "META",
-    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } }
+    style: { type: "fill", paint: { "fill-color": "CHGRF", "fill-opacity": 0 } },
+    auditIgnore: true
   }
 };
 
@@ -2324,25 +2654,38 @@ var S52_DRAW_ORDER = [
   "M_NSYS",
   "M_QUAL",
   "M_SREL",
-  // 2. Depth areas – deepest first (fill)
-  "DEPARE",
+  // 2. Depth areas – broadest first (fill).
+  //
+  // SEAARE goes BEFORE DEPARE so its uniform "deep water" base fill paints
+  // under DEPARE's depth-tier bins. Where DEPARE has coverage, the bin
+  // colour wins on top; where DEPARE doesn't (cross-band coverage gaps —
+  // e.g. between Coastal and Approach cell extents), SEAARE provides a
+  // chart-coloured base instead of the basemap bleeding through. This is
+  // the visual-coherence fix for hard charcoal-vs-vector-blue seams at
+  // scale-band boundaries — see `s52-lookup.ts`'s SEAARE entry for the
+  // paired paint-spec change (fill-opacity 0 → 1, color → DEPDW).
   "SEAARE",
+  "DEPARE",
   // 3. Dredged / swept areas (fill)
   "DRGARE",
   "SWPARE",
   "SBDARE",
+  "WEDKLP",
   // 4. Land (fill)
   "LNDARE",
+  "SLOGRD",
   "BUAARE",
   "LAKARE",
   "RIVERS",
   "CANALS",
   "VEGATN",
   "AIRARE",
+  "RUNWAY",
   // 5. Area hazards (fill)
   "OBSTRN",
   "UWTROC",
   "MARCUL",
+  "FSHFAC",
   // 6. Regulated areas (fill)
   "TESARE",
   "MIPARE",
@@ -2355,6 +2698,7 @@ var S52_DRAW_ORDER = [
   "ACHARE",
   "RESARE",
   "CTNARE",
+  "PRDARE",
   "OSPARE",
   "LOGPON",
   "CBLARE",
@@ -2365,6 +2709,8 @@ var S52_DRAW_ORDER = [
   "DRYDOC",
   "FLODOC",
   "BRIDGE",
+  "PYLONS",
+  "FORSTC",
   // 8. Coastline / shore (line)
   "COALNE",
   "SLCONS",
@@ -2372,6 +2718,11 @@ var S52_DRAW_ORDER = [
   // 9. Depth contours (line)
   "DEPCNT",
   "LNDELV",
+  // 9a. Magnetic-variation isogonic lines (background reference annotations,
+  // drawn above depth contours so the magenta dashes read against the
+  // depth-fill ladder, but below nav lines / nav aids so safety-critical
+  // routing and aids-to-nav win the visual hierarchy).
+  "MAGVAR",
   // 10. Navigation lines (line)
   "NAVLNE",
   "TSSBND",
@@ -2381,6 +2732,7 @@ var S52_DRAW_ORDER = [
   "FERYRT",
   "RECTRC",
   "PIPSOL",
+  "PIPOHD",
   "CBLSUB",
   "CBLOHD",
   "GATCON",
@@ -2423,7 +2775,8 @@ var S52_DRAW_ORDER = [
   "LITFLT",
   "LIGHTS",
   // 13. Hazard points (very top)
-  "WRECKS"
+  "WRECKS",
+  "WATTUR"
 ];
 function getDrawPriority(layerName) {
   const idx = S52_DRAW_ORDER.indexOf(layerName);
@@ -2458,9 +2811,22 @@ function depareFillExpression(ct = "DAY") {
     resolveColor("DEPDW", ct)
   ];
 }
+function colourCodeCase(cases, fallback) {
+  const colourStr = ["to-string", ["coalesce", ["get", "COLOUR"], ["get", "colour"], ""]];
+  const expr = ["case"];
+  for (const [code, value] of cases) {
+    expr.push([">=", ["index-of", `"${code}"`, colourStr], 0], value);
+  }
+  for (const [code, value] of cases) {
+    expr.push(["==", colourStr, code], value);
+  }
+  expr.push(fallback);
+  return expr;
+}
 function lightColor(props, ct = "DAY") {
-  const colour = Number(props.COLOUR ?? props.colour ?? 0);
-  switch (colour) {
+  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);
+  switch (code) {
     case 1:
       return resolveColor("LITWT", ct);
     case 3:
@@ -2478,23 +2844,17 @@ function lightColor(props, ct = "DAY") {
   }
 }
 function lightFillExpression(ct = "DAY") {
-  return [
-    "match",
-    ["coalesce", ["get", "COLOUR"], ["get", "colour"], 0],
-    1,
-    resolveColor("LITWT", ct),
-    3,
-    resolveColor("LITRD", ct),
-    4,
-    resolveColor("LITGN", ct),
-    5,
-    resolveColor("LITBL", ct),
-    6,
-    resolveColor("LITYW", ct),
-    11,
-    resolveColor("LITOR", ct),
+  return colourCodeCase(
+    [
+      ["3", resolveColor("LITRD", ct)],
+      ["4", resolveColor("LITGN", ct)],
+      ["6", resolveColor("LITYW", ct)],
+      ["11", resolveColor("LITOR", ct)],
+      ["5", resolveColor("LITBL", ct)],
+      ["1", resolveColor("LITWT", ct)]
+    ],
     resolveColor("LITYW", ct)
-  ];
+  );
 }
 function lateralColor(props, ct = "DAY") {
   const catlam = Number(props.CATLAM ?? props.catlam ?? 0);
@@ -2538,9 +2898,54 @@ function hazardFillExpression(ct = "DAY") {
     resolveColor("RESBL", ct)
   ];
 }
+function vegatnPatternExpression() {
+  return [
+    "match",
+    ["coalesce", ["get", "CATVEG"], ["get", "catveg"], 0],
+    1,
+    "VEGATN03",
+    // grass
+    3,
+    "VEGATN03",
+    // bush
+    4,
+    "VEGATN04",
+    // deciduous wood
+    5,
+    "VEGATN04",
+    // coniferous wood
+    6,
+    "VEGATN04",
+    // wood (mixed)
+    7,
+    "MARSHES1",
+    // mangroves
+    10,
+    "VEGATN03",
+    // scrub
+    11,
+    "VEGATN04",
+    // tree
+    12,
+    "VEGATN04",
+    // evergreen
+    16,
+    "MARSHES1",
+    // swamp
+    17,
+    "MARSHES1",
+    // marsh
+    21,
+    "VEGATN04",
+    // savannah
+    "VEGATN03"
+    // default: grass pattern
+  ];
+}
 function daymarkColor(props, ct = "DAY") {
-  const colour = Number(props.COLOUR ?? props.colour ?? 0);
-  switch (colour) {
+  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);
+  switch (code) {
     case 1:
       return resolveColor("LITWT", ct);
     case 3:
@@ -2827,14 +3232,14 @@ function topmarkXShape() {
 }
 function lightMajor() {
   return svg(`
-    <circle cx="16" cy="22" r="3" fill="#d200d2"/>
-    <path d="M16,22 L12.5,12 Q16,2 19.5,12 Z" fill="#d200d2"/>
+    <circle cx="16" cy="16" r="2.5" fill="#d200d2"/>
+    <path d="M16,16 L20.6,25.5 Q30,30 25.5,20.6 Z" fill="#d200d2"/>
   `);
 }
 function lightMinor() {
   return svg(`
-    <circle cx="16" cy="22" r="2.5" fill="#d200d2"/>
-    <path d="M16,22 L14,14 Q16,7 18,14 Z" fill="#d200d2"/>
+    <circle cx="16" cy="16" r="2" fill="#d200d2"/>
+    <path d="M16,16 L20.3,23.1 Q26.6,26.6 23.1,20.3 Z" fill="#d200d2"/>
   `);
 }
 function lightSector() {
@@ -4952,6 +5357,7 @@ var SYMBOL_MAP = {
   WRECKS: "WRECKS04",
   OBSTRN: "OBSTRN01",
   UWTROC: "UWTROC03",
+  WATTUR: "WATTUR01",
   // Landmarks
   LNDMRK: "BCNTOW01",
   // Infrastructure
@@ -4964,7 +5370,7 @@ var SYMBOL_MAP = {
   SISTAT: "SISTAT02",
   SMCFAC: "ACHARE02",
   // Land infrastructure
-  SILTNK: "BCNTOW01",
+  SILTNK: "TNKCON02",
   BUISGL: "BCNTOW01",
   HRBFAC: "ACHARE02",
   // Areas
@@ -5052,20 +5458,69 @@ function getIconExpression(layerName) {
       // Default: submerged/dangerous
     ];
   }
+  if (layerName === "SILTNK") {
+    const catsil = ["coalesce", ["get", "CATSIL"], ["get", "catsil"], 0];
+    const convis = ["coalesce", ["get", "CONVIS"], ["get", "convis"], 0];
+    return [
+      "case",
+      ["==", convis, 1],
+      [
+        "match",
+        catsil,
+        1,
+        "SILBUI11",
+        // Silo, conspicuous
+        2,
+        "TNKCON12",
+        // Tank, conspicuous
+        3,
+        "TOWERS03",
+        // Grain elevator, conspicuous
+        4,
+        "TOWERS12",
+        // Water tower, conspicuous
+        "TNKCON12"
+        // CONVIS=1 but no CATSIL → conspicuous tank
+      ],
+      [
+        "match",
+        catsil,
+        1,
+        "SILBUI01",
+        // Silo
+        2,
+        "TNKCON02",
+        // Tank
+        3,
+        "TOWERS01",
+        // Grain elevator
+        4,
+        "TOWERS02",
+        // Water tower
+        "TNKCON02"
+        // Default: non-conspicuous tank
+      ]
+    ];
+  }
   if (layerName === "LNDMRK") {
     return [
       "match",
       ["coalesce", ["get", "CATLMK"], ["get", "catlmk"], 0],
-      // Most LNDMRK types → generic tower beacon (best available S-52 vector)
       1,
       "CAIRNS11",
       // Cairn
       17,
       "BCNTOW01",
-      // Spire → tower
+      // Tower
+      18,
+      "LNDMRK18",
+      // Windmill (4-vane)
+      19,
+      "LNDMRK19",
+      // Wind motor / turbine (3-blade)
       20,
       "BCNTOW01",
-      // Tower
+      // Spire → tower
       "BCNTOW01"
       // Default: tower
     ];
@@ -5140,13 +5595,13 @@ function getIconExpression(layerName) {
       "match",
       ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0],
       4,
-      "UWTROC03",
-      // Awash
+      "UWTROC01",
+      // Covers and uncovers — dotted-circle + cross (K11)
       5,
-      "UWTROC04",
-      // Covers and uncovers
+      "UWTROC03",
+      // Awash at chart datum — solid-circle + cross (K12)
       "UWTROC04"
-      // Default: underwater
+      // Default / always submerged — asterisk (K13)
     ];
   }
   if (layerName === "OBSTRN") {
@@ -5185,7 +5640,27 @@ function getIconExpression(layerName) {
     ];
   }
   if (layerName === "BRIDGE") {
-    return "BRIDGE01";
+    return [
+      "match",
+      ["coalesce", ["get", "CATBRG"], ["get", "catbrg"], 1],
+      1,
+      "BRIDGE01",
+      // Fixed bridge (D20)
+      2,
+      "BRIDGE02",
+      // Opening bridge — generic movable (D21)
+      3,
+      "BRIDGE03",
+      // Swing bridge (D23.3)
+      4,
+      "BRIDGE04",
+      // Lifting bridge (D23.1)
+      5,
+      "BRIDGE05",
+      // Bascule bridge (D23.2)
+      "BRIDGE01"
+      // Default: fixed
+    ];
   }
   if (layerName === "LIGHTS") {
     return [
@@ -5290,7 +5765,7 @@ function scaminToMinZoom(scamin) {
   return void 0;
 }
 var SAFETY_CRITICAL_GROUPS = /* @__PURE__ */ new Set([24020, 27010, 27070, 27080]);
-var OPAQUE_FILL_LAYERS = /* @__PURE__ */ new Set(["DEPARE", "LNDARE", "UNSARE", "LAKARE", "DRGARE"]);
+var OPAQUE_FILL_LAYERS = /* @__PURE__ */ new Set(["DEPARE", "LNDARE", "UNSARE", "LAKARE", "DRGARE", "SEAARE"]);
 var SCAMIN_OVERRIDE_LAYERS = /* @__PURE__ */ new Set([
   "BOYLAT",
   "BOYCAR",
@@ -5338,6 +5813,8 @@ function resolvePaint(layerName, paint, geomType, ct = "DAY") {
     resolved["circle-color"] = lateralFillExpression(ct);
   } else if ((layerName === "OBSTRN" || layerName === "UWTROC" || layerName === "WRECKS") && geomType === "circle") {
     resolved["circle-color"] = hazardFillExpression(ct);
+  } else if (layerName === "VEGATN" && geomType === "fill") {
+    resolved["fill-pattern"] = vegatnPatternExpression();
   }
   return resolved;
 }
@@ -5358,7 +5835,7 @@ function resolveStyle(layerName, geomKind, ct = "DAY") {
       paint: {},
       layout: {
         "icon-image": iconExpr,
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 8, 0.4, 14, 0.8],
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 6, 0.32, 13, 0.32, 14, 0.36, 18, 1.04],
         "icon-allow-overlap": true,
         "icon-ignore-placement": false,
         ...entry.style.layout ?? {}
@@ -5439,13 +5916,200 @@ var COLOUR_ABBR = {
   6: "Y",
   11: "Or"
 };
+var NATSUR_ABBR = [
+  [1, "M"],
+  // mud
+  [2, "Cy"],
+  // clay
+  [3, "Si"],
+  // silt
+  [4, "S"],
+  // sand
+  [5, "St"],
+  // stones
+  [6, "G"],
+  // gravel
+  [7, "P"],
+  // pebbles
+  [8, "Cb"],
+  // cobbles
+  [9, "R"],
+  // rock
+  [11, "La"],
+  // lava
+  [14, "Co"],
+  // coral
+  [17, "Sh"],
+  // shells
+  [18, "Bo"]
+  // boulder
+];
+var NATQUA_ABBR = [
+  [1, "f"],
+  // fine
+  [2, "m"],
+  // medium
+  [3, "c"],
+  // coarse
+  [4, "bk"],
+  // broken
+  [5, "sy"],
+  // sticky
+  [6, "so"],
+  // soft
+  [7, "sf"],
+  // stiff
+  [8, "v"],
+  // volcanic
+  [9, "ca"],
+  // calcareous
+  [10, "h"]
+  // hard
+];
 var DARK_BG = "#1a1d23";
-function getLabelConfig(layerName) {
+var NAV_AID_LABEL_TEXT_SIZE = [
+  "interpolate",
+  ["linear"],
+  ["zoom"],
+  10,
+  8,
+  14,
+  10,
+  18,
+  13
+];
+var NAV_AID_LABEL_FONT = ["Open Sans Semibold"];
+function listAttrHasCode(stringified, code) {
+  return [
+    "any",
+    [">=", ["index-of", `"${code}"`, stringified], 0],
+    [
+      ">=",
+      ["index-of", `,${code},`, ["concat", ",", stringified, ","]],
+      0
+    ]
+  ];
+}
+function buildSeabedLabelExpression() {
+  const natsurStr = [
+    "to-string",
+    ["coalesce", ["get", "NATSUR"], ["get", "natsur"], ""]
+  ];
+  const natquaStr = [
+    "to-string",
+    ["coalesce", ["get", "NATQUA"], ["get", "natqua"], ""]
+  ];
+  const natquaPrefix = ["case"];
+  for (const [code, abbr] of NATQUA_ABBR) {
+    natquaPrefix.push(listAttrHasCode(natquaStr, code), abbr);
+  }
+  natquaPrefix.push("");
+  const natsurParts = ["concat"];
+  for (const [code, abbr] of NATSUR_ABBR) {
+    natsurParts.push([
+      "case",
+      listAttrHasCode(natsurStr, code),
+      `.${abbr}`,
+      ""
+    ]);
+  }
+  const natsurJoined = ["slice", natsurParts, 1];
+  return ["concat", natquaPrefix, natsurJoined];
+}
+var COLOR = {
+  WATER: "#9ec1d8",
+  WATER_DEEP: "#8fb8d0",
+  LAND_REGION: "#e8d8b8",
+  LAND_NATURAL: "#e0d8c8",
+  CITY: "#f1e7d2",
+  AIRPORT: "#d4c9b0",
+  STRUCTURE: "#bfa88a",
+  STRUCTURE_LIGHT: "#c8c0b0",
+  SOUNDING: "#c8c8c8",
+  NAV_NUMBER: "#ffffff",
+  NAV_CARDINAL: "#fdf0b0",
+  NAV_SPECIAL: "#eab308",
+  LIGHT: "#fdf0b0"
+};
+var ORIENTATION_BAND_SORT_KEY = [
+  "to-number",
+  ["slice", ["coalesce", ["get", "_cell_id"], "??9???"], 2, 3],
+  9
+];
+var LABEL_BEHAVIOR = {
+  // Orientation labels — render once across all bands.
+  SEAARE: "orientation-cross-band",
+  LNDRGN: "orientation-cross-band",
+  LAKARE: "orientation-cross-band",
+  RIVERS: "orientation-cross-band",
+  CANALS: "orientation-cross-band",
+  BUAARE: "orientation-cross-band",
+  AIRARE: "orientation-cross-band",
+  LNDARE: "orientation-cross-band",
+  // Production areas (offshore wind farms, oil/gas platforms) — rare but
+  // named. Use polygon-centroid placement across bands so "Block Island
+  // Wind Farm" / "Vineyard Wind" labels show when the area renders.
+  PRDARE: "orientation-cross-band",
+  // Feature-specific labels — fan by band so only the dominant band shows.
+  SOUNDG: "feature-band-gated",
+  DEPCNT: "feature-band-gated",
+  LIGHTS: "feature-band-gated",
+  BOYLAT: "feature-band-gated",
+  BCNLAT: "feature-band-gated",
+  BOYCAR: "feature-band-gated",
+  BCNCAR: "feature-band-gated",
+  BOYSPP: "feature-band-gated",
+  BCNSPP: "feature-band-gated",
+  BOYISD: "feature-band-gated",
+  BOYSAW: "feature-band-gated",
+  BRIDGE: "feature-band-gated",
+  PILPNT: "feature-band-gated",
+  MORFAC: "feature-band-gated",
+  SLCONS: "feature-band-gated",
+  BUISGL: "feature-band-gated",
+  LNDMRK: "feature-band-gated"
+};
+function getLabelBehavior(layerName) {
+  return LABEL_BEHAVIOR[layerName] ?? "feature-band-gated";
+}
+function getLabelConfig(layerName, opts = {}) {
   switch (layerName) {
-    case "SOUNDG":
+    case "SOUNDG": {
+      const ct = opts.colorTable ?? "DAY";
+      const safetyContour = opts.safetyContour ?? 10;
+      const twoShade = opts.twoShadeSoundings ?? true;
+      const weight = opts.soundingFontWeight ?? "semibold";
+      const screenColors = ct === "DAY" ? { shoaler: DARK_BG, deeper: "#4a5560", halo: "#ffffff" } : { shoaler: resolveColor("SNDG2", ct), deeper: resolveColor("SNDG1", ct), halo: resolveColor("UIBCK", ct) };
+      const depthExpr = [
+        "to-number",
+        ["coalesce", ["get", "depth"], ["get", "DEPTH"], ["get", "VALSOU"]],
+        9999
+      ];
+      const textColor = twoShade ? [
+        "case",
+        ["<", depthExpr, safetyContour],
+        screenColors.shoaler,
+        screenColors.deeper
+      ] : screenColors.shoaler;
+      const haloColor = screenColors.halo;
+      const fontStack = weight === "semibold" ? ["Open Sans Semibold", "Open Sans Regular"] : ["Open Sans Regular"];
       return {
         type: "symbol",
-        textField: ["get", "depth"],
+        // Property name varies by source path:
+        //   GeoJSON path → preprocessSoundings adds lowercase `depth` (string)
+        //   PMTiles path → baremetal ingest writes uppercase `DEPTH` (number)
+        //   raw S-57    → `VALSOU` last-resort fallback
+        textField: [
+          "coalesce",
+          ["get", "depth"],
+          ["get", "DEPTH"],
+          ["get", "VALSOU"]
+        ],
+        // Compact ladder tuned for screen DPI — small but legible against
+        // dense depth-contour fields. 0.5 px halo proved too thin (text
+        // disappeared into contours); 2.0+ px proved too thick (fuzzy
+        // blob). Settled here: 7/8/10/12 across z8/z11/z14/z16 with a
+        // flat 1.0 px halo — enough cut-out for separation without bulk.
         textSize: [
           "interpolate",
           ["linear"],
@@ -5453,39 +6117,67 @@ function getLabelConfig(layerName) {
           8,
           7,
           11,
-          9,
+          8,
           14,
-          11
+          10,
+          16,
+          12
         ],
-        textColor: "#c8c8c8",
-        textHaloColor: DARK_BG,
-        textHaloWidth: 1.2,
+        textColor,
+        textHaloColor: haloColor,
+        textHaloWidth: 1,
         textOffset: [0, 0],
-        textFont: ["Open Sans Regular", "Arial Unicode MS Regular"],
+        textFont: fontStack,
         minzoom: 8,
         layout: {
           "text-anchor": "center",
           "text-allow-overlap": false,
-          "text-padding": 5,
+          // Slightly more breathing room around the (now larger) glyphs.
+          "text-padding": 6,
           "text-optional": true,
+          // Small positive tracking opens up dense numerals at small
+          // sizes — established cartographic typography practice.
+          "text-letter-spacing": 0.02,
           // Shallowest-wins: Mapbox GL renders lower sort keys first and
           // gives them collision priority. Using depth directly ensures
           // the shallowest sounding in a cluster is always the one shown,
           // even when labels are hidden due to overlap.
-          "symbol-sort-key": ["to-number", ["get", "depth"], 999]
+          "symbol-sort-key": [
+            "to-number",
+            ["coalesce", ["get", "depth"], ["get", "DEPTH"], ["get", "VALSOU"]],
+            999
+          ]
         }
       };
+    }
     case "LNDRGN":
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 11,
-        textColor: "#e0d8c8",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          8,
+          10,
+          12,
+          12,
+          15,
+          14
+        ],
+        textColor: COLOR.LAND_REGION,
         textHaloColor: DARK_BG,
-        textHaloWidth: 1.5,
+        textHaloWidth: 1.4,
         textOffset: [0, 0],
-        textFont: ["Open Sans Italic", "Arial Unicode MS Regular"],
-        minzoom: 9
+        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
+        }
       };
     case "LNDMRK":
       return {
@@ -5496,166 +6188,300 @@ function getLabelConfig(layerName) {
         textHaloColor: DARK_BG,
         textHaloWidth: 1.5,
         textOffset: [0, 1.2],
-        minzoom: 10
+        minzoom: 9
       };
     case "BOYLAT":
       return {
         type: "symbol",
         textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
-        textSize: 8,
-        textColor: "#ffffff",
-        textHaloColor: DARK_BG,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#ffffff",
         textHaloWidth: 1.5,
         textOffset: [0, 1.5],
-        minzoom: 12
+        minzoom: 10
       };
     case "BCNLAT":
       return {
         type: "symbol",
         textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
-        textSize: 8,
-        textColor: "#ffffff",
-        textHaloColor: DARK_BG,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#ffffff",
         textHaloWidth: 1.5,
         textOffset: [0, 1.5],
-        minzoom: 12
+        minzoom: 10
       };
     case "BOYCAR":
     case "BCNCAR":
       return {
         type: "symbol",
         textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
-        textSize: 8,
-        textColor: "#fdf0b0",
-        textHaloColor: DARK_BG,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#fdf0b0",
         textHaloWidth: 1.5,
         textOffset: [0, 1.5],
-        minzoom: 12
+        minzoom: 10
       };
     case "BOYSPP":
     case "BCNSPP":
       return {
         type: "symbol",
         textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
-        textSize: 8,
-        textColor: "#eab308",
-        textHaloColor: DARK_BG,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#eab308",
         textHaloWidth: 1.5,
         textOffset: [0, 1.5],
-        minzoom: 12
+        minzoom: 10
       };
     case "BOYISD":
     case "BOYSAW":
       return {
         type: "symbol",
         textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
-        textSize: 8,
-        textColor: "#ffffff",
-        textHaloColor: DARK_BG,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#ffffff",
         textHaloWidth: 1.5,
         textOffset: [0, 1.5],
-        minzoom: 12
+        minzoom: 10
       };
     case "LIGHTS":
       return {
         type: "symbol",
         textField: ["get", "_lightLabel"],
-        textSize: 8,
-        textColor: "#fdf0b0",
-        textHaloColor: DARK_BG,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#fdf0b0",
+        textHaloWidth: 1.5,
+        textOffset: [2, 0],
+        minzoom: 9,
+        layout: {
+          "text-anchor": "left"
+        }
+      };
+    case "FOGSIG": {
+      const catfogExpr = [
+        "match",
+        ["to-number", ["coalesce", ["get", "CATFOG"], 0], 0],
+        2,
+        "DIA",
+        3,
+        "SIREN",
+        4,
+        "NAUTO",
+        5,
+        "BELL",
+        6,
+        "WHIS",
+        7,
+        "REED",
+        8,
+        "GONG",
+        9,
+        "HORN",
+        ""
+      ];
+      return {
+        type: "symbol",
+        textField: catfogExpr,
+        textSize: NAV_AID_LABEL_TEXT_SIZE,
+        textFont: NAV_AID_LABEL_FONT,
+        textColor: DARK_BG,
+        textHaloColor: "#b0c8e8",
         textHaloWidth: 1.5,
-        textOffset: [1.5, 0],
-        minzoom: 11
+        textOffset: [2, 1.2],
+        minzoom: 11,
+        layout: {
+          "text-anchor": "left",
+          "text-allow-overlap": false,
+          "text-optional": true
+        }
       };
+    }
     case "SEAARE":
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 13,
-        textColor: "#8fb8d0",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          5,
+          11,
+          8,
+          13,
+          11,
+          15,
+          14,
+          17
+        ],
+        textColor: COLOR.WATER_DEEP,
         textHaloColor: DARK_BG,
         textHaloWidth: 1.8,
         textOffset: [0, 0],
-        textFont: ["Open Sans Italic", "Arial Unicode MS Regular"],
-        minzoom: 6,
+        textFont: ["Open Sans Italic"],
+        minzoom: 5,
         layout: {
           "text-anchor": "center",
           "text-allow-overlap": false,
-          "text-padding": 8,
+          "text-padding": 10,
           "text-optional": true,
-          "text-letter-spacing": 0.15
+          "text-letter-spacing": 0.15,
+          "text-max-width": 9,
+          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
         }
       };
     case "LAKARE":
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 11,
-        textColor: "#8fb8d0",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          8,
+          10,
+          12,
+          12,
+          15,
+          14
+        ],
+        textColor: COLOR.WATER,
         textHaloColor: DARK_BG,
         textHaloWidth: 1.5,
         textOffset: [0, 0],
-        textFont: ["Open Sans Italic", "Arial Unicode MS Regular"],
-        minzoom: 9,
+        textFont: ["Open Sans Italic"],
+        minzoom: 8,
         layout: {
           "text-anchor": "center",
           "text-allow-overlap": false,
           "text-padding": 6,
-          "text-optional": true
+          "text-optional": true,
+          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
         }
       };
     case "RIVERS":
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 10,
-        textColor: "#8fb8d0",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          9,
+          9,
+          12,
+          11,
+          15,
+          13
+        ],
+        textColor: COLOR.WATER,
         textHaloColor: DARK_BG,
-        textHaloWidth: 1.5,
+        textHaloWidth: 1.4,
         textOffset: [0, 0],
-        textFont: ["Open Sans Italic", "Arial Unicode MS Regular"],
-        minzoom: 10,
+        textFont: ["Open Sans Italic"],
+        minzoom: 9,
         layout: {
           "text-anchor": "center",
           "text-allow-overlap": false,
           "text-padding": 4,
-          "text-optional": true
+          "text-optional": true,
+          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
         }
       };
     case "CANALS":
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 9,
-        textColor: "#8fb8d0",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          11,
+          9,
+          14,
+          11
+        ],
+        textColor: COLOR.WATER,
         textHaloColor: DARK_BG,
-        textHaloWidth: 1.5,
+        textHaloWidth: 1.3,
         textOffset: [0, 0],
-        textFont: ["Open Sans Italic", "Arial Unicode MS Regular"],
+        textFont: ["Open Sans Italic"],
         minzoom: 11,
         layout: {
           "text-anchor": "center",
           "text-allow-overlap": false,
           "text-padding": 4,
-          "text-optional": true
+          "text-optional": true,
+          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
         }
       };
     case "LNDARE":
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 10,
-        textColor: "#e0d8c8",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          8,
+          9,
+          12,
+          11,
+          15,
+          13
+        ],
+        textColor: COLOR.LAND_NATURAL,
         textHaloColor: DARK_BG,
-        textHaloWidth: 1.5,
+        textHaloWidth: 1.4,
         textOffset: [0, 0],
-        textFont: ["Open Sans Regular", "Arial Unicode MS Regular"],
-        minzoom: 10,
+        textFont: ["Open Sans Regular"],
+        minzoom: 8,
         layout: {
           "text-anchor": "center",
           "text-allow-overlap": false,
           "text-padding": 6,
-          "text-optional": true
+          "text-optional": true,
+          "symbol-sort-key": ORIENTATION_BAND_SORT_KEY
+        }
+      };
+    case "BUAARE":
+      return {
+        type: "symbol",
+        textField: ["get", "OBJNAM"],
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          7,
+          11,
+          10,
+          13,
+          13,
+          15
+        ],
+        textColor: COLOR.CITY,
+        textHaloColor: DARK_BG,
+        textHaloWidth: 1.6,
+        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
         }
       };
     case "BRIDGE":
@@ -5729,19 +6555,236 @@ function getLabelConfig(layerName) {
       return {
         type: "symbol",
         textField: ["get", "OBJNAM"],
-        textSize: 10,
-        textColor: "#d4c9b0",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          9,
+          9,
+          13,
+          11
+        ],
+        textColor: COLOR.AIRPORT,
         textHaloColor: DARK_BG,
-        textHaloWidth: 1.5,
+        textHaloWidth: 1.4,
+        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
+        }
+      };
+    case "SBDARE":
+      return {
+        type: "symbol",
+        textField: buildSeabedLabelExpression(),
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          12,
+          9,
+          16,
+          11
+        ],
+        textColor: COLOR.SOUNDING,
+        textHaloColor: DARK_BG,
+        textHaloWidth: 1,
+        textOffset: [0, 0],
+        textFont: ["Open Sans Italic"],
+        minzoom: 12,
+        layout: {
+          "symbol-placement": "point",
+          "text-anchor": "center",
+          "text-allow-overlap": false,
+          "text-padding": 4,
+          "text-optional": true,
+          "text-letter-spacing": 0.02
+        }
+      };
+    case "MAGVAR": {
+      const valmag = ["coalesce", ["get", "VALMAG"], 0];
+      const variationText = [
+        "case",
+        [">=", valmag, 0],
+        ["concat", ["to-string", ["floor", valmag]], "\xB0E"],
+        ["concat", ["to-string", ["floor", ["abs", valmag]]], "\xB0W"]
+      ];
+      return {
+        type: "symbol",
+        textField: variationText,
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          10,
+          9,
+          14,
+          11
+        ],
+        textColor: COLOR.SOUNDING,
+        textHaloColor: DARK_BG,
+        textHaloWidth: 1,
         textOffset: [0, 0],
+        textFont: ["Open Sans Italic"],
         minzoom: 10,
         layout: {
+          "symbol-placement": "point",
           "text-anchor": "center",
           "text-allow-overlap": false,
           "text-padding": 6,
-          "text-optional": true
+          "text-optional": true,
+          "text-letter-spacing": 0.02
+        }
+      };
+    }
+    case "PRDARE":
+      return {
+        type: "symbol",
+        textField: ["get", "OBJNAM"],
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          8,
+          10,
+          12,
+          12,
+          15,
+          14
+        ],
+        textColor: "#c545c3",
+        textHaloColor: DARK_BG,
+        textHaloWidth: 1.4,
+        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
+        }
+      };
+    case "WEDKLP":
+      return {
+        type: "symbol",
+        textField: "Wd",
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          12,
+          9,
+          16,
+          11
+        ],
+        textColor: "#3f8a34",
+        textHaloColor: DARK_BG,
+        textHaloWidth: 1,
+        textOffset: [0, 0],
+        textFont: ["Open Sans Italic"],
+        minzoom: 12,
+        layout: {
+          "symbol-placement": "point",
+          "text-anchor": "center",
+          "text-allow-overlap": false,
+          "text-padding": 4,
+          "text-optional": true,
+          "text-letter-spacing": 0.02
+        }
+      };
+    case "UWTROC":
+    case "OBSTRN":
+    case "WRECKS": {
+      const ct = opts.colorTable ?? "DAY";
+      const valsou = [
+        "to-number",
+        ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 0],
+        0
+      ];
+      return {
+        type: "symbol",
+        textField: [
+          "case",
+          [">", valsou, 0],
+          [
+            "concat",
+            ["to-string", ["/", ["round", ["*", valsou, 10]], 10]],
+            "m"
+          ],
+          ""
+        ],
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          12,
+          9,
+          16,
+          11
+        ],
+        textColor: resolveColor("CHBLK", ct),
+        textHaloColor: resolveColor("CHWHT", ct),
+        textHaloWidth: 1.2,
+        // Place to the upper-right of the symbol so it doesn't sit on top
+        // of the asterisk / cross. Anchor top-left so the offset grows
+        // away from the symbol as text-size grows.
+        textOffset: [0.8, -0.4],
+        textFont: ["Open Sans Regular"],
+        minzoom: 12,
+        layout: {
+          "text-anchor": "top-left",
+          "text-allow-overlap": false,
+          "text-optional": true,
+          "text-padding": 2
+        }
+      };
+    }
+    case "CBLOHD":
+    case "PIPOHD": {
+      const isCBL = layerName === "CBLOHD";
+      return {
+        type: "symbol",
+        textField: [
+          "case",
+          ["has", "VERCLR"],
+          ["concat", ["to-string", ["get", "VERCLR"]], "m"],
+          ""
+        ],
+        textSize: [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          11,
+          8,
+          14,
+          10,
+          17,
+          11
+        ],
+        textColor: isCBL ? "#c545c3" : "#7fbf3f",
+        textHaloColor: DARK_BG,
+        textHaloWidth: 1.4,
+        textOffset: [0, 0],
+        textFont: ["Open Sans Regular"],
+        minzoom: 11,
+        layout: {
+          "symbol-placement": "line",
+          "text-anchor": "center",
+          "symbol-spacing": 250,
+          "text-rotation-alignment": "map",
+          "text-allow-overlap": false,
+          "text-optional": true,
+          "text-letter-spacing": 0.02
         }
       };
+    }
     case "DEPCNT":
       return {
         type: "symbol",
@@ -5755,12 +6798,12 @@ function getLabelConfig(layerName) {
           14,
           10
         ],
-        textColor: "#c8c8c8",
-        textHaloColor: DARK_BG,
+        textColor: DARK_BG,
+        textHaloColor: "#c8c8c8",
         textHaloWidth: 1.2,
         textOffset: [0, 0],
-        textFont: ["Open Sans Regular", "Arial Unicode MS Regular"],
-        minzoom: 10,
+        textFont: ["Open Sans Regular"],
+        minzoom: 9,
         layout: {
           "symbol-placement": "line",
           "text-anchor": "center",
@@ -5791,7 +6834,7 @@ function buildLabelLayer(layerId, sourceId, config, visible, overrides) {
       visibility: visible ? "visible" : "none",
       "text-field": config.textField,
       "text-size": textSize,
-      "text-font": config.textFont ?? ["Open Sans Regular", "Arial Unicode MS Regular"],
+      "text-font": config.textFont ?? ["Open Sans Regular"],
       "text-offset": config.textOffset,
       "text-anchor": "top",
       "text-allow-overlap": overrides?.allowOverlap ?? false,
@@ -5874,6 +6917,7 @@ var LABELED_LAYERS = /* @__PURE__ */ new Set([
   "LNDRGN",
   "LNDMRK",
   "LNDARE",
+  "BUAARE",
   "BOYLAT",
   "BCNLAT",
   "BOYCAR",
@@ -5883,6 +6927,7 @@ var LABELED_LAYERS = /* @__PURE__ */ new Set([
   "BCNCAR",
   "BCNSPP",
   "LIGHTS",
+  "FOGSIG",
   "SEAARE",
   "LAKARE",
   "RIVERS",
@@ -5893,7 +6938,16 @@ var LABELED_LAYERS = /* @__PURE__ */ new Set([
   "SLCONS",
   "BUISGL",
   "AIRARE",
-  "DEPCNT"
+  "DEPCNT",
+  "SBDARE",
+  "MAGVAR",
+  "PRDARE",
+  "WEDKLP",
+  "UWTROC",
+  "OBSTRN",
+  "WRECKS",
+  "CBLOHD",
+  "PIPOHD"
 ]);
 var NAV_AID_LABEL_LAYERS = /* @__PURE__ */ new Set([
   "BOYLAT",
@@ -7209,7 +8263,7 @@ var S52_POINT_SVGS = {
   "BOYDEF03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 21.8 10.8 L 22.4 9.6 L 22.9 8.6 L 23.6 7.9 L 24.3 7.2 L 25.4 6.8 L 26.4 6.9 L 27.6 7.2 L 28.8 7.5 L 29.8 8.9 L 30.5 9.7 L 31.0 10.6 L 31.0 11.7 L 30.5 12.7 L 30.0 13.5 L 29.1 14.5 L 28.2 15.6 L 27.3 16.6 L 26.8 17.4 L 26.3 18.1 L 26.2 19.1 L 26.2 20.0 L 26.2 20.7 L 26.3 21.6 L 26.3 21.7" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 25.4 25.2 L 27.6 25.2" fill="none" stroke="CHMGD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="9.45" cy="16.19" r="8.45" fill="none" stroke="CHGRD" stroke-width="0.8" />\n  <path d="M 9.4 16.2 Z" fill="CHGRD" />\n  <circle cx="9.45" cy="16.19" r="8.45" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <circle cx="9.45" cy="16.19" r="0.62" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 9.4 16.2 Z" fill="OUTLW" />\n</svg>\n',
   "BOYGEN03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 22.4 10.5 L 22.9 9.4 L 23.4 8.4 L 24.1 7.7 L 24.7 7.1 L 25.7 6.7 L 26.6 6.8 L 27.8 7.1 L 28.9 7.4 L 29.8 8.7 L 30.5 9.5 L 31.0 10.3 L 31.0 11.3 L 30.5 12.2 L 30.0 13.1 L 29.2 14.0 L 28.3 15.0 L 27.5 16.0 L 27.0 16.7 L 26.6 17.4 L 26.5 18.3 L 26.5 19.2 L 26.5 19.8 L 26.6 20.7 L 26.6 20.8" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 25.7 24.1 L 27.8 24.1" fill="none" stroke="CHMGD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="11.24" cy="14.16" r="6.78" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <circle cx="11.31" cy="23.14" r="2.16" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 13.5 23.1 L 21.6 23.1" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 23.1 L 9.1 23.1" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BOYINB01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.02" cy="22.46" r="2.28" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <circle cx="16.02" cy="9.75" r="2.49" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 1.0 22.5 L 13.6 22.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.1 22.5 L 31.0 22.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 2.6 22.5 L 6.0 12.5 L 26.0 12.5 L 29.4 22.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "BOYISD12": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="20.52" cy="7.07" r="6.07" fill="none" stroke="CHRED" stroke-width="0.8" />\n  <path d="M 20.5 7.1 Z" fill="CHRED" />\n  <circle cx="11.48" cy="24.93" r="6.07" fill="none" stroke="CHRED" stroke-width="0.8" />\n  <path d="M 11.5 24.9 Z" fill="CHRED" />\n  <circle cx="20.52" cy="7.07" r="6.07" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <circle cx="11.48" cy="24.93" r="6.07" fill="none" stroke="OUTLW" stroke-width="0.8" />\n</svg>\n',
+  "BOYISD12": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 27.0 L 12.5 27.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" />\n  <path d="M 19.5 27.0 L 31.0 27.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" />\n  <path d="M 10.5 27.0 L 12.5 15.0 L 19.5 15.0 L 21.5 27.0 Z" fill="CHBLK" stroke="CHBLK" stroke-width="0.8" stroke-linejoin="round" />\n  <rect x="11.4" y="19.0" width="9.2" height="3.5" fill="LITRD" />\n  <line x1="16" y1="15.0" x2="16" y2="11.0" stroke="CHBLK" stroke-width="0.8" />\n  <circle cx="16" cy="8.5" r="2.0" fill="CHBLK" />\n  <circle cx="16" cy="3.5" r="2.0" fill="CHBLK" />\n</svg>\n',
   "BOYLAT13": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0 Z" fill="CHGRN" />\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0" fill="none" stroke="CHGRN" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0" fill="none" stroke="OUTLW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="22.32" cy="21.30" r="1.03" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 22.3 21.3 Z" fill="OUTLW" />\n</svg>\n',
   "BOYLAT14": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0 Z" fill="CHRED" />\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0" fill="none" stroke="CHRED" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0" fill="none" stroke="OUTLW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="22.32" cy="21.30" r="1.03" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 22.3 21.3 Z" fill="OUTLW" />\n</svg>\n',
   "BOYLAT23": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 27.3 L 9.6 4.7 L 31.0 4.7 L 23.8 27.3 L 1.0 27.3 Z" fill="CHGRN" />\n  <path d="M 1.0 27.3 L 9.6 4.7 L 31.0 4.7 L 23.8 27.3 L 1.0 27.3" fill="none" stroke="CHGRN" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 27.3 L 9.6 4.7 L 31.0 4.7 L 23.8 27.3 L 1.0 27.3" fill="none" stroke="OUTLW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="16.63" cy="15.52" r="0.85" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 16.6 15.5 Z" fill="OUTLW" />\n</svg>\n',
@@ -7220,7 +8274,7 @@ var S52_POINT_SVGS = {
   "BOYMOR03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="14.88" cy="26.37" r="3.17" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <circle cx="19.41" cy="6.11" r="3.65" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 1.0 26.4 L 11.5 26.4" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 17.8 26.4 L 28.7 26.4" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.3 26.4 L 7.9 10.2 L 31.0 10.2 L 26.6 26.4" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BOYMOR11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.30" cy="11.89" r="2.81" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 16.3 11.9 Z" fill="CHBLK" />\n  <path d="M 1.0 22.9 L 3.6 15.1 L 28.4 15.1 L 31.0 22.9 L 1.0 22.9 Z" fill="CHBLK" />\n  <path d="M 1.0 22.9 L 3.6 15.1 L 28.4 15.1 L 31.0 22.9 L 1.0 22.9" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BOYPIL01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.43" cy="25.37" r="2.96" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 1.0 25.4 L 13.6 25.4" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.1 25.4 L 31.0 25.4" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.3 25.4 L 15.3 13.6 L 18.6 3.7 L 23.5 3.7 L 23.5 15.6 L 28.2 25.4" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "BOYSAW12": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="14.78" fill="none" stroke="CHRED" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="CHRED" />\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <circle cx="16.00" cy="16.00" r="1.11" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="OUTLW" />\n</svg>\n',
+  "BOYSAW12": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 27.0 L 12.5 27.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" />\n  <path d="M 19.5 27.0 L 31.0 27.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" />\n  <path d="M 10.5 27.0 L 12.5 14.0 L 19.5 14.0 L 21.5 27.0 Z" fill="LITWT" stroke="CHBLK" stroke-width="0.8" stroke-linejoin="round" />\n  <rect x="13.2" y="14.0" width="2.0" height="13.0" fill="LITRD" />\n  <rect x="16.8" y="14.0" width="2.0" height="13.0" fill="LITRD" />\n  <line x1="16" y1="14.0" x2="16" y2="8.0" stroke="CHBLK" stroke-width="0.8" />\n  <circle cx="16" cy="5.5" r="2.5" fill="LITRD" stroke="CHBLK" stroke-width="0.6" />\n</svg>\n',
   "BOYSPH01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="15.76" cy="26.22" r="2.81" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 18.7 26.2 L 31.0 26.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.1 26.2 L 2.6 22.6 L 2.2 19.6 L 1.8 16.4 L 2.5 12.9 L 3.5 10.5 L 5.3 8.1 L 7.3 6.1 L 9.8 4.5 L 12.1 3.7 L 14.9 3.0 L 17.9 3.0 L 20.9 3.7 L 24.2 5.1 L 26.4 6.8 L 27.9 9.0 L 29.7 11.8 L 30.7 14.6 L 30.8 17.7 L 30.5 21.5 L 29.4 24.2 L 28.3 26.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 26.2 L 12.9 26.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BOYSPP11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="CHYLW" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="CHYLW" />\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <circle cx="16.00" cy="16.00" r="1.13" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="OUTLW" />\n</svg>\n',
   "BOYSPP15": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0 Z" fill="CHYLW" />\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0" fill="none" stroke="CHYLW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 30.8 31.0 L 30.8 1.0 L 1.2 31.0 L 30.8 31.0" fill="none" stroke="OUTLW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="20.95" cy="21.30" r="1.03" fill="none" stroke="OUTLW" stroke-width="0.8" />\n  <path d="M 21.0 21.3 Z" fill="OUTLW" />\n</svg>\n',
@@ -7229,7 +8283,11 @@ var S52_POINT_SVGS = {
   "BOYSUP01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.02" cy="23.18" r="2.28" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 1.0 23.2 L 13.6 23.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.1 23.2 L 31.0 23.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 2.6 23.2 L 6.0 13.2 L 26.0 13.2 L 29.4 23.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.0 13.2 L 16.0 6.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BOYSUP02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.1 25.3 L 4.9 14.1 L 27.2 14.1 L 31.0 25.3" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.1 14.1 L 16.1 6.7" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 25.2 L 4.9 14.0 L 27.2 14.1 L 31.0 25.2 L 1.0 25.2 Z" fill="CHBLK" />\n  <path d="M 1.0 25.2 L 4.9 14.0 L 27.2 14.1 L 31.0 25.2 L 1.0 25.2" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BOYSUP03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.12" cy="24.98" r="2.07" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 16.1 9.9 L 16.1 5.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 6.6 L 19.3 9.9" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 9.9 L 19.3 6.6" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 25.0 L 14.0 25.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.0 25.0 L 31.0 25.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 2.6 25.0 L 6.0 14.9 L 26.0 14.9 L 29.4 25.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.1 14.9 L 16.1 8.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "BRIDGE01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="CHMGD" stroke-width="0.8" />\n  <circle cx="16.07" cy="15.70" r="8.63" fill="none" stroke="CHMGD" stroke-width="0.8" />\n</svg>\n',
+  "BRIDGE01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="4" y1="14" x2="28" y2="14" stroke="CHBLK" stroke-width="2" />\n  <line x1="8" y1="14" x2="8" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="24" y1="14" x2="24" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <path d="M8,14 Q16,6 24,14" fill="none" stroke="CHBLK" stroke-width="1.5" />\n</svg>\n',
+  "BRIDGE02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="4" y1="14" x2="28" y2="14" stroke="CHBLK" stroke-width="2" />\n  <line x1="8" y1="14" x2="8" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="24" y1="14" x2="24" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <path d="M8,14 Q16,6 24,14" fill="none" stroke="TRFCD" stroke-width="1.5" stroke-dasharray="3,2" />\n</svg>\n',
+  "BRIDGE03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="4" y1="14" x2="28" y2="14" stroke="CHBLK" stroke-width="2" />\n  <line x1="8" y1="14" x2="8" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="24" y1="14" x2="24" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <circle cx="16" cy="14" r="3" fill="none" stroke="TRFCD" stroke-width="1.5" />\n  <circle cx="16" cy="14" r="1" fill="TRFCD" />\n</svg>\n',
+  "BRIDGE04": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="4" y1="16" x2="28" y2="16" stroke="CHBLK" stroke-width="2" />\n  <line x1="8" y1="16" x2="8" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="24" y1="16" x2="24" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="12" y1="16" x2="12" y2="6" stroke="TRFCD" stroke-width="1.5" />\n  <polygon points="12,4 9,8 15,8" fill="TRFCD" />\n  <line x1="20" y1="16" x2="20" y2="6" stroke="TRFCD" stroke-width="1.5" />\n  <polygon points="20,4 17,8 23,8" fill="TRFCD" />\n</svg>\n',
+  "BRIDGE05": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="4" y1="14" x2="28" y2="14" stroke="CHBLK" stroke-width="2" />\n  <line x1="8" y1="14" x2="8" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="24" y1="14" x2="24" y2="24" stroke="CHBLK" stroke-width="1.8" />\n  <line x1="14" y1="14" x2="20" y2="6" stroke="TRFCD" stroke-width="2" />\n  <circle cx="14" cy="14" r="1.5" fill="TRFCD" />\n</svg>\n',
   "BRTHNO01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="CHMGD" stroke-width="0.8" />\n</svg>\n',
   "BUAARE02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="LANDF" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="LANDF" />\n</svg>\n',
   "BUIREL01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 8.5 1.0 L 23.5 1.0 L 16.0 8.5 L 8.5 1.0 Z" fill="LANDF" />\n  <path d="M 8.5 1.0 L 23.5 1.0 L 16.0 8.5 L 8.5 1.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 31.0 8.5 L 31.0 23.5 L 23.5 16.0 L 31.0 8.5 Z" fill="LANDF" />\n  <path d="M 31.0 8.5 L 31.0 23.5 L 23.5 16.0 L 31.0 8.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.5 31.0 L 23.5 31.0 L 16.0 23.5 L 8.5 31.0 Z" fill="LANDF" />\n  <path d="M 8.5 31.0 L 23.5 31.0 L 16.0 23.5 L 8.5 31.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 8.5 L 1.0 23.5 L 8.5 16.0 L 1.0 8.5 Z" fill="LANDF" />\n  <path d="M 1.0 8.5 L 1.0 23.5 L 8.5 16.0 L 1.0 8.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.5 16.0 L 23.5 16.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.0 8.5 L 16.0 23.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.5 1.0 L 23.5 1.0 L 16.0 8.5 L 8.5 1.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 31.0 8.5 L 31.0 23.5 L 23.5 16.0 L 31.0 8.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 23.5 31.0 L 8.5 31.0 L 16.0 23.5 L 23.5 31.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 8.5 L 1.0 23.5 L 8.5 16.0 L 1.0 8.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7240,6 +8298,8 @@ var S52_POINT_SVGS = {
   "BUIREL15": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 4.8 1.0 L 6.5 3.2 L 8.4 4.9 L 10.6 6.0 L 12.8 6.9 L 15.2 7.2 L 17.1 7.1 L 19.1 6.9 L 21.3 6.2 L 23.0 5.1 L 24.5 4.2 L 25.8 2.8 L 26.7 1.7 L 27.2 1.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="16.48" cy="24.63" r="6.37" fill="none" stroke="CHBLK" stroke-width="0.8" />\n  <path d="M 16.5 17.9 L 16.5 7.1" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="16.61" cy="24.56" r="1.29" fill="none" stroke="CHBLK" stroke-width="0.8" />\n  <path d="M 16.6 24.6 Z" fill="CHBLK" />\n</svg>\n',
   "BUISGL01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0 Z" fill="CHBRN" />\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0" fill="none" stroke="CHBRN" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0" fill="none" stroke="LANDF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "BUISGL11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0 Z" fill="LANDF" />\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "CABLE01": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <path d="M 10 2 L 5 8 L 9 8 L 6 14 L 11 6 L 7 6 Z" fill="CHMGD" stroke="CHMGD" stroke-width="0.4" stroke-linejoin="round" />\n</svg>\n',
+  "CABOHD01": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <path d="M 3 5 L 8 11 L 13 5" fill="none" stroke="CHMGD" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "CAIRNS01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 17.5 1.1 L 20.1 1.9 L 21.7 2.7 L 23.2 4.6 L 23.8 6.2 L 24.2 7.4 L 24.2 9.4 L 23.4 10.9 L 22.9 12.1 L 21.8 13.5 L 21.3 14.1 L 21.8 12.5 L 22.7 10.9 L 22.9 9.8 L 22.9 7.8 L 22.2 5.8 L 21.7 4.6 L 20.7 3.5 L 19.1 2.1 L 17.5 1.1 Z" fill="LANDF" />\n  <path d="M 17.5 1.1 L 20.1 1.9 L 21.7 2.7 L 23.2 4.6 L 23.8 6.2 L 24.2 7.4 L 24.2 9.4 L 23.4 10.9 L 22.9 12.1 L 21.8 13.5 L 21.3 14.1 L 21.8 12.5 L 22.7 10.9 L 22.9 9.8 L 22.9 7.8 L 22.2 5.8 L 21.7 4.6 L 20.7 3.5 L 19.1 2.1 L 17.5 1.1" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 11.7 13.7 L 13.2 15.1 L 14.8 16.3 L 15.4 17.2 L 15.9 18.8 L 16.4 20.4 L 16.4 21.6 L 15.6 23.5 L 15.0 25.1 L 14.0 26.3 L 12.2 27.7 L 13.2 26.1 L 14.0 24.5 L 14.8 21.4 L 14.8 19.8 L 14.0 17.9 L 13.4 16.7 L 12.2 14.7 L 11.7 13.7 Z" fill="LANDF" />\n  <path d="M 11.7 13.7 L 13.2 15.1 L 14.8 16.3 L 15.4 17.2 L 15.9 18.8 L 16.4 20.4 L 16.4 21.6 L 15.6 23.5 L 15.0 25.1 L 14.0 26.3 L 12.2 27.7 L 13.2 26.1 L 14.0 24.5 L 14.8 21.4 L 14.8 19.8 L 14.0 17.9 L 13.4 16.7 L 12.2 14.7 L 11.7 13.7" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 24.4 14.5 L 26.0 14.7 L 27.6 15.3 L 29.1 16.8 L 29.7 17.9 L 30.5 19.4 L 30.7 21.0 L 30.5 22.6 L 30.1 24.0 L 29.5 25.1 L 28.5 26.1 L 27.4 27.7 L 28.5 25.5 L 29.1 23.5 L 29.5 21.4 L 29.0 18.8 L 27.9 17.2 L 26.6 15.7 L 25.4 15.1 L 24.4 14.5 Z" fill="LANDF" />\n  <path d="M 24.4 14.5 L 26.0 14.7 L 27.6 15.3 L 29.1 16.8 L 29.7 17.9 L 30.5 19.4 L 30.7 21.0 L 30.5 22.6 L 30.1 24.0 L 29.5 25.1 L 28.5 26.1 L 27.4 27.7 L 28.5 25.5 L 29.1 23.5 L 29.5 21.4 L 29.0 18.8 L 27.9 17.2 L 26.6 15.7 L 25.4 15.1 L 24.4 14.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="16.38" cy="28.67" r="2.33" fill="none" stroke="LANDF" stroke-width="1.2" />\n  <circle cx="8.70" cy="21.00" r="7.42" fill="none" stroke="LANDF" stroke-width="1.2" />\n  <circle cx="16.75" cy="8.23" r="7.23" fill="none" stroke="LANDF" stroke-width="1.2" />\n  <circle cx="23.80" cy="21.38" r="6.86" fill="none" stroke="LANDF" stroke-width="1.2" />\n  <path d="M 2.4 28.7 L 13.8 28.7" fill="none" stroke="LANDF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.7 28.7 L 29.7 28.7" fill="none" stroke="LANDF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "CAIRNS11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 17.5 1.1 L 20.1 1.9 L 21.7 2.7 L 23.2 4.6 L 23.8 6.2 L 24.2 7.4 L 24.2 9.4 L 23.4 10.9 L 22.9 12.1 L 21.8 13.5 L 21.3 14.1 L 21.8 12.5 L 22.7 10.9 L 22.9 9.8 L 22.9 7.8 L 22.2 5.8 L 21.7 4.6 L 20.7 3.5 L 19.1 2.1 L 17.5 1.1 Z" fill="CHBLK" />\n  <path d="M 17.5 1.1 L 20.1 1.9 L 21.7 2.7 L 23.2 4.6 L 23.8 6.2 L 24.2 7.4 L 24.2 9.4 L 23.4 10.9 L 22.9 12.1 L 21.8 13.5 L 21.3 14.1 L 21.8 12.5 L 22.7 10.9 L 22.9 9.8 L 22.9 7.8 L 22.2 5.8 L 21.7 4.6 L 20.7 3.5 L 19.1 2.1 L 17.5 1.1" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 11.7 13.7 L 13.2 15.1 L 14.8 16.3 L 15.4 17.2 L 15.9 18.8 L 16.4 20.4 L 16.4 21.6 L 15.6 23.5 L 15.0 25.1 L 14.0 26.3 L 12.2 27.7 L 13.2 26.1 L 14.0 24.5 L 14.8 21.4 L 14.8 19.8 L 14.0 17.9 L 13.4 16.7 L 12.2 14.7 L 11.7 13.7 Z" fill="CHBLK" />\n  <path d="M 11.7 13.7 L 13.2 15.1 L 14.8 16.3 L 15.4 17.2 L 15.9 18.8 L 16.4 20.4 L 16.4 21.6 L 15.6 23.5 L 15.0 25.1 L 14.0 26.3 L 12.2 27.7 L 13.2 26.1 L 14.0 24.5 L 14.8 21.4 L 14.8 19.8 L 14.0 17.9 L 13.4 16.7 L 12.2 14.7 L 11.7 13.7" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 24.4 14.5 L 26.0 14.7 L 27.6 15.3 L 29.1 16.8 L 29.7 17.9 L 30.5 19.4 L 30.7 21.0 L 30.5 22.6 L 30.1 24.0 L 29.5 25.1 L 28.5 26.1 L 27.4 27.7 L 28.5 25.5 L 29.1 23.5 L 29.5 21.4 L 29.0 18.8 L 27.9 17.2 L 26.6 15.7 L 25.4 15.1 L 24.4 14.5 Z" fill="CHBLK" />\n  <path d="M 24.4 14.5 L 26.0 14.7 L 27.6 15.3 L 29.1 16.8 L 29.7 17.9 L 30.5 19.4 L 30.7 21.0 L 30.5 22.6 L 30.1 24.0 L 29.5 25.1 L 28.5 26.1 L 27.4 27.7 L 28.5 25.5 L 29.1 23.5 L 29.5 21.4 L 29.0 18.8 L 27.9 17.2 L 26.6 15.7 L 25.4 15.1 L 24.4 14.5" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="16.38" cy="28.67" r="2.33" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <circle cx="8.70" cy="21.00" r="7.42" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <circle cx="16.75" cy="8.23" r="7.23" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <circle cx="23.80" cy="21.38" r="6.86" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 2.4 28.7 L 13.8 28.7" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.7 28.7 L 29.7 28.7" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "CBLARE51": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 19.5 1.0 L 11.0 14.5 L 21.0 18.1 L 13.0 31.0" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7278,6 +8338,18 @@ var S52_POINT_SVGS = {
   "DIRBOYB1": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 9.0 20.9 L 2.2 20.9 L 16.0 7.1 L 29.7 20.9 L 22.7 20.9 L 22.7 25.5 L 9.0 25.5 L 9.0 20.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="4.48" cy="10.02" r="3.48" fill="none" stroke="CHGRN" stroke-width="1.8" />\n  <circle cx="27.59" cy="10.02" r="3.41" fill="none" stroke="CHRED" stroke-width="1.8" />\n</svg>\n',
   "DISMAR03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="CHMGD" stroke-width="1.2" />\n</svg>\n',
   "DISMAR04": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 5.1 L 1.0 26.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.4 13.3 L 1.0 21.5" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.5 18.7 L 9.2 26.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 14.6 13.3 L 14.6 26.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 14.6 15.5 L 16.5 13.5 L 18.2 13.0 L 19.3 13.0 L 21.6 14.1 L 22.8 15.7 L 22.8 26.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 22.8 16.0 L 23.9 13.8 L 26.1 12.8 L 27.5 12.8 L 29.7 13.8 L 31.0 16.0 L 31.0 26.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "DNGCIR01": `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <!-- S-52 PresLib \xA7CSYM02 isolated-danger ring. Per IHO S-52 spec, hazards
+       (UWTROC / OBSTRN / WRECKS) whose VALSOU is shallower than the
+       mariner's safety contour, OR that cover-and-uncover with the tide
+       (always dangerous regardless of sounded depth), get a thin DASHED
+       MAGENTA RING overlaid on top of the base hazard icon.
+       Thin 1.0-px stroke (no fill) at r=14 surrounds the 18-unit base
+       hazard asterisks/crosses with ~3 px of breathing room at z16,
+       reading as the standard NOAA / ECDIS isolated-danger marker. -->
+  <circle cx="16" cy="16" r="14" fill="none" stroke="CHMGD" stroke-width="1.0" stroke-dasharray="2,2" />
+</svg>
+`,
   "DNGHILIT": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0 Z" fill="DNGHL" />\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0" fill="none" stroke="DNGHL" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 31.0 L 31.0 31.0 L 31.0 1.0 L 1.0 1.0 L 1.0 31.0" fill="none" stroke="DNGHL" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "DOMES001": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="15.73" cy="25.99" r="2.56" fill="none" stroke="LANDF" stroke-width="0.8" />\n  <path d="M 13.2 25.8 L 3.4 25.8" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.4 25.8 L 2.8 24.9 L 2.0 22.8 L 1.2 20.7 L 1.0 19.0 L 1.0 16.6 L 1.6 14.1 L 2.7 11.2 L 3.6 9.4 L 5.3 7.6 L 7.1 6.1 L 8.8 5.2 L 11.6 4.2 L 14.0 3.7 L 16.6 3.4 L 19.5 3.9 L 22.3 4.8 L 25.0 6.5 L 27.5 8.9 L 28.9 10.8 L 30.2 13.3 L 30.9 16.4 L 31.0 20.1 L 30.4 22.6 L 29.6 24.6 L 28.7 25.6" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.2 25.8 L 28.6 25.8 L 28.8 25.3" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "DOMES011": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="15.73" cy="25.99" r="2.56" fill="none" stroke="CHBLK" stroke-width="0.8" />\n  <path d="M 13.2 25.8 L 3.4 25.8" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.4 25.8 L 2.8 24.9 L 2.0 22.8 L 1.2 20.7 L 1.0 19.0 L 1.0 16.6 L 1.6 14.1 L 2.7 11.2 L 3.6 9.4 L 5.3 7.6 L 7.1 6.1 L 8.8 5.2 L 11.6 4.2 L 14.0 3.7 L 16.6 3.4 L 19.5 3.9 L 22.3 4.8 L 25.0 6.5 L 27.5 8.9 L 28.9 10.8 L 30.2 13.3 L 30.9 16.4 L 31.0 20.1 L 30.4 22.6 L 29.6 24.6 L 28.7 25.6" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.2 25.8 L 28.6 25.8 L 28.8 25.3" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7322,9 +8394,10 @@ var S52_POINT_SVGS = {
   "ISODGR01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.0 1.0 L 26.7 5.3 L 31.0 16.0 L 26.7 26.7 L 16.0 31.0 L 5.3 26.7 L 1.0 16.0 L 5.3 5.3 L 16.0 1.0 L 16.0 12.8 L 21.9 6.9 L 25.1 10.1 L 19.2 16.0 L 25.1 21.9 L 21.9 25.1 L 16.0 19.2 L 10.1 25.1 L 6.9 21.9 L 12.8 16.0 L 6.9 10.1 L 10.1 6.9 L 16.0 12.8 L 16.0 1.0 Z" fill="ISDNG" />\n  <path d="M 16.0 1.0 L 26.7 5.3 L 31.0 16.0 L 26.7 26.7 L 16.0 31.0 L 5.3 26.7 L 1.0 16.0 L 5.3 5.3 L 16.0 1.0 L 16.0 12.8 L 21.9 6.9 L 25.1 10.1 L 19.2 16.0 L 25.1 21.9 L 21.9 25.1 L 16.0 19.2 L 10.1 25.1 L 6.9 21.9 L 12.8 16.0 L 6.9 10.1 L 10.1 6.9 L 16.0 12.8 L 16.0 1.0" fill="none" stroke="ISDNG" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 16.0 L 5.3 5.3 L 16.0 1.0 L 26.7 5.3 L 31.0 16.0 L 26.7 26.7 L 16.0 31.0 L 5.3 26.7 L 1.0 16.0" fill="none" stroke="ISDNG" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "ITZARE51": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 4.7 27.8 L 4.7 4.2" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 23.1 4.3 L 23.1 27.8" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 4.3 L 8.7 4.3" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.3 27.7 L 8.7 27.7" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 15.1 4.3 L 31.0 4.3" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LIGHTDEF": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.3 31.0 L 10.9 6.9 L 10.9 5.8 L 11.2 4.2 L 12.0 2.8 L 12.8 2.1 L 14.1 1.0 L 16.0 1.0 L 17.6 1.0 L 18.7 1.3 L 20.3 2.3 L 20.8 3.9 L 21.1 5.3 L 21.1 6.6 L 16.3 31.0 Z" fill="CHMGD" />\n  <path d="M 16.3 31.0 L 10.9 6.9 L 10.9 5.8 L 11.2 4.2 L 12.0 2.8 L 12.8 2.1 L 14.1 1.0 L 16.0 1.0 L 17.6 1.0 L 18.7 1.3 L 20.3 2.3 L 20.8 3.9 L 21.1 5.3 L 21.1 6.6 L 16.3 31.0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 31.0 L 10.9 6.4 L 10.9 4.7 L 11.4 3.1 L 12.3 2.3 L 13.6 1.3 L 15.2 1.0 L 16.3 1.0 L 17.6 1.0 L 18.9 1.5 L 20.0 2.6 L 20.8 4.2 L 21.1 5.3 L 20.8 7.7 L 16.3 31.0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "LIGHTS11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0 Z" fill="LITRD" />\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0" fill="none" stroke="LITRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 21.3 5.2 L 21.0 6.6 L 16.3 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 28.0 L 11.5 6.6 L 11.8 5.2 L 12.1 4.1 L 12.9 3.2 L 14.1 2.1 L 15.4 1.9 L 16.3 1.9 L 17.4 2.1 L 18.8 2.7 L 19.6 3.5 L 20.2 4.6 L 20.4 5.7 L 20.2 7.7 L 16.3 28.0" fill="none" stroke="LITRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 31.0 L 10.7 6.0 L 11.5 3.5 L 13.8 1.6 L 16.3 1.0 L 18.5 1.9 L 19.9 2.7 L 21.0 4.9" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "LIGHTHOUSE01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <rect x="6" y="26" width="20" height="4" fill="CHBLK" />\n  <path d="M 9 26 L 12 8 L 20 8 L 23 26 Z" fill="CHBLK" />\n  <rect x="13" y="4" width="6" height="4" fill="CHBLK" />\n  <path d="M 12 4 L 16 1 L 20 4 Z" fill="CHBLK" />\n</svg>\n',
+  "LIGHTS11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g transform="translate(10 10) rotate(135) scale(0.9) translate(-16.3 -28)" fill="LITRD">\n    <path d="M 16.3 28 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3 L 14.3 2.1 L 16 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28 Z" />\n  </g>\n</svg>\n',
   "LIGHTS12": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0 Z" fill="LITGN" />\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0" fill="none" stroke="LITGN" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 21.3 5.2 L 21.0 6.6 L 16.3 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 28.0 L 11.5 6.6 L 11.8 5.2 L 12.1 4.1 L 12.9 3.2 L 14.1 2.1 L 15.4 1.9 L 16.3 1.9 L 17.4 2.1 L 18.8 2.7 L 19.6 3.5 L 20.2 4.6 L 20.4 5.7 L 20.2 7.7 L 16.3 28.0" fill="none" stroke="LITGN" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 31.0 L 10.7 6.0 L 11.5 3.5 L 13.8 1.6 L 16.3 1.0 L 18.5 1.9 L 19.9 2.7 L 21.0 4.9" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "LIGHTS13": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0 Z" fill="LITYW" />\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0" fill="none" stroke="LITYW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 21.3 5.2 L 21.0 6.6 L 16.3 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 28.0 L 11.5 6.6 L 11.8 5.2 L 12.1 4.1 L 12.9 3.2 L 14.1 2.1 L 15.4 1.9 L 16.3 1.9 L 17.4 2.1 L 18.8 2.7 L 19.6 3.5 L 20.2 4.6 L 20.4 5.7 L 20.2 7.7 L 16.3 28.0" fill="none" stroke="LITYW" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 31.0 L 10.7 6.0 L 11.5 3.5 L 13.8 1.6 L 16.3 1.0 L 18.5 1.9 L 19.9 2.7 L 21.0 4.9" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "LIGHTS13": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <g transform="translate(10 10) rotate(135) scale(0.9) translate(-16.3 -28)" fill="LITYW">\n    <path d="M 16.3 28 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3 L 14.3 2.1 L 16 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28 Z" />\n  </g>\n</svg>\n',
   "LIGHTS14": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0 Z" fill="CHMGD" />\n  <path d="M 16.3 28.0 L 11.8 7.1 L 11.8 6.3 L 11.8 4.9 L 12.4 3.5 L 13.2 3.0 L 14.3 2.1 L 16.0 1.9 L 17.4 2.1 L 18.5 2.4 L 19.6 3.2 L 20.2 4.6 L 20.4 5.7 L 20.4 6.9 L 16.3 28.0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 21.3 5.2 L 21.0 6.6 L 16.3 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 28.0 L 11.5 6.6 L 11.8 5.2 L 12.1 4.1 L 12.9 3.2 L 14.1 2.1 L 15.4 1.9 L 16.3 1.9 L 17.4 2.1 L 18.8 2.7 L 19.6 3.5 L 20.2 4.6 L 20.4 5.7 L 20.2 7.7 L 16.3 28.0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.3 31.0 L 10.7 6.0 L 11.5 3.5 L 13.8 1.6 L 16.3 1.0 L 18.5 1.9 L 19.9 2.7 L 21.0 4.9" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LIGHTS81": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 25.9 L 6.9 5.9 L 12.9 26.0 L 19.0 5.9 L 25.0 26.1 L 31.0 5.9" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LIGHTS82": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="6.96" cy="17.80" r="5.96" fill="none" stroke="CHMGD" stroke-width="1.2" />\n  <path d="M 14.9 23.1 L 25.9 23.5" fill="none" stroke="CHMGD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.3 12.1 L 28.0 8.2" fill="none" stroke="CHMGD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 15.8 17.5 L 31.0 16.0" fill="none" stroke="CHMGD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7334,6 +8407,8 @@ var S52_POINT_SVGS = {
   "LITVES01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="24.83" r="2.33" fill="none" stroke="CHBLK" stroke-width="1.2" />\n  <path d="M 1.0 24.8 L 12.7 24.8" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 6.0 24.8 L 2.7 16.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 26.0 24.8 L 29.3 16.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.0 19.0 L 16.0 9.8" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 9.3 19.0 L 9.3 13.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 22.7 19.0 L 22.7 13.2" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.0 9.8 L 16.0 4.8" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 6.5 L 19.3 9.8" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 9.8 L 19.3 6.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.7 21.5 L 10.2 21.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 21.8 21.5 L 27.3 21.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 2.7 16.5 L 9.2 19.0 L 16.0 19.0 L 22.7 19.0 L 29.3 16.5" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.3 24.8 L 31.0 24.8" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LITVES02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 5.9 23.3 L 1.0 15.1 L 31.0 15.1 L 25.6 23.3 L 5.9 23.3 Z" fill="CHBLK" />\n  <path d="M 5.9 23.3 L 1.0 15.1 L 31.0 15.1 L 25.6 23.3 L 5.9 23.3" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.0 15.1 L 16.0 8.7" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LNDARE01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="13.54" fill="none" stroke="LANDA" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="LANDA" />\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="CSTLN" stroke-width="1.2" />\n</svg>\n',
+  "LNDMRK18": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="16" y1="28" x2="16" y2="10" stroke="CHBLK" stroke-width="1.5"/>\n  <circle cx="16" cy="10" r="2" fill="CHBLK"/>\n  <line x1="16" y1="10" x2="6" y2="2" stroke="CHBLK" stroke-width="1.2"/>\n  <line x1="16" y1="10" x2="26" y2="2" stroke="CHBLK" stroke-width="1.2"/>\n  <line x1="16" y1="10" x2="6" y2="18" stroke="CHBLK" stroke-width="1.2"/>\n  <line x1="16" y1="10" x2="26" y2="18" stroke="CHBLK" stroke-width="1.2"/>\n  <circle cx="16" cy="16" r="7" fill="none" stroke="CHBLK" stroke-width="0.6" stroke-dasharray="2,2"/>\n</svg>\n',
+  "LNDMRK19": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <line x1="16" y1="28" x2="16" y2="10" stroke="CHBLK" stroke-width="1.5"/>\n  <circle cx="16" cy="10" r="1.5" fill="CHBLK"/>\n  <line x1="16" y1="10" x2="16" y2="2" stroke="CHBLK" stroke-width="1.2"/>\n  <line x1="16" y1="10" x2="9" y2="17" stroke="CHBLK" stroke-width="1.2"/>\n  <line x1="16" y1="10" x2="23" y2="17" stroke="CHBLK" stroke-width="1.2"/>\n  <circle cx="16" cy="16" r="7" fill="none" stroke="CHBLK" stroke-width="0.6" stroke-dasharray="2,2"/>\n</svg>\n',
   "LOCMAG01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 18.9 22.5 L 18.9 31.0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.9 23.4 L 18.9 1.0 L 13.1 17.9 L 14.2 18.3 L 15.1 18.7 L 15.9 19.4 L 16.4 20.0 L 17.0 20.6 L 17.8 21.6 L 18.3 22.4 L 18.8 23.3" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LOCMAG51": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 18.9 23.6 L 18.9 1.0 L 13.0 18.1 L 14.1 18.5 L 15.0 18.9 L 15.8 19.6 L 16.4 20.2 L 17.0 20.8 L 17.7 21.8 L 18.3 22.6 L 18.8 23.5" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.0 23.5 L 19.0 31.0" fill="none" stroke="CHMGF" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "LOWACC01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 4.5 10.2 L 5.8 10.2" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 5.0 8.0 L 5.0 6.6 L 5.0 6.1 L 5.4 5.6 L 5.7 5.2 L 6.3 4.5 L 6.6 3.9 L 6.8 3.2 L 6.6 2.5 L 6.3 2.0 L 5.8 1.5 L 5.3 1.1 L 4.8 1.1 L 4.2 1.0 L 3.7 1.1 L 3.2 1.4 L 2.7 1.9 L 2.4 2.4 L 2.3 2.8 L 2.3 3.3 L 2.4 3.7 L 2.5 3.8" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 6.8 8.1 L 29.7 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7356,9 +8431,19 @@ var S52_POINT_SVGS = {
   "NMKRCD04": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 16.0 L 16.0 1.0 L 16.0 31.0 L 1.0 16.0 Z" fill="CHGRN" />\n  <path d="M 1.0 16.0 L 16.0 1.0 L 16.0 31.0 L 1.0 16.0" fill="none" stroke="CHGRN" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 31.0 16.0 L 16.0 31.0 L 16.0 1.0 L 31.0 16.0 Z" fill="CHWHT" />\n  <path d="M 31.0 16.0 L 16.0 31.0 L 16.0 1.0 L 31.0 16.0" fill="none" stroke="CHWHT" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 16.0 L 16.0 1.0 L 31.0 16.0 L 16.0 31.0 L 1.0 16.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "NORTHAR1": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.3 31.0 L 16.3 1.0" fill="none" stroke="SCLBR" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.8 20.7 L 12.8 14.1 L 19.6 20.7 L 19.6 14.2" fill="none" stroke="SCLBR" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.4 8.9 L 19.6 8.9 L 16.2 1.1 L 12.4 8.9 Z" fill="SCLBR" />\n  <path d="M 12.4 8.9 L 19.6 8.9 L 16.2 1.1 L 12.4 8.9" fill="none" stroke="SCLBR" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "NOTBRD11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 8.5 31.0 L 23.5 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.0 31.0 L 16.0 16.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.8 16.0 L 27.3 16.0 L 27.3 1.0 L 4.8 1.0 L 4.8 16.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "OBSTRN01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="DEPVS" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="DEPVS" />\n</svg>\n',
+  "OBSTRN01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <!-- S-52 PresLib OBSTRN01 / INT1 K40: obstruction, position-fixed (fish weir,\n       snag, sunken object, foul ground point). NOAA portrayal: bold "+" cross\n       inside a dashed oval. The dashed boundary (longer dashes than the dotted\n       K41 variant) signals "area of obstruction" \u2014 mariners should give the\n       feature a wide berth even when its precise extent is unclear. 18-unit\n       cross with 1.6 stroke for harbor-zoom visibility. -->\n  <ellipse cx="16" cy="16" rx="13" ry="10" fill="none" stroke="CHBLK" stroke-width="1.0" stroke-dasharray="1.8,1.4" />\n  <path d="M 16 7 L 16 25" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 7 16 L 25 16" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n</svg>\n',
   "OBSTRN02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"></svg>\n',
-  "OBSTRN03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="DEPIT" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="DEPIT" />\n</svg>\n',
+  "OBSTRN03": `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <!-- S-52 PresLib OBSTRN03 / INT1 K41: obstruction always submerged with
+       sounded depth (WATLEV=3). NOAA portrayal: bold "+" cross inside a
+       DOTTED oval (shorter, tighter dashes than OBSTRN01's dashed style).
+       Depth rendered separately via VALSOU label. 18-unit cross matching
+       UWTROC bold weight for visual hazard consistency. -->
+  <ellipse cx="16" cy="16" rx="13" ry="10" fill="none" stroke="CHBLK" stroke-width="0.9" stroke-dasharray="1.0,1.2" />
+  <path d="M 16 7 L 16 25" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />
+  <path d="M 7 16 L 25 16" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />
+</svg>
+`,
   "OBSTRN18": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 1.0 L 1.0 31.0 L 31.0 31.0 L 30.8 1.0 L 1.0 1.0 Z" fill="LANDA" />\n  <path d="M 1.0 1.0 L 1.0 31.0 L 31.0 31.0 L 30.8 1.0 L 1.0 1.0" fill="none" stroke="LANDA" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 1.0 L 1.0 31.0 L 31.0 31.0 L 30.8 1.0 L 1.0 1.0" fill="none" stroke="CSTLN" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "OFSPLF01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="3.75" fill="none" stroke="CHBLK" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="CHBLK" />\n  <path d="M 1.0 1.0 L 31.0 1.0 L 31.0 31.0 L 1.0 31.0 L 1.0 1.0" fill="none" stroke="CHBLK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "OSPONE02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 16.0 L 31.0 16.0" fill="none" stroke="SHIPS" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7369,6 +8454,8 @@ var S52_POINT_SVGS = {
   "PASTRK02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 16.0 L 31.0 16.0" fill="none" stroke="SYTRK" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "PILBOP02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 16.0 1.0 L 10.2 16.2 L 16.0 31.0 L 22.1 16.2 L 16.0 1.0 Z" fill="CHMGD" />\n  <path d="M 16.0 1.0 L 10.2 16.2 L 16.0 31.0 L 22.1 16.2 L 16.0 1.0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <circle cx="16.00" cy="16.17" r="14.77" fill="none" stroke="CHMGD" stroke-width="0.8" />\n</svg>\n',
   "PILPNT02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="CHBLK" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="CHBLK" />\n</svg>\n',
+  "PIPLIN01": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <circle cx="8" cy="8" r="3.5" fill="none" stroke="PIPLN" stroke-width="1.6" />\n</svg>\n',
+  "PIPOHD01": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <path d="M 3 12 L 8 5 L 13 12" fill="none" stroke="PIPLN" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" />\n  <line x1="3" y1="13" x2="5" y2="13" stroke="PIPLN" stroke-width="1.4" stroke-linecap="round" />\n  <line x1="11" y1="13" x2="13" y2="13" stroke="PIPLN" stroke-width="1.4" stroke-linecap="round" />\n</svg>\n',
   "PLNPOS01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 15.9 L 1.4 14.3 L 3.4 12.5 L 6.7 11.2 L 10.2 10.6 L 15.6 10.2 L 21.2 10.6 L 25.0 11.2 L 28.2 12.5 L 30.3 14.3 L 31.0 15.9 L 30.8 18.0 L 28.2 19.7 L 25.0 20.8 L 21.2 21.8 L 15.6 21.8 L 10.2 21.8 L 6.7 21.0 L 2.9 19.7 L 1.1 18.1 L 1.0 15.9" fill="none" stroke="PLRTE" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "PLNPOS02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 16.0 L 31.0 16.0" fill="none" stroke="PLRTE" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "PLNSPD03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 26.1 L 1.1 5.8 L 31.0 5.8 L 31.0 26.2 L 1.0 26.1" fill="none" stroke="PLRTE" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7482,12 +8569,14 @@ var S52_POINT_SVGS = {
   "TWRTPT53": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 13.3 4.5 L 16.0 1.0 L 18.6 4.5" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 11.3 7.0 L 9.6 9.5 L 12.8 9.5" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.9 9.4 L 22.4 9.4 L 20.4 6.8" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 26.9 L 12.7 31.0 L 19.2 31.0 L 19.2 27.0" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 23.7 L 12.7 20.3" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 12.7 13.0 L 12.7 16.2" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.6 12.8 L 19.6 15.9" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.5 20.1 L 19.5 23.4" fill="none" stroke="TRFCD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "UNITFTH1": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 6.3 14.0 L 25.7 14.0" fill="none" stroke="SCLBR" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 25.8 1.0 L 6.3 1.0 L 6.2 31.0" fill="none" stroke="SCLBR" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "UNITMTR1": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 3.1 31.0 L 3.1 1.0 L 16.1 25.2 L 28.9 1.4 L 28.9 30.6" fill="none" stroke="SCLBR" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "UWTROC03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="DEPVS" stroke-width="0.8" />\n  <path d="M 16.0 16.0 Z" fill="DEPVS" />\n  <path d="M 16.1 6.4 L 16.1 27.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 5.9 16.4 L 26.2 16.4" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
-  "UWTROC04": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 31.0 16.1 L 1.0 16.1" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 24.8 3.9 L 7.1 28.2" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 24.8 27.7 L 6.8 3.8" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "UWTROC01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <!-- S-52 PresLib UWTROC01 / INT1 K11: rock that covers and uncovers\n       (WATLEV=4). Per IHO S-52 PresLib Edition 4.0 Annex A, the symbol is a\n       plain 4-line asterisk \u2014 geometrically identical to UWTROC04 (K13).\n       The K11/K13 distinction is conveyed by attribute context: K11 has no\n       VALSOU (depth varies with tide so no fixed sounding), K13 carries a\n       VALSOU label rendered separately. 18-unit asterisk, 1.6 stroke. -->\n  <path d="M 16 7 L 16 25" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 7 16 L 25 16" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 9.5 9.5 L 22.5 22.5" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 22.5 9.5 L 9.5 22.5" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n</svg>\n',
+  "UWTROC03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <!-- S-52 PresLib UWTROC03 / INT1 K12: rock awash at chart datum (WATLEV=5).\n       NOAA portrayal: bold 4-line asterisk enclosed in a dotted oval \u2014 the\n       oval signals "at chart datum, dangerous" and visually distinguishes\n       awash rocks from sounded submerged rocks (UWTROC04). 18-unit asterisk\n       inside a 28\xD722 dotted oval. -->\n  <ellipse cx="16" cy="16" rx="14" ry="11" fill="none" stroke="CHBLK" stroke-width="1.0" stroke-dasharray="1.0,1.2" />\n  <path d="M 16 7 L 16 25" fill="none" stroke="CHBLK" stroke-width="1.5" stroke-linecap="round" />\n  <path d="M 7 16 L 25 16" fill="none" stroke="CHBLK" stroke-width="1.5" stroke-linecap="round" />\n  <path d="M 9.5 9.5 L 22.5 22.5" fill="none" stroke="CHBLK" stroke-width="1.5" stroke-linecap="round" />\n  <path d="M 22.5 9.5 L 9.5 22.5" fill="none" stroke="CHBLK" stroke-width="1.5" stroke-linecap="round" />\n</svg>\n',
+  "UWTROC04": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <!-- S-52 PresLib UWTROC04 / INT1 K13: underwater rock always submerged with\n       sounded depth (WATLEV=3, dangerous to surface navigation). NOAA portrayal:\n       bold 4-line asterisk, depth value rendered separately by VALSOU label.\n       18-unit span with 1.6 stroke for clear visibility at harbor zoom \u2014 these\n       are safety-critical hazards and need to read like NOAA paper-chart\n       asterisks (~2 mm at 1:5000 \u2248 18 px on screen at z16). -->\n  <path d="M 16 7 L 16 25" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 7 16 L 25 16" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 9.5 9.5 L 22.5 22.5" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n  <path d="M 22.5 9.5 L 9.5 22.5" fill="none" stroke="CHBLK" stroke-width="1.6" stroke-linecap="round" />\n</svg>\n',
   "VECGND01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 7.5 26.4 L 15.9 15.8 L 24.6 26.6" fill="none" stroke="SHIPS" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 23.3 L 15.8 5.4 L 31.0 23.4" fill="none" stroke="SHIPS" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "VECGND21": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 7.5 26.4 L 15.9 15.8 L 24.6 26.6" fill="none" stroke="ARPAT" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 23.3 L 15.8 5.4 L 31.0 23.4" fill="none" stroke="ARPAT" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "VECWTR01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 24.9 L 15.8 7.0 L 31.0 25.0" fill="none" stroke="SHIPS" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "VECWTR21": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 24.9 L 15.8 7.0 L 31.0 25.0" fill="none" stroke="ARPAT" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "WATTUR01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 8 11 Q 12 9 16 11 T 24 11" fill="none" stroke="CHBLK" stroke-width="1.4" stroke-linecap="round" />\n  <path d="M 8 16 Q 12 14 16 16 T 24 16" fill="none" stroke="CHBLK" stroke-width="1.4" stroke-linecap="round" />\n  <path d="M 8 21 Q 12 19 16 21 T 24 21" fill="none" stroke="CHBLK" stroke-width="1.4" stroke-linecap="round" />\n</svg>\n',
   "WATTUR02": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 1.0 18.9 L 2.8 18.3 L 5.0 16.8 L 7.0 13.9 L 9.0 12.9 L 11.2 13.1 L 9.0 15.1 L 9.0 17.0 L 11.3 19.1 L 13.2 18.3 L 15.0 17.1 L 17.1 13.9 L 19.3 13.0 L 21.1 13.1 L 19.0 15.1 L 18.9 17.2 L 21.3 19.1 L 23.3 18.2 L 25.0 17.1 L 27.0 14.1 L 29.3 13.0 L 31.0 13.2 L 29.0 15.7 L 29.1 17.2 L 30.9 19.1" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "WAYPNT01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="PLRTE" stroke-width="1.8" />\n</svg>\n',
   "WAYPNT03": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <circle cx="16.00" cy="16.00" r="15.00" fill="none" stroke="APLRT" stroke-width="1.2" />\n</svg>\n',
@@ -7505,6 +8594,7 @@ var S52_POINT_SVGS = {
 };
 var S52_PATTERN_SVGS = {
   "AIRARE02": '<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28">\n  <path d="M 8.9 25.1 L 18.8 25.1 L 15.9 21.8 L 15.9 17.6 L 27.0 17.6 L 16.8 10.7 L 16.8 5.6 L 14.3 2.9 L 11.3 5.6 L 11.3 10.7 L 1.0 17.3 L 11.5 17.4 L 11.5 22.0 L 8.9 25.1" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "CBLARE01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 0 32 L 32 0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-opacity="0.7" />\n  <path d="M -16 32 L 16 0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-opacity="0.7" />\n  <path d="M 16 32 L 48 0" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-opacity="0.7" />\n</svg>\n',
   "DIAMOND1": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 8.2 1.0 L 23.8 31.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.2 31.0 L 23.8 1.0" fill="none" stroke="CHBLK" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "DQUALA11": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 22.4 9.2 L 27.7 9.2" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 26.7 7.1 L 23.5 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 23.5 7.1 L 26.7 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.1 9.2 L 18.5 9.2" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 17.4 7.1 L 14.2 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 14.2 7.1 L 17.4 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.8 9.3 L 9.1 9.3" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.1 7.2 L 4.9 11.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.9 7.2 L 8.1 11.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.8 15.5 L 14.1 15.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.0 13.4 L 9.8 17.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 9.9 13.4 L 13.0 17.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.1 15.4 L 23.4 15.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 22.4 13.3 L 19.2 17.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.2 13.3 L 22.4 17.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.7 21.4 L 19.0 21.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.0 19.3 L 14.8 23.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 14.8 19.3 L 18.0 23.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.5 9.0 L 1.0 7.6 L 1.2 6.6 L 1.5 5.9 L 2.4 5.6 L 2.9 5.5 L 28.1 5.5 L 29.6 5.7 L 30.5 6.1 L 30.8 6.6 L 31.0 7.1 L 31.0 7.5 L 31.0 8.2 L 30.7 8.7 L 18.5 24.9 L 18.0 25.4 L 17.6 26.0 L 17.1 26.3 L 16.8 26.3 L 16.4 26.5 L 15.8 26.4 L 15.5 26.3 L 14.8 26.1 L 14.4 25.8 L 14.1 25.4 L 13.7 25.0 L 1.5 9.0" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "DQUALA21": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 22.4 9.2 L 27.7 9.2" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 26.7 7.1 L 23.5 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 23.5 7.1 L 26.7 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.1 9.2 L 18.5 9.2" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 17.4 7.1 L 14.2 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 14.2 7.1 L 17.4 11.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.8 9.3 L 9.1 9.3" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.1 7.2 L 4.9 11.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.9 7.2 L 8.1 11.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 8.8 15.5 L 14.1 15.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.0 13.4 L 9.8 17.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 9.9 13.4 L 13.0 17.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.1 15.4 L 23.4 15.4" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 22.4 13.3 L 19.2 17.6" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 19.2 13.3 L 22.4 17.5" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.5 9.0 L 1.0 7.6 L 1.2 6.6 L 1.5 5.9 L 2.4 5.6 L 2.9 5.5 L 28.1 5.5 L 29.6 5.7 L 30.5 6.1 L 30.8 6.6 L 31.0 7.1 L 31.0 7.5 L 31.0 8.2 L 30.7 8.7 L 18.5 24.9 L 18.0 25.4 L 17.6 26.0 L 17.1 26.3 L 16.8 26.3 L 16.4 26.5 L 15.8 26.4 L 15.5 26.3 L 14.8 26.1 L 14.4 25.8 L 14.1 25.4 L 13.7 25.0 L 1.5 9.0" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7522,6 +8612,7 @@ var S52_PATTERN_SVGS = {
   "MARSHES1": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <path d="M 8.0 10.4 L 8.0 1.1" fill="none" stroke="CHBRN" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 3.7 14.9 L 12.4 14.9" fill="none" stroke="CHBRN" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 1.0 12.0 L 15.0 12.0" fill="none" stroke="CHBRN" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 5.0 11.6 L 2.5 5.8" fill="none" stroke="CHBRN" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 10.8 11.6 L 13.3 6.0" fill="none" stroke="CHBRN" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "NODATA03": '<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28">\n  <path d="M 1.0 14.1 L 27.0 13.9" fill="none" stroke="CHGRD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "OVERSC01": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <path d="M 8.0 1.0 L 8.0 15.0" fill="none" stroke="CHGRD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
+  "PIPARE01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 0 32 L 32 0" fill="none" stroke="PIPLN" stroke-width="0.8" stroke-opacity="0.7" />\n  <path d="M -16 32 L 16 0" fill="none" stroke="PIPLN" stroke-width="0.8" stroke-opacity="0.7" />\n  <path d="M 16 32 L 48 0" fill="none" stroke="PIPLN" stroke-width="0.8" stroke-opacity="0.7" />\n</svg>\n',
   "PRTSUR01": '<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">\n  <path d="M 1.0 8.0 L 15.0 8.0" fill="none" stroke="CHGRD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "QUESMRK1": '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">\n  <path d="M 5.5 4.9 L 6.1 3.8 L 6.6 2.7 L 7.3 2.1 L 8.0 1.4 L 9.0 1.0 L 10.0 1.1 L 11.2 1.4 L 12.3 1.7 L 13.3 3.1 L 14.0 3.8 L 14.5 4.7 L 14.5 5.8 L 14.0 6.7 L 13.5 7.6 L 12.6 8.6 L 11.7 9.6 L 10.9 10.6 L 10.3 11.4 L 9.9 12.1 L 9.8 13.0 L 9.8 13.9 L 9.8 14.6 L 9.9 15.5 L 9.9 15.6" fill="none" stroke="CHMGD" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 9.0 19.0 L 11.2 19.0" fill="none" stroke="CHMGD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
   "RCKLDG01": '<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">\n  <path d="M 5.6 29.0 L 9.8 25.7" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 4.2 7.2 L 6.2 13.2" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 16.1 14.7 L 13.0 19.2" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.2 7.8 L 14.7 3.1" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 17.9 22.2 L 18.9 27.8" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 28.8 21.5 L 31.0 16.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 29.1 9.8 L 24.2 8.2" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 6.2 13.1 L 1.0 10.4" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 13.2 19.1 L 12.7 13.9" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 5.5 29.0 L 6.0 24.0" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 18.0 22.2 L 22.1 25.5" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 30.9 16.5 L 25.7 18.7" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 24.3 8.3 L 28.3 5.6" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n  <path d="M 14.7 3.0 L 16.8 7.6" fill="none" stroke="LANDF" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" />\n</svg>\n',
@@ -7672,7 +8763,20 @@ var FILL_OUTLINE_LAYERS = /* @__PURE__ */ new Set([
   "FAIRWY",
   "TESARE",
   "MIPARE",
-  "PRCARE"
+  "PRCARE",
+  "PYLONS"
+]);
+var REGULATED_AREA_BOUNDARY_LAYERS = {
+  CBLARE: "CHMGD",
+  PIPARE: "PIPLN"
+};
+var LINE_FROM_POLYGON_LAYERS = /* @__PURE__ */ new Set([
+  "CTNARE",
+  "RESARE",
+  "MIPARE",
+  "TESARE",
+  "MAGVAR",
+  "PRDARE"
 ]);
 var ZOOM_SCALED_LINES2 = {
   DEPCNT: [8, 0.3, 14, 0.8],
@@ -7682,8 +8786,66 @@ var ZOOM_SCALED_LINES2 = {
   BRIDGE: [8, 1, 14, 2],
   DAMCON: [8, 1, 14, 2]
 };
-var OPAQUE_FILLS = /* @__PURE__ */ new Set(["DEPARE", "LNDARE", "UNSARE", "LAKARE", "DRGARE"]);
+var OPAQUE_FILLS = /* @__PURE__ */ new Set(["DEPARE", "LNDARE", "UNSARE", "LAKARE", "DRGARE", "SEAARE"]);
 var SAFETY_GROUPS = /* @__PURE__ */ new Set([24020, 27010, 27070, 27080]);
+var HAZARD_GROUPS = /* @__PURE__ */ new Set([24020]);
+var CHILD_ICON_OFFSETS = {
+  FOGSIG: [-22, 18],
+  // lower-left quadrant of the buoy symbol
+  RTPBCN: [22, 18],
+  // lower-right quadrant
+  TOPMAR: [0, -24],
+  // directly above the buoy symbol
+  DAYMAR: [0, -20],
+  // directly above (like TOPMAR)
+  LIGHTS: [14, 14]
+  // lower-right, off the buoy hull so the flare is visible
+};
+var SAFETY_CRITICAL_LABELS = /* @__PURE__ */ new Set([
+  "LIGHTS",
+  "SOUNDG",
+  "BOYLAT",
+  "BCNLAT",
+  "BOYCAR",
+  "BCNCAR",
+  "BOYSPP",
+  "BCNSPP",
+  "BOYISD",
+  "BOYSAW",
+  "FOGSIG",
+  "RTPBCN"
+]);
+var HIGH_DENSITY_NAV_AIDS = /* @__PURE__ */ new Set([
+  "BOYLAT",
+  "BOYCAR",
+  "BOYSPP",
+  "BOYISD",
+  "BOYSAW",
+  "BOYINB",
+  "BCNLAT",
+  "BCNCAR",
+  "BCNSPP",
+  "BCNISD",
+  "BCNSAW"
+]);
+function buildNavAidLabelExpression() {
+  const colourPrefix = colourCodeCase(
+    [
+      ["3", "R "],
+      ["4", "G "],
+      ["6", "Y "]
+    ],
+    ""
+  );
+  return [
+    "case",
+    ["has", "_navAidLabel"],
+    ["get", "_navAidLabel"],
+    ["has", "OBJNAM"],
+    ["concat", colourPrefix, ["get", "OBJNAM"]],
+    ""
+  ];
+}
 function buildLightLabelExpression() {
   const litchrExpr = [
     "match",
@@ -7712,21 +8874,26 @@ function buildLightLabelExpression() {
     "UQ",
     ""
   ];
-  const colourExpr = [
-    "match",
-    ["coalesce", ["get", "COLOUR"], 0],
-    1,
-    " W",
-    3,
-    " R",
-    4,
-    " G",
-    5,
-    " Bu",
-    6,
-    " Y",
-    11,
-    " Or",
+  const colourExpr = colourCodeCase(
+    [
+      ["3", " R"],
+      ["4", " G"],
+      ["6", " Y"],
+      ["11", " Or"],
+      ["5", " Bu"],
+      ["1", " W"]
+    ],
+    ""
+  );
+  const siggrpExpr = [
+    "case",
+    [
+      "all",
+      ["has", "SIGGRP"],
+      ["!=", ["coalesce", ["get", "SIGGRP"], ""], ""],
+      ["!=", ["coalesce", ["get", "SIGGRP"], "(1)"], "(1)"]
+    ],
+    ["to-string", ["get", "SIGGRP"]],
     ""
   ];
   const sigperExpr = [
@@ -7735,7 +8902,7 @@ function buildLightLabelExpression() {
     ["concat", " ", ["to-string", ["get", "SIGPER"]], "s"],
     ""
   ];
-  return ["concat", litchrExpr, colourExpr, sigperExpr];
+  return ["concat", litchrExpr, siggrpExpr, colourExpr, sigperExpr];
 }
 function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
   if (!S52_LOOKUP[objectClass]) return [];
@@ -7757,7 +8924,9 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
         "s52:category": entry?.category ?? "Meta"
       }
     };
-    if (GEOM_FILTERS[resolved.type]) {
+    if (resolved.type === "line" && LINE_FROM_POLYGON_LAYERS.has(objectClass)) {
+      layer.filter = GEOM_FILTERS.fill;
+    } else if (GEOM_FILTERS[resolved.type]) {
       layer.filter = GEOM_FILTERS[resolved.type];
     }
     if (resolved.minzoom) {
@@ -7772,17 +8941,180 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
     }
     if (resolved.type === "symbol") {
       const iconExpr = getIconExpression(objectClass);
+      const childOffset = CHILD_ICON_OFFSETS[objectClass];
+      const isSafetyCritical = SAFETY_GROUPS.has(entry?.viewingGroup ?? 0);
+      const safetyCriticalIconSize = [
+        "interpolate",
+        ["linear"],
+        ["zoom"],
+        6,
+        0.4,
+        12,
+        0.45,
+        14,
+        0.6,
+        18,
+        1.1
+      ];
+      const defaultIconSize = [
+        "interpolate",
+        ["linear"],
+        ["zoom"],
+        6,
+        0.32,
+        13,
+        0.32,
+        14,
+        0.36,
+        18,
+        1.04
+      ];
       layer.layout = {
         "icon-image": iconExpr,
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 8, 0.4, 14, 0.8],
-        "icon-allow-overlap": SAFETY_GROUPS.has(entry?.viewingGroup ?? 0),
-        "icon-optional": !SAFETY_GROUPS.has(entry?.viewingGroup ?? 0),
-        ...resolved.layout ?? {}
+        "icon-size": defaultIconSize,
+        "icon-allow-overlap": isSafetyCritical,
+        "icon-optional": !isSafetyCritical,
+        ...childOffset ? { "icon-offset": childOffset } : {},
+        ...resolved.layout ?? {},
+        // Safety-critical icon-size MUST be applied AFTER the resolved.layout
+        // spread. Otherwise the static "icon-size" baked into safety-critical
+        // lookup entries (LIGHTS 0.7, BOYLAT 0.7, BCNLAT 0.6, BCNSPP 0.6,
+        // FOGSIG 0.6, RTPBCN 0.6) suppresses the coastal-scale curve and the
+        // icons stay invisibly small at z9–z11 next to their large labels.
+        // Non-safety classes keep the static-or-default cascade from above.
+        ...isSafetyCritical ? { "icon-size": safetyCriticalIconSize } : {}
       };
+      if (HAZARD_GROUPS.has(entry?.viewingGroup ?? 0)) {
+        const watlev = ["to-number", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 0];
+        const valsou = ["to-number", ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 99], 99];
+        const hazardIconSize = [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          10,
+          0.3,
+          12,
+          0.5,
+          13,
+          0.65,
+          14,
+          0.9,
+          16,
+          1.2,
+          18,
+          1.5
+        ];
+        layer.layout = {
+          ...layer.layout,
+          "icon-size": hazardIconSize,
+          "icon-allow-overlap": false,
+          "icon-optional": true,
+          // Pad each hazard's collision box so adjacent rocks don't stack
+          // visually. At z12–13 a 2 px pad roughly doubles the dedupe
+          // radius relative to the rendered icon, which is the difference
+          // between a black mass and individually-legible hazards.
+          "icon-padding": 2,
+          "symbol-sort-key": [
+            "case",
+            ["==", watlev, 4],
+            1,
+            ["==", watlev, 5],
+            2,
+            // Submerged rocks: sounded depth determines priority. Shallower
+            // = smaller sort-key = wins collisions. Offset by 10 so any
+            // submerged rock still loses to a covers-and-uncovers / awash
+            // hazard at the same point, but ranks dangerously-shallow
+            // submerged rocks above deeper ones.
+            ["+", 10, valsou]
+          ]
+        };
+      }
+      if (objectClass === "LIGHTS") {
+        layer.paint["icon-color"] = lightFillExpression(ct);
+        layer.paint["icon-halo-color"] = resolveColor("CHBLK", ct);
+        layer.paint["icon-halo-width"] = 1;
+      }
     } else if (resolved.layout) {
       layer.layout = resolved.layout;
     }
+    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 scaminFloor = scaminToMinZoom(entry?.scamin);
+      const windLayer = {
+        ...layer,
+        id: `s52-${objectClass}-wind-symbol`,
+        filter: ["all", ...baseFilterParts, isWind]
+      };
+      delete windLayer.minzoom;
+      const lighthouseLayer = {
+        ...layer,
+        id: `s52-${objectClass}-lighthouse-symbol`,
+        filter: ["all", ...baseFilterParts, isLighthouse],
+        layout: {
+          ...layer.layout ?? {},
+          "icon-image": "LIGHTHOUSE01"
+        }
+      };
+      delete lighthouseLayer.minzoom;
+      const otherLayer = {
+        ...layer,
+        id: `s52-${objectClass}-other-symbol`,
+        filter: ["all", ...baseFilterParts, ["!", isWind], ["!", isLighthouse]]
+      };
+      if (scaminFloor !== void 0) {
+        otherLayer.minzoom = scaminFloor;
+      }
+      layers.push(windLayer, lighthouseLayer, otherLayer);
+      continue;
+    }
     layers.push(layer);
+    if (HAZARD_GROUPS.has(entry?.viewingGroup ?? 0) && resolved.type === "symbol") {
+      const HAZARD_SAFETY_CONTOUR_M = 9;
+      const valsouNum = ["to-number", ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 999], 999];
+      const watlevNum = ["to-number", ["coalesce", ["get", "WATLEV"], ["get", "watlev"], 0], 0];
+      layers.push({
+        id: `s52-${objectClass}-danger-ring`,
+        type: "symbol",
+        source: sourceId,
+        "source-layer": objectClass,
+        filter: [
+          "all",
+          GEOM_FILTERS.symbol,
+          [
+            "any",
+            ["<", valsouNum, HAZARD_SAFETY_CONTOUR_M],
+            ["==", watlevNum, 4]
+          ]
+        ],
+        layout: {
+          "icon-image": "DNGCIR01",
+          "icon-size": [
+            "interpolate",
+            ["linear"],
+            ["zoom"],
+            12.99,
+            0,
+            13,
+            0.55,
+            14,
+            0.85,
+            16,
+            1.15,
+            18,
+            1.45
+          ],
+          "icon-allow-overlap": true,
+          "icon-ignore-placement": true,
+          "icon-optional": true
+        },
+        paint: {},
+        minzoom: 13,
+        metadata: { "s52:objectClass": objectClass, "s52:role": "isolated-danger-ring" }
+      });
+    }
     if (resolved.type === "fill" && FILL_OUTLINE_LAYERS.has(objectClass)) {
       const outlineColor = objectClass === "DEPARE" ? resolveColor("CHGRD", ct) : resolveColor("CHGRF", ct);
       layers.push({
@@ -7799,12 +9131,650 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
         metadata: { "s52:objectClass": objectClass, "s52:role": "outline" }
       });
     }
+    if (resolved.type === "fill" && REGULATED_AREA_BOUNDARY_LAYERS[objectClass]) {
+      const boundaryColor = resolveColor(REGULATED_AREA_BOUNDARY_LAYERS[objectClass], ct);
+      layers.push({
+        id: `s52-${objectClass}-boundary`,
+        type: "line",
+        source: sourceId,
+        "source-layer": objectClass,
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": boundaryColor,
+          "line-width": 1,
+          "line-dasharray": [4, 2],
+          "line-opacity": 0.85
+        },
+        metadata: { "s52:objectClass": objectClass, "s52:role": "boundary" }
+      });
+    }
+    if (objectClass === "ACHARE" && resolved.type === "fill") {
+      layers.push({
+        id: "s52-ACHARE-boundary",
+        type: "line",
+        source: sourceId,
+        "source-layer": "ACHARE",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHMGD", ct),
+          "line-width": 0.8,
+          "line-dasharray": [3, 2],
+          "line-opacity": 0.7
+        },
+        metadata: { "s52:objectClass": "ACHARE", "s52:role": "boundary" }
+      });
+    }
+    if (objectClass === "ACHARE" && resolved.type === "fill") {
+      layers.push({
+        id: "s52-ACHARE-anchor-icon",
+        type: "symbol",
+        source: sourceId,
+        "source-layer": "ACHARE",
+        filter: GEOM_FILTERS.fill,
+        layout: {
+          "icon-image": "ACHARE02",
+          "icon-size": ["interpolate", ["linear"], ["zoom"], 10, 0.5, 14, 0.8, 17, 1.1],
+          "icon-allow-overlap": true,
+          "icon-ignore-placement": false,
+          "symbol-placement": "point",
+          "text-field": ["case", ["has", "OBJNAM"], ["get", "OBJNAM"], ""],
+          "text-size": ["interpolate", ["linear"], ["zoom"], 11, 9, 16, 11],
+          "text-anchor": "top",
+          "text-offset": [0, 1.4],
+          "text-optional": true,
+          "text-font": ["Open Sans Italic"],
+          "text-allow-overlap": false
+        },
+        paint: {
+          "text-color": resolveColor("CHMGD", ct),
+          "text-halo-color": resolveColor("CHWHT", ct),
+          "text-halo-width": 1
+        },
+        metadata: { "s52:objectClass": "ACHARE", "s52:role": "centroid-icon" }
+      });
+    }
+    if (objectClass === "LNDARE" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-LNDARE-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "LNDARE",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("LANDA", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.8, 14, 2.4, 17, 3.6],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.8
+        },
+        metadata: { "s52:objectClass": "LNDARE", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "LNDARE" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-LNDARE-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "LNDARE",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CSTLN", ct),
+          "line-width": ["interpolate", ["linear"], ["zoom"], 8, 0.6, 14, 1.4]
+        },
+        metadata: { "s52:objectClass": "LNDARE", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "BUAARE" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-BUAARE-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "BUAARE",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHGRF", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 8, 1.5, 12, 2.5, 16, 4],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.6
+        },
+        metadata: { "s52:objectClass": "BUAARE", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "RIVERS" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-RIVERS-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "RIVERS",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("DEPMD", ct),
+          "line-width": ["interpolate", ["linear"], ["zoom"], 8, 0.5, 14, 1.2]
+        },
+        metadata: { "s52:objectClass": "RIVERS", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "BUISGL" && resolved.type === "circle") {
+      layers.push({
+        id: `s52-BUISGL-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "BUISGL",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.55
+        },
+        metadata: { "s52:objectClass": "BUISGL", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-BUISGL-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "BUISGL",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.4
+        },
+        metadata: { "s52:objectClass": "BUISGL", "s52:role": "polygon-outline" }
+      });
+    }
+    if (objectClass === "BRIDGE" && resolved.type === "line") {
+      layers.push({
+        id: `s52-BRIDGE-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "BRIDGE",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.35
+        },
+        metadata: { "s52:objectClass": "BRIDGE", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-BRIDGE-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "BRIDGE",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 1
+        },
+        metadata: { "s52:objectClass": "BRIDGE", "s52:role": "polygon-outline" }
+      });
+    }
+    if (objectClass === "PYLONS" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-PYLONS-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "PYLONS",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBRN", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.8, 14, 2.6, 17, 3.8],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.8
+        },
+        metadata: { "s52:objectClass": "PYLONS", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "WEDKLP" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-WEDKLP-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "WEDKLP",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHGRN", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 10, 1.5, 14, 2.5, 17, 4],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.5,
+          "circle-opacity": 0.7
+        },
+        metadata: { "s52:objectClass": "WEDKLP", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "SLOGRD" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-SLOGRD-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "SLOGRD",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBRN", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.4, 14, 2, 17, 3],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.4,
+          "circle-opacity": 0.7
+        },
+        metadata: { "s52:objectClass": "SLOGRD", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "RUNWAY" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-RUNWAY-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "RUNWAY",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHGRF", ct),
+          "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.6, 14, 1.2, 17, 2]
+        },
+        metadata: { "s52:objectClass": "RUNWAY", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "FORSTC" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-FORSTC-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "FORSTC",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.6, 14, 1.2, 17, 1.8]
+        },
+        metadata: { "s52:objectClass": "FORSTC", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "FSHFAC" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-FSHFAC-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "FSHFAC",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBLK", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.4, 14, 2, 17, 2.8],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.4
+        },
+        metadata: { "s52:objectClass": "FSHFAC", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "OBSTRN" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-OBSTRN-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "OBSTRN",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBLK", ct),
+          "fill-opacity": 0.1
+        },
+        metadata: { "s52:objectClass": "OBSTRN", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-OBSTRN-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "OBSTRN",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": ["interpolate", ["linear"], ["zoom"], 8, 0.8, 14, 1.4],
+          "line-dasharray": [3, 2]
+        },
+        metadata: { "s52:objectClass": "OBSTRN", "s52:role": "polygon-outline" }
+      });
+      layers.push({
+        id: `s52-OBSTRN-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "OBSTRN",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 1.2,
+          "line-dasharray": [3, 2]
+        },
+        metadata: { "s52:objectClass": "OBSTRN", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "SLCONS" && resolved.type === "line") {
+      layers.push({
+        id: `s52-SLCONS-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "SLCONS",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.5
+        },
+        metadata: { "s52:objectClass": "SLCONS", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-SLCONS-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "SLCONS",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.6
+        },
+        metadata: { "s52:objectClass": "SLCONS", "s52:role": "polygon-outline" }
+      });
+      layers.push({
+        id: `s52-SLCONS-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "SLCONS",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBRN", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.6, 14, 2.2, 17, 3.2],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.6
+        },
+        metadata: { "s52:objectClass": "SLCONS", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "PRDARE" && resolved.type === "line") {
+      layers.push({
+        id: `s52-PRDARE-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "PRDARE",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHMGD", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 8, 2, 14, 3.5, 17, 5],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.8,
+          "circle-opacity": 0.35
+        },
+        metadata: { "s52:objectClass": "PRDARE", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "CTNARE" && resolved.type === "line") {
+      layers.push({
+        id: `s52-CTNARE-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "CTNARE",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("LITYW", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 10, 1.8, 14, 2.6, 17, 4],
+          "circle-stroke-color": resolveColor("CHMGD", ct),
+          "circle-stroke-width": 1.2
+        },
+        metadata: { "s52:objectClass": "CTNARE", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "PONTON" && resolved.type === "line") {
+      layers.push({
+        id: `s52-PONTON-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "PONTON",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.5
+        },
+        metadata: { "s52:objectClass": "PONTON", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-PONTON-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "PONTON",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.6
+        },
+        metadata: { "s52:objectClass": "PONTON", "s52:role": "polygon-outline" }
+      });
+    }
+    if (objectClass === "WRECKS" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-WRECKS-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "WRECKS",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBLK", ct),
+          "fill-opacity": 0.08
+        },
+        metadata: { "s52:objectClass": "WRECKS", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-WRECKS-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "WRECKS",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 1,
+          "line-dasharray": [3, 2]
+        },
+        metadata: { "s52:objectClass": "WRECKS", "s52:role": "polygon-outline" }
+      });
+    }
+    if (objectClass === "WATTUR" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-WATTUR-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "WATTUR",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBLK", ct),
+          "fill-opacity": 0.05
+        },
+        metadata: { "s52:objectClass": "WATTUR", "s52:role": "polygon" }
+      });
+    }
+    if (objectClass === "MAGVAR" && resolved.type === "line") {
+      layers.push({
+        id: "s52-MAGVAR-point",
+        type: "circle",
+        source: sourceId,
+        "source-layer": "MAGVAR",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHMGD", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 2],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.4,
+          "circle-opacity": 0.4
+        },
+        metadata: { "s52:objectClass": "MAGVAR", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "DMPGRD" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-DMPGRD-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "DMPGRD",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("LITYW", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 10, 1.5, 14, 2.5, 17, 3.6],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.5,
+          "circle-opacity": 0.7
+        },
+        metadata: { "s52:objectClass": "DMPGRD", "s52:role": "point" }
+      });
+    }
+    if (objectClass === "DAMCON" && resolved.type === "line") {
+      layers.push({
+        id: `s52-DAMCON-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "DAMCON",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.4
+        },
+        metadata: { "s52:objectClass": "DAMCON", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-DAMCON-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "DAMCON",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.6
+        },
+        metadata: { "s52:objectClass": "DAMCON", "s52:role": "outline" }
+      });
+    }
+    if (objectClass === "GATCON" && resolved.type === "line") {
+      layers.push({
+        id: `s52-GATCON-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "GATCON",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHBRN", ct),
+          "fill-opacity": 0.4
+        },
+        metadata: { "s52:objectClass": "GATCON", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-GATCON-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "GATCON",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.6
+        },
+        metadata: { "s52:objectClass": "GATCON", "s52:role": "outline" }
+      });
+    }
+    if (objectClass === "CANALS" && resolved.type === "line") {
+      layers.push({
+        id: `s52-CANALS-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "CANALS",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("DEPMS", ct),
+          "fill-opacity": 0.5
+        },
+        metadata: { "s52:objectClass": "CANALS", "s52:role": "polygon" }
+      });
+    }
+    if (objectClass === "PILBOP" && resolved.type === "symbol") {
+      layers.push({
+        id: `s52-PILBOP-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "PILBOP",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("CHMGD", ct),
+          "fill-opacity": 0.1
+        },
+        metadata: { "s52:objectClass": "PILBOP", "s52:role": "polygon" }
+      });
+      layers.push({
+        id: `s52-PILBOP-polygon-outline`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "PILBOP",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "line-color": resolveColor("CHMGD", ct),
+          "line-width": 0.8,
+          "line-dasharray": [4, 2]
+        },
+        metadata: { "s52:objectClass": "PILBOP", "s52:role": "outline" }
+      });
+    }
+    if (objectClass === "HRBFAC" && resolved.type === "circle") {
+      layers.push({
+        id: `s52-HRBFAC-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "HRBFAC",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("TRFCD", ct),
+          "fill-opacity": 0.15
+        },
+        metadata: { "s52:objectClass": "HRBFAC", "s52:role": "polygon" }
+      });
+    }
+    if (objectClass === "MARCUL" && resolved.type === "fill") {
+      layers.push({
+        id: `s52-MARCUL-point`,
+        type: "circle",
+        source: sourceId,
+        "source-layer": "MARCUL",
+        filter: GEOM_FILTERS.circle,
+        paint: {
+          "circle-color": resolveColor("CHBRN", ct),
+          "circle-radius": ["interpolate", ["linear"], ["zoom"], 12, 1.2, 14, 1.8, 17, 2.6],
+          "circle-stroke-color": resolveColor("CHBLK", ct),
+          "circle-stroke-width": 0.4,
+          "circle-opacity": 0.6
+        },
+        metadata: { "s52:objectClass": "MARCUL", "s52:role": "point" }
+      });
+      layers.push({
+        id: `s52-MARCUL-line`,
+        type: "line",
+        source: sourceId,
+        "source-layer": "MARCUL",
+        filter: GEOM_FILTERS.line,
+        paint: {
+          "line-color": resolveColor("CHBLK", ct),
+          "line-width": 0.5,
+          "line-dasharray": [2, 2]
+        },
+        metadata: { "s52:objectClass": "MARCUL", "s52:role": "line" }
+      });
+    }
+    if (objectClass === "RECTRC" && resolved.type === "line") {
+      layers.push({
+        id: `s52-RECTRC-polygon`,
+        type: "fill",
+        source: sourceId,
+        "source-layer": "RECTRC",
+        filter: GEOM_FILTERS.fill,
+        paint: {
+          "fill-color": resolveColor("TRFCD", ct),
+          "fill-opacity": 0.05
+        },
+        metadata: { "s52:objectClass": "RECTRC", "s52:role": "polygon" }
+      });
+    }
   }
   return layers;
 }
-function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION) {
+function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION, depthUnits = "meters", labelOpts = {}) {
   if (!LABELED_LAYERS.has(objectClass)) return null;
-  const config = getLabelConfig(objectClass);
+  const config = getLabelConfig(objectClass, {
+    colorTable: ct,
+    safetyContour: labelOpts.safetyContour,
+    twoShadeSoundings: labelOpts.twoShadeSoundings,
+    soundingFontWeight: labelOpts.soundingFontWeight
+  });
   if (!config) return null;
   let textField = config.textField;
   if (objectClass === "LIGHTS") {
@@ -7813,9 +9783,36 @@ function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION) {
   if (typeof textField !== "string" && Array.isArray(textField)) {
     const flat = JSON.stringify(textField);
     if (flat.includes("_navAidLabel")) {
-      textField = ["get", "OBJNAM"];
+      textField = buildNavAidLabelExpression();
     }
   }
+  if (depthUnits === "feet") {
+    if (objectClass === "SOUNDG") {
+      textField = [
+        "concat",
+        [
+          "round",
+          [
+            "*",
+            [
+              "to-number",
+              ["coalesce", ["get", "depth"], ["get", "DEPTH"], ["get", "VALSOU"]],
+              0
+            ],
+            3.28084
+          ]
+        ],
+        ""
+      ];
+    } else if (objectClass === "DEPCNT") {
+      textField = [
+        "concat",
+        ["round", ["*", ["to-number", ["get", "VALDCO"]], 3.28084]],
+        "ft"
+      ];
+    }
+  }
+  const isSafetyCritical = SAFETY_CRITICAL_LABELS.has(objectClass);
   const layer = {
     id: `s52-${objectClass}-label`,
     type: "symbol",
@@ -7825,12 +9822,12 @@ function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION) {
     layout: {
       "text-field": textField,
       "text-size": config.textSize,
-      "text-font": config.textFont ?? ["Open Sans Regular", "Arial Unicode MS Regular"],
+      "text-font": config.textFont ?? ["Open Sans Regular"],
       "text-offset": config.textOffset,
       "text-anchor": "top",
-      "text-allow-overlap": false,
-      "text-optional": true,
-      "text-padding": 4,
+      "text-allow-overlap": isSafetyCritical,
+      "text-optional": !isSafetyCritical,
+      "text-padding": isSafetyCritical ? 0 : 4,
       ...config.layout ?? {}
     },
     paint: {
@@ -7845,6 +9842,18 @@ function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION) {
   if (objectClass === "DEPCNT") {
     layer.filter = GEOM_FILTERS.line;
   }
+  if (objectClass === "CBLOHD" || objectClass === "PIPOHD") {
+    layer.filter = GEOM_FILTERS.line;
+  }
+  if (objectClass === "SBDARE") {
+    delete layer.filter;
+  }
+  if (objectClass === "MAGVAR") {
+    delete layer.filter;
+  }
+  if (getLabelBehavior(objectClass) === "orientation-cross-band") {
+    delete layer.filter;
+  }
   return layer;
 }
 function getGeomTypesForClass(objectClass, defaultType) {
@@ -7874,6 +9883,105 @@ function getOrderedClasses() {
   return ordered;
 }
 
+// src/atlas/band-priority.ts
+var BAND_PRIORITY_RANGES = {
+  "1": { minzoom: 3 },
+  "2": { minzoom: 5 },
+  "3": { minzoom: 7 },
+  "4": { minzoom: 9 },
+  "5": { minzoom: 11 },
+  "6": { minzoom: 11 }
+};
+var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
+var CHART_BAND_CODES = {
+  Overview: ["1"],
+  General: ["2"],
+  Coastal: ["3"],
+  Approach: ["4"],
+  Harbor: ["5", "6"]
+};
+var CHART_CASCADE_CODES = {
+  Overview: ["1"],
+  General: ["1", "2"],
+  Coastal: ["1", "2", "3"],
+  Approach: ["1", "2", "3", "4"],
+  Harbor: ["1", "2", "3", "4", "5", "6"]
+};
+function bandFilterExpression(codes) {
+  const list = Array.isArray(codes) ? codes : [codes];
+  if (list.length === 1) {
+    return ["==", ["slice", ["get", "_cell_id"], 2, 3], list[0]];
+  }
+  return ["in", ["slice", ["get", "_cell_id"], 2, 3], ["literal", [...list]]];
+}
+function combineWithBandFilter(baseFilter, bandFilter) {
+  if (!baseFilter) return bandFilter;
+  if (baseFilter[0] === "all") {
+    return ["all", ...baseFilter.slice(1), bandFilter];
+  }
+  return ["all", baseFilter, bandFilter];
+}
+var NOT_DOMINATED_FILTER = [
+  "all",
+  ["!", ["has", "_dominated_by_min"]],
+  ["!=", ["get", "_dominated"], true]
+];
+function dominatedByMinFilter(D) {
+  const dInt = parseInt(D, 10);
+  if (D === "6") {
+    return [
+      "any",
+      ["==", ["get", "_dominated_by_min"], dInt],
+      ["==", ["get", "_dominated"], true]
+    ];
+  }
+  return ["==", ["get", "_dominated_by_min"], dInt];
+}
+function withinBboxFilter(bbox) {
+  const [w, s] = bbox.sw;
+  const [e, n] = bbox.ne;
+  return [
+    "within",
+    {
+      type: "Polygon",
+      coordinates: [
+        [
+          [w, s],
+          [e, s],
+          [e, n],
+          [w, n],
+          [w, s]
+        ]
+      ]
+    }
+  ];
+}
+function worldMinusBboxPolygon(bbox) {
+  const [w, s] = bbox.sw;
+  const [e, n] = bbox.ne;
+  return {
+    type: "Polygon",
+    coordinates: [
+      [
+        [-180, -85],
+        [180, -85],
+        [180, 85],
+        [-180, 85],
+        [-180, -85]
+      ],
+      // Inner ring (hole) — winding opposite to outer ring per GeoJSON
+      // spec. MapLibre is permissive but we follow strict winding.
+      [
+        [w, s],
+        [w, n],
+        [e, n],
+        [e, s],
+        [w, s]
+      ]
+    ]
+  };
+}
+
 // src/atlas/style-generator.ts
 var META_LAYERS = /* @__PURE__ */ new Set([
   "DSID",
@@ -7900,28 +10008,251 @@ var PALETTE_NAMES = {
   DUSK: "DUSK",
   NIGHT: "NIGHT"
 };
+var DOMINANCE_EXEMPT_CLASSES = /* @__PURE__ */ new Set([
+  "LNDARE",
+  // Safety-critical nav-aid point classes (S-52 viewing groups 24020,
+  // 27010, 27070, 27080). User-reported: offshore Mass Bay BOYSAW /
+  // BOYLAT etc. disappeared at z >= 12 because the dominance index
+  // tagged the coastal-band feature `_dominated_by_min` for a harbor
+  // cell whose M_COVR centroid-covered the buoy but whose feature data
+  // didn't actually include it — no harbor-band copy ever takes over,
+  // the dominated coastal variant times out at the dominator's
+  // minzoom, and the buoy vanishes. Force these classes to always
+  // render their not-dominated variant regardless of `_dominated_by_min`.
+  // Trade-off: where both coastal AND harbor cells genuinely have the
+  // same buoy, both copies render stacked — visually indistinguishable
+  // from one buoy. Safety wins over the cosmetic dedupe.
+  "BOYLAT",
+  "BOYCAR",
+  "BOYSPP",
+  "BOYISD",
+  "BOYSAW",
+  "BOYINB",
+  "BCNLAT",
+  "BCNCAR",
+  "BCNSPP",
+  "BCNISD",
+  "BCNSAW",
+  "LIGHTS",
+  "LITFLT",
+  "LITVES",
+  "FOGSIG",
+  "RTPBCN",
+  "RDOSTA"
+]);
+function isDominanceExempt(layer) {
+  for (const cls of DOMINANCE_EXEMPT_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return true;
+  }
+  return false;
+}
+function makeBandVariants(layer, B) {
+  const range = BAND_PRIORITY_RANGES[B];
+  const classMinzoom = layer.minzoom ?? 0;
+  const minzoom = Math.max(classMinzoom, range.minzoom);
+  const variants = [];
+  if (isDominanceExempt(layer)) {
+    const exempt = {
+      ...layer,
+      id: `${layer.id}-band${B}`,
+      filter: combineWithBandFilter(layer.filter, bandFilterExpression(B)),
+      minzoom
+    };
+    delete exempt.maxzoom;
+    return [exempt];
+  }
+  const notDom = {
+    ...layer,
+    id: `${layer.id}-band${B}`,
+    filter: combineWithBandFilter(
+      layer.filter,
+      ["all", bandFilterExpression(B), NOT_DOMINATED_FILTER]
+    ),
+    minzoom
+  };
+  delete notDom.maxzoom;
+  variants.push(notDom);
+  const bInt = parseInt(B, 10);
+  for (const D of BAND_DRAW_ORDER) {
+    const dInt = parseInt(D, 10);
+    if (dInt <= bInt) continue;
+    const dRange = BAND_PRIORITY_RANGES[D];
+    if (dRange.minzoom <= minzoom) continue;
+    const domVariant = {
+      ...layer,
+      id: `${layer.id}-band${B}-domBy${D}`,
+      filter: combineWithBandFilter(
+        layer.filter,
+        ["all", bandFilterExpression(B), dominatedByMinFilter(D)]
+      ),
+      minzoom,
+      maxzoom: dRange.minzoom
+    };
+    variants.push(domVariant);
+  }
+  return variants;
+}
+function fanOrientationLabelByDominator(label) {
+  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({
+      ...label,
+      id: `${label.id}-domBy${D}`,
+      filter: combineWithBandFilter(label.filter, dominatedByMinFilter(D)),
+      maxzoom: BAND_PRIORITY_RANGES[D].minzoom
+    });
+  }
+  return variants;
+}
+function applyHarborLabelCollisionDiscipline(variant, objectClass, code) {
+  if (!HIGH_DENSITY_NAV_AIDS.has(objectClass)) return variant;
+  if (code !== "5" && code !== "6") return variant;
+  const oldLayout = variant.layout ?? {};
+  return {
+    ...variant,
+    layout: {
+      ...oldLayout,
+      "text-allow-overlap": false,
+      "text-optional": true,
+      // Wider padding so even allowed labels space visually instead of
+      // touching. 6 is enough to read individual buoy designations clearly
+      // at z12-14 over Boston Harbor.
+      "text-padding": 6,
+      // Deterministic collision arbitration: prefer features with
+      // longer-range nav-aid significance (VALNMR — visible nautical
+      // miles), then shorter OBJNAM (tighter labels win), then FIDN as
+      // tiebreaker. Lower sort-key wins in MapLibre.
+      "symbol-sort-key": [
+        "case",
+        ["has", "VALNMR"],
+        ["-", 0, ["coalesce", ["to-number", ["get", "VALNMR"]], 0]],
+        ["length", ["coalesce", ["get", "OBJNAM"], ""]]
+      ]
+    }
+  };
+}
+function chartModeFilterForBand(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
+  let filter = combineWithBandFilter(layer.filter, bandFilterExpression(B));
+  if (!isDominanceExempt(layer)) {
+    for (const D of higherCascadeBands) {
+      filter = combineWithBandFilter(filter, ["!", dominatedByMinFilter(D)]);
+    }
+  }
+  if (lockedBounds && isRequestedBand) {
+    filter = combineWithBandFilter(filter, withinBboxFilter(lockedBounds));
+  }
+  return filter;
+}
 function generateStyle(palette = "DAY", opts = {}) {
   const sources = buildSources(opts);
   const sourceId = opts.region ?? DEFAULT_REGION;
   const orderedClasses = getOrderedClasses();
   const layers = [];
   const labelLayers = [];
+  const chartCascade = opts.chartMode ? CHART_CASCADE_CODES[opts.chartMode.band] : null;
+  const chartRequestedCodes = opts.chartMode ? CHART_BAND_CODES[opts.chartMode.band] : null;
+  const lockedBounds = opts.chartMode?.lockedBounds;
+  const bundles = [];
   for (const objectClass of orderedClasses) {
     if (META_LAYERS.has(objectClass)) continue;
-    const featureLayers = buildLayersForClass(objectClass, palette, sourceId);
-    layers.push(...featureLayers);
-    const label = buildLabelLayer2(objectClass, palette, sourceId);
-    if (label) labelLayers.push(label);
+    bundles.push({
+      objectClass,
+      featureLayers: buildLayersForClass(objectClass, palette, sourceId),
+      label: buildLabelLayer2(objectClass, palette, sourceId, opts.depthUnits ?? "meters", {
+        safetyContour: opts.safetyContour,
+        twoShadeSoundings: opts.twoShadeSoundings,
+        soundingFontWeight: opts.soundingFontWeight
+      })
+    });
+  }
+  if (chartCascade && chartRequestedCodes) {
+    const requestedSet = new Set(chartRequestedCodes);
+    for (let i = 0; i < chartCascade.length; i++) {
+      const B = chartCascade[i];
+      const higher = chartCascade.slice(i + 1);
+      const isRequested = requestedSet.has(B);
+      for (const { featureLayers } of bundles) {
+        for (const base of featureLayers) {
+          const filter = chartModeFilterForBand(
+            base,
+            B,
+            higher,
+            lockedBounds,
+            isRequested
+          );
+          const variant = {
+            ...base,
+            id: `${base.id}-band${B}`,
+            filter
+          };
+          delete variant.maxzoom;
+          layers.push(variant);
+        }
+      }
+    }
+    for (let i = 0; i < chartCascade.length; i++) {
+      const B = chartCascade[i];
+      const higher = chartCascade.slice(i + 1);
+      const isRequested = requestedSet.has(B);
+      for (const { label } of bundles) {
+        if (!label) continue;
+        const filter = chartModeFilterForBand(
+          label,
+          B,
+          higher,
+          lockedBounds,
+          isRequested
+        );
+        const variant = {
+          ...label,
+          id: `${label.id}-band${B}`,
+          filter
+        };
+        delete variant.maxzoom;
+        labelLayers.push(variant);
+      }
+    }
+    layers.push(...labelLayers);
+  } else {
+    for (const code of BAND_DRAW_ORDER) {
+      for (const { featureLayers } of bundles) {
+        for (const base of featureLayers) {
+          layers.push(...makeBandVariants(base, code));
+        }
+      }
+    }
+    for (const { objectClass, label } of bundles) {
+      if (!label) continue;
+      if (getLabelBehavior(objectClass) === "orientation-cross-band") {
+        labelLayers.push(...fanOrientationLabelByDominator(label));
+      }
+    }
+    for (const code of BAND_DRAW_ORDER) {
+      for (const { objectClass, label } of bundles) {
+        if (!label) continue;
+        if (getLabelBehavior(objectClass) === "orientation-cross-band") continue;
+        for (const variant of makeBandVariants(label, code)) {
+          labelLayers.push(applyHarborLabelCollisionDiscipline(variant, objectClass, code));
+        }
+      }
+    }
+    layers.push(...labelLayers);
   }
-  layers.push(...labelLayers);
   return {
     version: 8,
-    name: `CHRT S-52 ${PALETTE_NAMES[palette]}`,
+    name: `CHRT S-52 ${PALETTE_NAMES[palette]}${opts.chartMode ? ` \u2014 chart:${opts.chartMode.band}` : ""}`,
     metadata: {
       "chrt:s52-edition": "4.0",
       "chrt:color-table": palette,
       "chrt:generated-at": (/* @__PURE__ */ new Date()).toISOString(),
       "chrt:layer-count": layers.length,
+      "chrt:render-mode": opts.chartMode ? `chart:${opts.chartMode.band}` : "continuous",
       "chrt:description": "IHO S-52 portrayal rules for Electronic Navigational Charts (ENCs). Generated from the CHRT atlas engine."
     },
     sources,
@@ -7930,7 +10261,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     // we're decommissioning Mapbox MTS. When the page is repurposed to
     // generate a MapLibre-native style for self-hosted consumers, wire the
     // `sprite` field back in against a CHRT-hosted sprite route (see
-    // `.lovable/` follow-ups). Runtime maps load S-52 symbols via
+    // `.chrt/` follow-ups). Runtime maps load S-52 symbols via
     // `loadS52SymbolImages()` — no sprite fetch happens at runtime.
     glyphs: "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
     layers
@@ -8102,14 +10433,19 @@ var Chrt = class {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  BAND_DRAW_ORDER,
+  BAND_PRIORITY_RANGES,
   BUILD_MAXZOOM,
   BUILD_MINZOOM,
+  CHART_BAND_CODES,
+  CHART_CASCADE_CODES,
   CHART_SECTIONS,
   Chrt,
   ChrtError,
   DEFAULT_REGION,
   DEFAULT_TILE_BASE_URL,
   LABELED_LAYERS,
+  LABEL_BEHAVIOR,
   NAUTICAL_SYMBOLS,
   OfflineError,
   OfflineStyleError,
@@ -8126,10 +10462,12 @@ var Chrt = class {
   SYMBOL_GROUPS,
   SYMBOL_MAP,
   applyColorTheme,
+  bandFilterExpression,
   buildLabelLayer,
   buildLayersForClass,
   buildOfflineStyle,
   buildSources,
+  combineWithBandFilter,
   daymarkColor,
   decimateFeatures,
   depareColor,
@@ -8146,6 +10484,7 @@ var Chrt = class {
   getDrawPriority,
   getGridSizeForZoom,
   getIconExpression,
+  getLabelBehavior,
   getLabelConfig,
   getLookupEntry,
   getMaxCellsForZoom,
@@ -8171,6 +10510,8 @@ var Chrt = class {
   preprocessWaterBodies,
   resolveColor,
   resolveStyle,
-  scaminToMinZoom
+  scaminToMinZoom,
+  withinBboxFilter,
+  worldMinusBboxPolygon
 });
 //# sourceMappingURL=index.cjs.map