@chrtco/sdk 0.10.1 → 0.10.3

package/dist/index.cjs

@@ -40,6 +40,7 @@ __export(index_exports, {
   CHRT_ICON_EXPRESSIONS: () => CHRT_ICON_EXPRESSIONS,
   CHRT_ICON_PREFIX: () => CHRT_ICON_PREFIX,
   CHRT_SDF_GLYPHS: () => CHRT_SDF_GLYPHS,
+  CHRT_STYLE_MODES: () => CHRT_STYLE_MODES,
   Chrt: () => Chrt,
   ChrtError: () => ChrtError,
   DEFAULT_CLICK_TOLERANCE: () => DEFAULT_CLICK_TOLERANCE,
@@ -169,6 +170,7 @@ __export(index_exports, {
   lightColor: () => lightColor,
   lightFillExpression: () => lightFillExpression,
   lightsIconExpression: () => lightsIconExpression,
+  normalizeStyleMode: () => normalizeStyleMode,
   normalizeTheme: () => normalizeTheme,
   paginate: () => paginate,
   parseListCodes: () => parseListCodes,
@@ -189,6 +191,7 @@ __export(index_exports, {
   sanitizeCustomStyleConfig: () => sanitizeCustomStyleConfig,
   scaleSizeValue: () => scaleSizeValue,
   scaminToMinZoom: () => scaminToMinZoom,
+  styleModeBand: () => styleModeBand,
   withinBboxFilter: () => withinBboxFilter,
   worldMinusBboxPolygon: () => worldMinusBboxPolygon
 });
@@ -536,10 +539,11 @@ var TilesEndpoint = class {
   }
   region;
   tileBaseUrl;
-  styleEndpoint(theme, symbols) {
+  styleEndpoint(opts) {
     const params = new URLSearchParams();
-    if (theme) params.set("theme", theme);
-    if (symbols) params.set("symbols", symbols);
+    if (opts.theme) params.set("theme", opts.theme);
+    if (opts.symbols) params.set("symbols", opts.symbols);
+    if (opts.mode) params.set("mode", opts.mode);
     const query2 = params.size > 0 ? `?${params.toString()}` : "";
     return `${this.tileBaseUrl}/v1/styles/${this.region}/style.json${query2}`;
   }
@@ -565,7 +569,7 @@ var TilesEndpoint = class {
    */
   async styleUrl(opts = {}) {
     await this.tileAuth.getToken(this.region);
-    return this.styleEndpoint(opts.theme, opts.symbols);
+    return this.styleEndpoint(opts);
   }
   /**
    * Fetch the served S-52 style as a MapLibre style object (see
@@ -579,7 +583,7 @@ var TilesEndpoint = class {
    */
   async fetchStyle(opts = {}) {
     const token = await this.tileAuth.getToken(this.region);
-    const res = await fetch(this.styleEndpoint(opts.theme, opts.symbols), {
+    const res = await fetch(this.styleEndpoint(opts), {
       headers: { authorization: `Bearer ${token.token}` },
       signal: opts.signal
     });
@@ -1154,7 +1158,9 @@ var OfflineEndpoint = class {
     const token = await this.requireToken([region]);
     const palette = opts.palette ?? "DAY";
     const protocol = opts.protocol ?? "mbtiles";
-    const path = `/offline/styles/${encodeURIComponent(region)}?palette=${palette}&protocol=${protocol}`;
+    const symbolsParam = opts.symbols ? `&symbols=${encodeURIComponent(opts.symbols)}` : "";
+    const modeParam = opts.mode ? `&mode=${encodeURIComponent(opts.mode)}` : "";
+    const path = `/offline/styles/${encodeURIComponent(region)}?palette=${palette}&protocol=${protocol}${symbolsParam}${modeParam}`;
     const res = await this.http.getJsonWithBearer(
       path,
       token.token
@@ -1499,157 +1505,519 @@ function dirname(p) {
   return p.slice(0, k);
 }
 
-// src/interact/decode.ts
-var LITCHR_TABLE = {
-  1: { name: "Fixed", abbr: "F" },
-  2: { name: "Flashing", abbr: "Fl" },
-  3: { name: "Long Flashing", abbr: "LFl" },
-  4: { name: "Occulting", abbr: "Oc" },
-  5: { name: "Isophase", abbr: "Iso" },
-  6: { name: "Short Flashing", abbr: "S.Fl" },
-  7: { name: "Short Long Flashing", abbr: "S.LFl" },
-  8: { name: "Alternating Occulting", abbr: "Al.Oc" },
-  9: { name: "Alternating Long Flashing", abbr: "Al.LFl" },
-  10: { name: "Alternating Flashing", abbr: "Al.Fl" },
-  11: { name: "Alternating Group", abbr: "Al.Gp" },
-  12: { name: "Morse", abbr: "Mo" },
-  13: { name: "Quick", abbr: "Q" },
-  14: { name: "Very Quick", abbr: "VQ" },
-  15: { name: "Ultra Quick", abbr: "UQ" },
-  16: { name: "Alternating", abbr: "Al" },
-  17: { name: "Alternating Fixed/Flash", abbr: "Al.F.Fl" },
-  25: { name: "Quick + Long Flash", abbr: "Q+LFl" },
-  26: { name: "Very Quick + Long Flash", abbr: "VQ+LFl" },
-  27: { name: "Ultra Quick + Long Flash", abbr: "UQ+LFl" },
-  28: { name: "Alternating", abbr: "Al" },
-  29: { name: "Fixed + Long Flash", abbr: "F.LFl" }
+// src/s57/codelists.generated.ts
+var BOYSHP_CODES = {
+  1: { code: 1, name: "Conical (nun, ogival)" },
+  2: { code: 2, name: "Can (cylindrical)" },
+  3: { code: 3, name: "Spherical" },
+  4: { code: 4, name: "Pillar" },
+  5: { code: 5, name: "Spar (spindle)" },
+  6: { code: 6, name: "Barrel (tun)" },
+  7: { code: 7, name: "Super-buoy" },
+  8: { code: 8, name: "Ice buoy" }
+};
+var CATACH_CODES = {
+  1: { code: 1, name: "Unrestricted anchorage" },
+  2: { code: 2, name: "Deep water anchorage" },
+  3: { code: 3, name: "Tanker anchorage" },
+  4: { code: 4, name: "Explosives anchorage" },
+  5: { code: 5, name: "Quarantine anchorage" },
+  6: { code: 6, name: "Sea-plane anchorage" },
+  7: { code: 7, name: "Small craft anchorage" },
+  8: { code: 8, name: "Small craft mooring area" },
+  9: { code: 9, name: "Anchorage for periods up to 24 hours" }
+};
+var CATCAM_CODES = {
+  1: { code: 1, name: "North cardinal mark" },
+  2: { code: 2, name: "East cardinal mark" },
+  3: { code: 3, name: "South cardinal mark" },
+  4: { code: 4, name: "West cardinal mark" }
+};
+var CATCBL_CODES = {
+  1: { code: 1, name: "Power line" },
+  2: { code: 2, name: "Submarine cable", supplement: true, unverified: true },
+  3: { code: 3, name: "Transmission line" },
+  4: { code: 4, name: "Telephone" },
+  5: { code: 5, name: "Telegraph" },
+  6: { code: 6, name: "Mooring cable/chain" }
+};
+var CATCOA_CODES = {
+  1: { code: 1, name: "Steep coast" },
+  2: { code: 2, name: "Flat coast" },
+  3: { code: 3, name: "Sandy shore" },
+  4: { code: 4, name: "Stony shore" },
+  5: { code: 5, name: "Shingly shore" },
+  6: { code: 6, name: "Glacier (seaward end)" },
+  7: { code: 7, name: "Mangrove" },
+  8: { code: 8, name: "Marshy shore" },
+  9: { code: 9, name: "Coral reef" },
+  10: { code: 10, name: "Ice coast" },
+  11: { code: 11, name: "Embankment", supplement: true, unverified: true }
+};
+var CATCRN_CODES = {
+  2: { code: 2, name: "Container crane/gantry" },
+  3: { code: 3, name: "Sheerlegs" },
+  4: { code: 4, name: "Travelling crane" },
+  5: { code: 5, name: "A-frame" }
+};
+var CATDPG_CODES = {
+  1: { code: 1, name: "General dumping ground", supplement: true, unverified: true },
+  2: { code: 2, name: "Chemical waste dumping ground" },
+  3: { code: 3, name: "Nuclear waste dumping ground" },
+  4: { code: 4, name: "Explosives dumping ground" },
+  5: { code: 5, name: "Spoil ground" },
+  6: { code: 6, name: "Vessel dumping ground" }
+};
+var CATFOG_CODES = {
+  1: { code: 1, name: "Explosive", abbr: "EXPLOS" },
+  2: { code: 2, name: "Diaphone", abbr: "DIA" },
+  3: { code: 3, name: "Siren", abbr: "SIREN" },
+  4: { code: 4, name: "Nautophone", abbr: "NAUTO" },
+  5: { code: 5, name: "Reed", abbr: "REED" },
+  6: { code: 6, name: "Tyfon", abbr: "TYFON" },
+  7: { code: 7, name: "Bell", abbr: "BELL" },
+  8: { code: 8, name: "Whistle", abbr: "WHIS" },
+  9: { code: 9, name: "Gong", abbr: "GONG" },
+  10: { code: 10, name: "Horn", abbr: "HORN" }
+};
+var CATHAF_CODES = {
+  1: { code: 1, name: "RoRo-terminal" },
+  3: { code: 3, name: "Ferry terminal" },
+  4: { code: 4, name: "Fishing harbour" },
+  5: { code: 5, name: "Yacht harbour/marina" },
+  6: { code: 6, name: "Naval base" },
+  7: { code: 7, name: "Tanker terminal" },
+  8: { code: 8, name: "Passenger terminal" },
+  9: { code: 9, name: "Shipyard" },
+  10: { code: 10, name: "Container terminal" },
+  11: { code: 11, name: "Bulk terminal" },
+  12: { code: 12, name: "Synchrolift", supplement: true, unverified: true },
+  13: { code: 13, name: "Straddle carrier", supplement: true, unverified: true },
+  14: { code: 14, name: "Port terminal", supplement: true, unverified: true }
+};
+var CATLAM_CODES = {
+  1: { code: 1, name: "Port-hand lateral mark" },
+  2: { code: 2, name: "Starboard-hand lateral mark" },
+  3: { code: 3, name: "Preferred channel to starboard lateral mark" },
+  4: { code: 4, name: "Preferred channel to port lateral mark" }
+};
+var CATLIT_CODES = {
+  1: { code: 1, name: "Directional function" },
+  4: { code: 4, name: "Leading light" },
+  5: { code: 5, name: "Aero light" },
+  6: { code: 6, name: "Air obstruction light" },
+  7: { code: 7, name: "Fog detector light" },
+  8: { code: 8, name: "Flood light" },
+  9: { code: 9, name: "Strip light" },
+  10: { code: 10, name: "Subsidiary light" },
+  11: { code: 11, name: "Spotlight" },
+  12: { code: 12, name: "Front" },
+  13: { code: 13, name: "Rear" },
+  14: { code: 14, name: "Lower" },
+  15: { code: 15, name: "Upper" },
+  16: { code: 16, name: "Moir\xE9 effect" },
+  17: { code: 17, name: "Emergency" },
+  18: { code: 18, name: "Bearing light" },
+  19: { code: 19, name: "Horizontally disposed" },
+  20: { code: 20, name: "Vertically disposed" }
+};
+var CATLMK_CODES = {
+  1: { code: 1, name: "Cairn" },
+  2: { code: 2, name: "Cemetery" },
+  3: { code: 3, name: "Chimney" },
+  4: { code: 4, name: "Dish aerial" },
+  5: { code: 5, name: "Flagstaff (flagpole)" },
+  6: { code: 6, name: "Flare stack" },
+  7: { code: 7, name: "Mast" },
+  8: { code: 8, name: "Windsock" },
+  9: { code: 9, name: "Monument" },
+  10: { code: 10, name: "Column (pillar)" },
+  11: { code: 11, name: "Memorial plaque" },
+  12: { code: 12, name: "Obelisk" },
+  13: { code: 13, name: "Statue" },
+  14: { code: 14, name: "Cross" },
+  15: { code: 15, name: "Dome" },
+  16: { code: 16, name: "Radar scanner" },
+  17: { code: 17, name: "Tower" },
+  18: { code: 18, name: "Windmill" },
+  19: { code: 19, name: "Windmotor" },
+  20: { code: 20, name: "Spire/minaret" }
+};
+var CATMFA_CODES = {
+  1: { code: 1, name: "Crustaceans" },
+  2: { code: 2, name: "Oyster/mussels" },
+  3: { code: 3, name: "Fish" },
+  4: { code: 4, name: "Seaweed" },
+  5: { code: 5, name: "Seaweed / kelp farm", supplement: true, unverified: true }
+};
+var CATOBS_CODES = {
+  1: { code: 1, name: "Snag / stump" },
+  2: { code: 2, name: "Wellhead" },
+  3: { code: 3, name: "Diffuser" },
+  4: { code: 4, name: "Crib" },
+  5: { code: 5, name: "Fish haven" },
+  6: { code: 6, name: "Foul area" },
+  7: { code: 7, name: "Foul ground" },
+  8: { code: 8, name: "Ice boom" },
+  9: { code: 9, name: "Ground tackle" },
+  10: { code: 10, name: "Boom", supplement: true, unverified: true },
+  11: { code: 11, name: "Platform", supplement: true, unverified: true }
+};
+var CATPIP_CODES = {
+  1: { code: 1, name: "Pipeline in general", supplement: true, unverified: true },
+  2: { code: 2, name: "Outfall pipe" },
+  3: { code: 3, name: "Intake pipe" },
+  4: { code: 4, name: "Sewer" },
+  5: { code: 5, name: "Bubbler system" },
+  6: { code: 6, name: "Supply pipe" }
+};
+var CATREA_CODES = {
+  1: { code: 1, name: "Offshore safety zone" },
+  2: { code: 2, name: "Anchoring prohibition", supplement: true, unverified: true },
+  3: { code: 3, name: "Fishing prohibition", supplement: true, unverified: true },
+  4: { code: 4, name: "Nature reserve" },
+  5: { code: 5, name: "Bird sanctuary" },
+  6: { code: 6, name: "Game preserve" },
+  7: { code: 7, name: "Seal sanctuary" },
+  8: { code: 8, name: "Degaussing range" },
+  9: { code: 9, name: "Military area" },
+  10: { code: 10, name: "Historic wreck area" },
+  12: { code: 12, name: "Navigational aid safety zone" },
+  14: { code: 14, name: "Minefield" },
+  18: { code: 18, name: "Swimming area" },
+  19: { code: 19, name: "Waiting area" },
+  20: { code: 20, name: "Research area" },
+  21: { code: 21, name: "Dredging area" },
+  22: { code: 22, name: "Fish sanctuary" },
+  23: { code: 23, name: "Ecological reserve" },
+  24: { code: 24, name: "No wake area" },
+  25: { code: 25, name: "Swinging area" },
+  26: { code: 26, name: "No fishing area", supplement: true, unverified: true },
+  27: { code: 27, name: "Speed restriction zone", supplement: true, unverified: true },
+  28: { code: 28, name: "To be avoided area", supplement: true, unverified: true }
 };
-var COLOUR_TABLE = {
-  1: { name: "White", abbr: "W", hex: "#ffffff" },
-  2: { name: "Black", abbr: "B", hex: "#333333" },
-  3: { name: "Red", abbr: "R", hex: "#ef4444" },
-  4: { name: "Green", abbr: "G", hex: "#22c55e" },
-  5: { name: "Blue", abbr: "Bu", hex: "#3b82f6" },
-  6: { name: "Yellow", abbr: "Y", hex: "#eab308" },
-  7: { name: "Grey", abbr: "Gr", hex: "#9ca3af" },
-  8: { name: "Brown", abbr: "Bn", hex: "#92400e" },
-  9: { name: "Amber", abbr: "Am", hex: "#f59e0b" },
-  10: { name: "Violet", abbr: "Vi", hex: "#8b5cf6" },
-  11: { name: "Orange", abbr: "Or", hex: "#f97316" },
-  12: { name: "Magenta", abbr: "Mg", hex: "#d946ef" },
-  13: { name: "Pink", abbr: "Pk", hex: "#f472b6" }
+var CATSCF_CODES = {
+  1: { code: 1, name: "Visitors' berth" },
+  2: { code: 2, name: "Nautical club" },
+  3: { code: 3, name: "Boat hoist" },
+  4: { code: 4, name: "Sailmaker" },
+  5: { code: 5, name: "Boatyard" },
+  6: { code: 6, name: "Public inn" },
+  7: { code: 7, name: "Restaurant" },
+  8: { code: 8, name: "Chandler" },
+  9: { code: 9, name: "Provisions" },
+  10: { code: 10, name: "Doctor" },
+  11: { code: 11, name: "Pharmacy" },
+  12: { code: 12, name: "Water tap" },
+  13: { code: 13, name: "Fuel station" },
+  14: { code: 14, name: "Electricity" },
+  15: { code: 15, name: "Bottle gas" },
+  16: { code: 16, name: "Showers" },
+  17: { code: 17, name: "Launderette" },
+  18: { code: 18, name: "Public toilets" },
+  19: { code: 19, name: "Post box" },
+  20: { code: 20, name: "Public telephone" },
+  21: { code: 21, name: "Refuse bin" },
+  22: { code: 22, name: "Car park" },
+  23: { code: 23, name: "Parking for boats and trailers" },
+  24: { code: 24, name: "Caravan site" },
+  25: { code: 25, name: "Camping site" },
+  26: { code: 26, name: "Sewerage pump-out station" },
+  27: { code: 27, name: "Emergency telephone" },
+  28: { code: 28, name: "Landing / launching place for boats" },
+  29: { code: 29, name: "Visitors mooring" },
+  30: { code: 30, name: "Scrubbing berth" },
+  31: { code: 31, name: "Picnic area" }
 };
-var BOYSHP_TABLE = {
-  1: "Conical (nun)",
-  2: "Can (cylindrical)",
-  3: "Spherical",
-  4: "Pillar",
-  5: "Spar",
-  6: "Barrel",
-  7: "Super buoy",
-  8: "Ice buoy"
+var CATWRK_CODES = {
+  1: { code: 1, name: "Non-dangerous wreck" },
+  2: { code: 2, name: "Dangerous wreck" },
+  3: { code: 3, name: "Distributed remains of wreck" },
+  4: { code: 4, name: "Wreck showing mast/masts" },
+  5: { code: 5, name: "Wreck showing any portion of hull or superstructure" }
 };
-var CATLAM_TABLE = {
-  1: "Port",
-  2: "Starboard",
-  3: "Preferred channel to starboard",
-  4: "Preferred channel to port"
+var COLOUR_CODES = {
+  1: { code: 1, name: "White", abbr: "W" },
+  2: { code: 2, name: "Black", abbr: "B" },
+  3: { code: 3, name: "Red", abbr: "R" },
+  4: { code: 4, name: "Green", abbr: "G" },
+  5: { code: 5, name: "Blue", abbr: "Bu" },
+  6: { code: 6, name: "Yellow", abbr: "Y" },
+  7: { code: 7, name: "Grey", abbr: "Gr" },
+  8: { code: 8, name: "Brown", abbr: "Bn" },
+  9: { code: 9, name: "Amber", abbr: "Am" },
+  10: { code: 10, name: "Violet", abbr: "Vi" },
+  11: { code: 11, name: "Orange", abbr: "Or" },
+  12: { code: 12, name: "Magenta", abbr: "Mg" },
+  13: { code: 13, name: "Pink", abbr: "Pk" }
 };
-var CATCAM_TABLE = {
-  1: "North cardinal",
-  2: "East cardinal",
-  3: "South cardinal",
-  4: "West cardinal"
+var CONDTN_CODES = {
+  1: { code: 1, name: "Under construction" },
+  2: { code: 2, name: "Ruined" },
+  3: { code: 3, name: "Under reclamation" },
+  4: { code: 4, name: "Wingless" },
+  5: { code: 5, name: "Planned construction" }
 };
-var CATLMK_TABLE = {
-  1: "Cairn",
-  2: "Cemetery",
-  3: "Chimney",
-  4: "Dish aerial",
-  5: "Flagstaff",
-  6: "Flare stack",
-  7: "Mast",
-  8: "Windsock",
-  9: "Monument",
-  10: "Column / pillar",
-  11: "Memorial plaque",
-  12: "Obelisk",
-  13: "Statue",
-  14: "Cross",
-  15: "Dome",
-  16: "Radar scanner",
-  17: "Tower",
-  18: "Windmill",
-  19: "Wind turbine",
-  20: "Spire"
+var LITCHR_CODES = {
+  1: { code: 1, name: "Fixed", abbr: "F" },
+  2: { code: 2, name: "Flashing", abbr: "Fl" },
+  3: { code: 3, name: "Long-flashing", abbr: "LFl" },
+  4: { code: 4, name: "Quick-flashing", abbr: "Q" },
+  5: { code: 5, name: "Very quick-flashing", abbr: "VQ" },
+  6: { code: 6, name: "Ultra quick-flashing", abbr: "UQ" },
+  7: { code: 7, name: "Isophase", abbr: "Iso" },
+  8: { code: 8, name: "Occulting", abbr: "Oc" },
+  9: { code: 9, name: "Interrupted quick-flashing", abbr: "IQ" },
+  10: { code: 10, name: "Interrupted very quick-flashing", abbr: "IVQ" },
+  11: { code: 11, name: "Interrupted ultra quick-flashing", abbr: "IUQ" },
+  12: { code: 12, name: "Morse", abbr: "Mo" },
+  13: { code: 13, name: "Fixed / flash", abbr: "FFl" },
+  14: { code: 14, name: "Flash / long-flash", abbr: "Fl+LFl" },
+  15: { code: 15, name: "Occulting / flash", abbr: "Oc+Fl" },
+  16: { code: 16, name: "Fixed / long-flash", abbr: "FLFl" },
+  17: { code: 17, name: "Occulting alternating", abbr: "Al.Oc" },
+  18: { code: 18, name: "Long-flash alternating", abbr: "Al.LFl" },
+  19: { code: 19, name: "Flash alternating", abbr: "Al.Fl" },
+  20: { code: 20, name: "Group alternating", abbr: "Al.Gr" },
+  25: { code: 25, name: "Quick-flash plus long-flash", abbr: "Q+LFl" },
+  26: { code: 26, name: "Very quick-flash plus long-flash", abbr: "VQ+LFl" },
+  27: { code: 27, name: "Ultra quick-flash plus long-flash", abbr: "UQ+LFl" },
+  28: { code: 28, name: "Alternating", abbr: "Al" },
+  29: { code: 29, name: "Fixed and alternating flashing", abbr: "F.Al.Fl" }
 };
-var CATFOG_TABLE = {
-  1: "Explosive",
-  2: "Diaphone",
-  3: "Siren",
-  4: "Nautophone",
-  5: "Bell",
-  6: "Whistle",
-  7: "Reed",
-  8: "Gong",
-  9: "Horn"
+var MARSYS_CODES = {
+  1: { code: 1, name: "IALA A" },
+  2: { code: 2, name: "IALA B" },
+  9: { code: 9, name: "No system" },
+  10: { code: 10, name: "Other system" }
 };
-var CATFOG_ABBR_TABLE = {
-  1: "EXPLOS",
-  2: "DIA",
-  3: "SIREN",
-  4: "NAUTO",
-  5: "BELL",
-  6: "WHIS",
-  7: "REED",
-  8: "GONG",
-  9: "HORN"
+var NATSUR_CODES = {
+  1: { code: 1, name: "Mud" },
+  2: { code: 2, name: "Clay" },
+  3: { code: 3, name: "Silt" },
+  4: { code: 4, name: "Sand" },
+  5: { code: 5, name: "Stone" },
+  6: { code: 6, name: "Gravel" },
+  7: { code: 7, name: "Pebbles" },
+  8: { code: 8, name: "Cobbles" },
+  9: { code: 9, name: "Rock" },
+  11: { code: 11, name: "Lava" },
+  14: { code: 14, name: "Coral" },
+  17: { code: 17, name: "Shells" },
+  18: { code: 18, name: "Boulder" }
 };
-var TOPSHP_TABLE = {
-  1: "Cone, point up",
-  2: "Cone, point down",
-  3: "Sphere",
-  4: "2 spheres",
-  5: "Cylinder",
-  6: "Board",
-  7: "X-shape",
-  8: "Upright cross",
-  9: "Cube, point up",
-  10: "2 cones, point to point",
-  11: "2 cones, base to base",
-  12: "Rhombus",
-  13: "2 cones, up",
-  14: "2 cones, down",
-  15: "Besom, point up",
-  16: "Besom, point down",
-  17: "Flag",
-  18: "Sphere over rhombus",
-  19: "Square",
-  33: "T-shape"
+var QUASOU_CODES = {
+  1: { code: 1, name: "Depth known" },
+  2: { code: 2, name: "Depth unknown" },
+  3: { code: 3, name: "Doubtful sounding" },
+  4: { code: 4, name: "Unreliable sounding" },
+  5: { code: 5, name: "No bottom found at value shown" },
+  6: { code: 6, name: "Least depth known" },
+  7: { code: 7, name: "Least depth unknown, safe clearance at value shown" },
+  8: { code: 8, name: "Value reported (not surveyed)" },
+  9: { code: 9, name: "Value reported (not confirmed)" },
+  10: { code: 10, name: "Maintained depth" },
+  11: { code: 11, name: "Not regularly maintained" }
 };
-var STATUS_TABLE = {
-  1: "Permanent",
-  2: "Occasional",
-  3: "Recommended",
-  4: "Not in use",
-  5: "Periodic/intermittent",
-  6: "Reserved",
-  7: "Temporary",
-  8: "Private",
-  9: "Mandatory",
-  11: "Extinguished",
-  12: "Illuminated",
-  13: "Historic",
-  14: "Public",
-  15: "Synchronized",
-  16: "Watched",
-  17: "Un-watched",
-  18: "Existence doubtful"
+var RESTRN_CODES = {
+  1: { code: 1, name: "Anchoring prohibited" },
+  2: { code: 2, name: "Anchoring restricted" },
+  3: { code: 3, name: "Fishing prohibited" },
+  4: { code: 4, name: "Fishing restricted" },
+  5: { code: 5, name: "Trawling prohibited" },
+  6: { code: 6, name: "Trawling restricted" },
+  7: { code: 7, name: "Entry prohibited" },
+  8: { code: 8, name: "Entry restricted" },
+  9: { code: 9, name: "Dredging prohibited" },
+  10: { code: 10, name: "Dredging restricted" },
+  11: { code: 11, name: "Diving prohibited" },
+  12: { code: 12, name: "Diving restricted" },
+  13: { code: 13, name: "No wake" },
+  14: { code: 14, name: "Area to be avoided" },
+  15: { code: 15, name: "Construction prohibited" },
+  16: { code: 16, name: "Discharging prohibited", supplement: true, unverified: true },
+  17: { code: 17, name: "Discharging restricted", supplement: true, unverified: true },
+  18: { code: 18, name: "Industrial prohibited", supplement: true, unverified: true },
+  19: { code: 19, name: "Metallic hull vessels prohibited", supplement: true, unverified: true },
+  20: { code: 20, name: "Navigating prohibited", supplement: true, unverified: true },
+  21: { code: 21, name: "Speed restricted", supplement: true, unverified: true },
+  24: { code: 24, name: "Stopping prohibited", supplement: true, unverified: true },
+  25: { code: 25, name: "Landing prohibited", supplement: true, unverified: true }
 };
-var MARSYS_TABLE = {
-  1: "IALA-A",
-  2: "IALA-B"
+var STATUS_CODES = {
+  1: { code: 1, name: "Permanent" },
+  2: { code: 2, name: "Occasional" },
+  3: { code: 3, name: "Recommended" },
+  4: { code: 4, name: "Disused" },
+  5: { code: 5, name: "Periodically/intermittent" },
+  6: { code: 6, name: "Reserved" },
+  7: { code: 7, name: "Temporary" },
+  8: { code: 8, name: "Private" },
+  9: { code: 9, name: "Mandatory" },
+  11: { code: 11, name: "Extinguished" },
+  12: { code: 12, name: "Illuminated" },
+  13: { code: 13, name: "Historic" },
+  14: { code: 14, name: "Public" },
+  15: { code: 15, name: "Synchronized" },
+  16: { code: 16, name: "Watched" },
+  17: { code: 17, name: "Un-watched" },
+  18: { code: 18, name: "Existence doubtful" }
 };
+var TOPSHP_CODES = {
+  1: { code: 1, name: "Cone, point up" },
+  2: { code: 2, name: "Cone, point down" },
+  3: { code: 3, name: "Sphere" },
+  4: { code: 4, name: "2 sphere" },
+  5: { code: 5, name: "Cylinder (can)" },
+  6: { code: 6, name: "Board" },
+  7: { code: 7, name: "X-shape (St. Andrew's cross)" },
+  8: { code: 8, name: "Upright cross (St. George cross)" },
+  9: { code: 9, name: "Cube, point up" },
+  10: { code: 10, name: "2 cones, point to point" },
+  11: { code: 11, name: "2 cones, base to base" },
+  12: { code: 12, name: "Rhombus (diamond)" },
+  13: { code: 13, name: "2 cones (points upward)" },
+  14: { code: 14, name: "2 cones (points downward)" },
+  15: { code: 15, name: "Besom, point up (broom or perch)" },
+  16: { code: 16, name: "Besom, point down (broom or perch)" },
+  17: { code: 17, name: "Flag" },
+  18: { code: 18, name: "Sphere over rhombus" },
+  19: { code: 19, name: "Square" },
+  20: { code: 20, name: "Rectangle, horizontal" },
+  21: { code: 21, name: "Rectangle, vertical" },
+  22: { code: 22, name: "Trapezium, up" },
+  23: { code: 23, name: "Trapezium, down" },
+  24: { code: 24, name: "Triangle, point up" },
+  25: { code: 25, name: "Triangle, point down" },
+  26: { code: 26, name: "Circle" },
+  27: { code: 27, name: "Two upright crosses (one over the other)" },
+  28: { code: 28, name: "T-shape" },
+  29: { code: 29, name: "Triangle pointing up over a circle" },
+  30: { code: 30, name: "Upright cross over a circle" },
+  31: { code: 31, name: "Rhombus over a circle" },
+  32: { code: 32, name: "Circle over a triangle pointing up" },
+  33: { code: 33, name: "Other shape (see INFORM)" }
+};
+var TRAFIC_CODES = {
+  1: { code: 1, name: "Inbound" },
+  2: { code: 2, name: "Outbound" },
+  3: { code: 3, name: "One-way" },
+  4: { code: 4, name: "Two-way" }
+};
+var WATLEV_CODES = {
+  1: { code: 1, name: "Partly submerged at high water" },
+  2: { code: 2, name: "Always dry" },
+  3: { code: 3, name: "Always under water/submerged" },
+  4: { code: 4, name: "Covers and uncovers" },
+  5: { code: 5, name: "Awash" },
+  6: { code: 6, name: "Subject to inundation or flooding" },
+  7: { code: 7, name: "Floating", supplement: true, unverified: true }
+};
+var S57_CODELISTS = /* @__PURE__ */ new Map([
+  ["BOYSHP", BOYSHP_CODES],
+  ["CATACH", CATACH_CODES],
+  ["CATCAM", CATCAM_CODES],
+  ["CATCBL", CATCBL_CODES],
+  ["CATCOA", CATCOA_CODES],
+  ["CATCRN", CATCRN_CODES],
+  ["CATDPG", CATDPG_CODES],
+  ["CATFOG", CATFOG_CODES],
+  ["CATHAF", CATHAF_CODES],
+  ["CATLAM", CATLAM_CODES],
+  ["CATLIT", CATLIT_CODES],
+  ["CATLMK", CATLMK_CODES],
+  ["CATMFA", CATMFA_CODES],
+  ["CATOBS", CATOBS_CODES],
+  ["CATPIP", CATPIP_CODES],
+  ["CATREA", CATREA_CODES],
+  ["CATSCF", CATSCF_CODES],
+  ["CATWRK", CATWRK_CODES],
+  ["COLOUR", COLOUR_CODES],
+  ["CONDTN", CONDTN_CODES],
+  ["LITCHR", LITCHR_CODES],
+  ["MARSYS", MARSYS_CODES],
+  ["NATSUR", NATSUR_CODES],
+  ["QUASOU", QUASOU_CODES],
+  ["RESTRN", RESTRN_CODES],
+  ["STATUS", STATUS_CODES],
+  ["TOPSHP", TOPSHP_CODES],
+  ["TRAFIC", TRAFIC_CODES],
+  ["WATLEV", WATLEV_CODES]
+]);
+var S57_DOMAINS = new Map(
+  [...S57_CODELISTS].map(([acronym, list]) => [
+    acronym,
+    new Set(Object.keys(list).map(Number))
+  ])
+);
+var nameTableCache = /* @__PURE__ */ new Map();
+var abbrTableCache = /* @__PURE__ */ new Map();
+function s57NameTable(acronym) {
+  let cached = nameTableCache.get(acronym);
+  if (cached === void 0) {
+    const out = {};
+    for (const c of Object.values(S57_CODELISTS.get(acronym) ?? {})) out[c.code] = c.name;
+    cached = Object.freeze(out);
+    nameTableCache.set(acronym, cached);
+  }
+  return cached;
+}
+function s57AbbrTable(acronym) {
+  let cached = abbrTableCache.get(acronym);
+  if (cached === void 0) {
+    const out = {};
+    for (const c of Object.values(S57_CODELISTS.get(acronym) ?? {})) {
+      if (c.abbr !== void 0) out[c.code] = c.abbr;
+    }
+    cached = Object.freeze(out);
+    abbrTableCache.set(acronym, cached);
+  }
+  return cached;
+}
+
+// src/interact/decode.ts
+function nameAbbrTable(acronym) {
+  const names = s57NameTable(acronym);
+  const abbrs = s57AbbrTable(acronym);
+  const out = {};
+  for (const [code, name] of Object.entries(names)) {
+    const abbr = abbrs[Number(code)];
+    if (abbr !== void 0) out[Number(code)] = { name, abbr };
+  }
+  return out;
+}
+var COLOUR_HEX = {
+  1: "#ffffff",
+  2: "#333333",
+  3: "#ef4444",
+  4: "#22c55e",
+  5: "#3b82f6",
+  6: "#eab308",
+  7: "#9ca3af",
+  8: "#92400e",
+  9: "#f59e0b",
+  10: "#8b5cf6",
+  11: "#f97316",
+  12: "#d946ef",
+  13: "#f472b6"
+};
+var LITCHR_TABLE = nameAbbrTable("LITCHR");
+var COLOUR_TABLE = Object.fromEntries(
+  Object.values(COLOUR_CODES).filter((c) => c.abbr !== void 0 && COLOUR_HEX[c.code] !== void 0).map((c) => [c.code, { name: c.name, abbr: c.abbr, hex: COLOUR_HEX[c.code] }])
+);
+var BOYSHP_TABLE = s57NameTable("BOYSHP");
+var CATLAM_TABLE = s57NameTable("CATLAM");
+var CATCAM_TABLE = s57NameTable("CATCAM");
+var CATLMK_TABLE = s57NameTable("CATLMK");
+var CATFOG_TABLE = s57NameTable("CATFOG");
+var CATFOG_ABBR_TABLE = s57AbbrTable("CATFOG");
+var CATFOG_NAUTOPHONE = Object.values(CATFOG_CODES).find(
+  (c) => c.name.toLowerCase() === "nautophone"
+)?.code;
+var CATLIT_TABLE = s57NameTable("CATLIT");
+var TOPSHP_TABLE = s57NameTable("TOPSHP");
+var STATUS_TABLE = s57NameTable("STATUS");
+var MARSYS_TABLE = s57NameTable("MARSYS");
 var LAYER_TYPE_MAP = {
   BOYLAT: "Lateral Buoy",
   BOYCAR: "Cardinal Buoy",
@@ -1843,12 +2211,7 @@ var CATBRG_LABELS = {
   11: "Aqueduct",
   12: "Suspension bridge"
 };
-var CONDTN_TABLE = {
-  1: "Under construction",
-  2: "Ruined",
-  3: "Under reclamation",
-  5: "Planned"
-};
+var CONDTN_TABLE = s57NameTable("CONDTN");
 function parseFirstNum(val) {
   if (val == null) return null;
   const s = String(val);
@@ -1890,185 +2253,21 @@ function decodeBridgeProps(props) {
     sourceDate: props.SORDAT ? String(props.SORDAT) : null
   };
 }
-var CATOBS_TABLE = {
-  1: "Snag / stump",
-  2: "Wellhead",
-  3: "Diffuser",
-  4: "Crib",
-  5: "Fish haven",
-  6: "Foul area",
-  7: "Foul ground",
-  8: "Ice boom",
-  9: "Ground tackle",
-  10: "Boom",
-  11: "Platform"
-};
-var CATWRK_TABLE = {
-  1: "Non-dangerous",
-  2: "Dangerous",
-  3: "Distributed remains",
-  4: "Mast showing",
-  5: "Hull showing"
-};
-var WATLEV_TABLE = {
-  1: "Partly submerged at high water",
-  2: "Always dry",
-  3: "Always submerged",
-  4: "Covers and uncovers",
-  5: "Awash",
-  6: "Subject to inundation / flooding",
-  7: "Floating"
-};
-var CATREA_TABLE = {
-  1: "Offshore safety zone",
-  2: "Anchoring prohibition",
-  3: "Fishing prohibition",
-  4: "Nature reserve",
-  5: "Bird sanctuary",
-  6: "Game preserve",
-  7: "Seal sanctuary",
-  8: "Degaussing range",
-  9: "Military area",
-  10: "Historic wreck",
-  12: "Navigational aid safety zone",
-  14: "No wake zone",
-  18: "Swimming area",
-  19: "Waiting area",
-  20: "Research area",
-  21: "Dredging area",
-  22: "Fish sanctuary",
-  23: "Ecological reserve",
-  24: "No discharge zone",
-  25: "No anchoring area",
-  26: "No fishing area",
-  27: "Speed restriction zone",
-  28: "To be avoided area"
-};
-var RESTRN_TABLE = {
-  1: "Anchoring prohibited",
-  2: "Anchoring restricted",
-  3: "Fishing prohibited",
-  4: "Fishing restricted",
-  5: "Trawling prohibited",
-  6: "Trawling restricted",
-  7: "Entry prohibited",
-  8: "Entry restricted",
-  9: "Dredging prohibited",
-  10: "Dredging restricted",
-  11: "Diving prohibited",
-  12: "Diving restricted",
-  13: "No wake",
-  14: "To be avoided",
-  15: "Construction prohibited",
-  16: "Discharging prohibited",
-  17: "Discharging restricted",
-  18: "Industrial prohibited",
-  19: "Metallic hull vessels prohibited",
-  20: "Navigating prohibited",
-  21: "Speed restricted",
-  24: "Stopping prohibited",
-  25: "Landing prohibited"
-};
-var CATHAF_TABLE = {
-  1: "RoRo terminal",
-  3: "Ferry terminal",
-  4: "Fishing harbour",
-  5: "Yacht harbour / marina",
-  6: "Naval base",
-  7: "Tanker terminal",
-  8: "Passenger terminal",
-  9: "Shipyard",
-  10: "Container terminal",
-  11: "Bulk terminal",
-  12: "Synchrolift",
-  13: "Straddle carrier",
-  14: "Port terminal"
-};
-var CATSCF_TABLE = {
-  1: "Visitors' berth",
-  2: "Nautical club",
-  3: "Boat hoist",
-  4: "Sailmaker",
-  5: "Boatyard",
-  6: "Public inn",
-  7: "Restaurant",
-  8: "Chandler",
-  9: "Provisions",
-  10: "Doctor",
-  11: "Pharmacy",
-  12: "Water tap",
-  13: "Fuel station",
-  14: "Electricity",
-  15: "Bottle gas",
-  16: "Showers",
-  17: "Launderette",
-  18: "Public toilets",
-  19: "Post box"
-};
-var CATCRN_TABLE = {
-  2: "Container crane / gantry",
-  3: "Sheerlegs",
-  4: "Travelling crane"
-};
-var CATACH_TABLE = {
-  1: "Unrestricted anchorage",
-  2: "Deep water anchorage",
-  3: "Tanker anchorage",
-  4: "Explosives anchorage",
-  5: "Quarantine anchorage",
-  6: "Sea-plane anchorage",
-  7: "Small craft anchorage",
-  8: "Small craft mooring area",
-  9: "Anchorage for 24 hours or less"
-};
-var CATDPG_TABLE = {
-  1: "General dumping ground",
-  2: "Chemical waste",
-  3: "Nuclear waste",
-  4: "Explosives",
-  5: "Spoil ground",
-  6: "Vessel dumping ground"
-};
-var CATMFA_TABLE = {
-  1: "Crustaceans",
-  2: "Oysters / mussels",
-  3: "Fish",
-  4: "Seaweed",
-  5: "Pearl culture"
-};
-var CATCBL_TABLE = {
-  1: "Submarine power cable",
-  2: "Submarine transmission cable",
-  3: "Submarine telegraph cable",
-  4: "Submarine telephone cable",
-  5: "Mooring cable",
-  6: "Ferry cable"
-};
-var CATPIP_TABLE = {
-  1: "Pipeline",
-  2: "Outfall pipe",
-  3: "Intake pipe",
-  4: "Sewer",
-  5: "Bubbler system",
-  6: "Supply pipe"
-};
-var TRAFIC_TABLE = {
-  1: "Inbound",
-  2: "Outbound",
-  3: "One-way",
-  4: "Two-way"
-};
-var QUASOU_TABLE = {
-  1: "Depth known",
-  2: "Depth unknown",
-  3: "Doubtful sounding",
-  4: "Unreliable sounding",
-  6: "Least depth known",
-  7: "Least depth unknown",
-  9: "Not regularly maintained",
-  10: "Maintained depth",
-  11: "Not surveyed"
-};
+var CATOBS_TABLE = s57NameTable("CATOBS");
+var CATWRK_TABLE = s57NameTable("CATWRK");
+var WATLEV_TABLE = s57NameTable("WATLEV");
+var CATREA_TABLE = s57NameTable("CATREA");
+var RESTRN_TABLE = s57NameTable("RESTRN");
+var CATHAF_TABLE = s57NameTable("CATHAF");
+var CATSCF_TABLE = s57NameTable("CATSCF");
+var CATCRN_TABLE = s57NameTable("CATCRN");
+var CATACH_TABLE = s57NameTable("CATACH");
+var CATDPG_TABLE = s57NameTable("CATDPG");
+var CATMFA_TABLE = s57NameTable("CATMFA");
+var CATCBL_TABLE = s57NameTable("CATCBL");
+var CATPIP_TABLE = s57NameTable("CATPIP");
+var TRAFIC_TABLE = s57NameTable("TRAFIC");
+var QUASOU_TABLE = s57NameTable("QUASOU");
 function decodeAreaFeatureProps(layerName, props) {
   const rawLayer = layerName.replace(/^enc-/, "").replace(/-(point|line|polygon|midpoint)$/, "");
   const parseCodeLocal = (val) => {
@@ -2531,6 +2730,15 @@ function decodeAreaFeatureProps(layerName, props) {
   if (st && STATUS_TABLE[st]) entries.push({ label: "Status", value: STATUS_TABLE[st] });
   return { type, title: title || type, properties: entries };
 }
+function catfogCodeFromName(lowercaseName) {
+  if (!lowercaseName) return null;
+  for (const entry of Object.values(CATFOG_CODES)) {
+    const term = entry.name.toLowerCase();
+    if (new RegExp(`\\b${term}\\b`).test(lowercaseName)) return entry.code;
+  }
+  if (/\bnauto\b/.test(lowercaseName)) return CATFOG_NAUTOPHONE ?? null;
+  return null;
+}
 function parseCode(val) {
   if (val == null) return null;
   let s = String(val).trim();
@@ -2642,14 +2850,7 @@ function decodeNavAidProps(layerName, props, coords) {
   const sigper = props.SIGPER != null ? Number(props.SIGPER) : null;
   const group = parseGroup(props.SIGGRP);
   const nameForFog = String(props.OBJNAM ?? "").toLowerCase();
-  let catfogCode = null;
-  if (/\bwhistle\b/.test(nameForFog)) catfogCode = 6;
-  else if (/\bgong\b/.test(nameForFog)) catfogCode = 8;
-  else if (/\bbell\b/.test(nameForFog)) catfogCode = 5;
-  else if (/\bhorn\b/.test(nameForFog)) catfogCode = 9;
-  else if (/\bsiren\b/.test(nameForFog)) catfogCode = 3;
-  else if (/diaphone/.test(nameForFog)) catfogCode = 2;
-  else if (/nautophone|nauto/.test(nameForFog)) catfogCode = 4;
+  let catfogCode = catfogCodeFromName(nameForFog);
   if (!catfogCode) catfogCode = parseCode(props.CATFOG);
   const fogSignal2 = catfogCode ? CATFOG_TABLE[catfogCode] ?? null : null;
   const fogSignalAbbr = catfogCode ? CATFOG_ABBR_TABLE[catfogCode] ?? null : null;
@@ -5803,6 +6004,31 @@ var S52_LOOKUP = {
     viewingGroup: 27080,
     scamin: 22e3
   },
+  RADRFL: {
+    objectClass: "RADRFL",
+    name: "Radar Reflector",
+    category: "Navigation Aids",
+    displayCategory: "OTHER",
+    int1Ref: "S6",
+    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.6, "icon-allow-overlap": true }, iconImage: "RADRFL03" },
+    viewingGroup: 27080,
+    scamin: 22e3
+  },
+  // Retroreflecting material fitted to buoys/beacons. 7,506 features across 616
+  // NOAA cells (docs/validation/s52-occurrence-snapshot.json) rendered nothing
+  // until this entry existed. RETRFL02 is the simplified variant — RETRFL01 is
+  // the paper-chart glyph, per the reference manifest descriptions.
+  // int1Ref intentionally omitted: no INT-1 citation for retroreflectors could
+  // be verified against an in-repo source, and the field is optional.
+  RETRFL: {
+    objectClass: "RETRFL",
+    name: "Retroreflector",
+    category: "Navigation Aids",
+    displayCategory: "OTHER",
+    style: { type: "symbol", paint: {}, layout: { "icon-size": 0.6, "icon-allow-overlap": true }, iconImage: "RETRFL02" },
+    viewingGroup: 27080,
+    scamin: 22e3
+  },
   NAVLNE: {
     objectClass: "NAVLNE",
     name: "Navigation Line",
@@ -21347,6 +21573,8 @@ var SYMBOL_MAP = {
   FOGSIG: "FOGSIG01",
   RTPBCN: "RTPBCN02",
   RDOSTA: "RTPBCN02",
+  RADRFL: "RADRFL03",
+  RETRFL: "RETRFL02",
   // Nav aids
   DAYMAR: "DAYTRI01",
   PILPNT: "PILPNT02",
@@ -21800,31 +22028,28 @@ function getLookupEntry(layerName) {
   return S52_LOOKUP[layerName] ?? null;
 }
 
+// src/s57/match-expression.ts
+var pairsCache = /* @__PURE__ */ new Map();
+function codeLabelPairs(acronym, kind) {
+  const key = `${acronym}:${kind}`;
+  let pairs = pairsCache.get(key);
+  if (pairs === void 0) {
+    const table = kind === "abbr" ? s57AbbrTable(acronym) : s57NameTable(acronym);
+    const flat = [];
+    for (const code of Object.keys(table).map(Number).sort((a, b) => a - b)) {
+      flat.push(code, table[code]);
+    }
+    pairs = flat;
+    pairsCache.set(key, pairs);
+  }
+  return pairs;
+}
+function s57MatchExpression(acronym, kind, input, fallback = "") {
+  return ["match", input, ...codeLabelPairs(acronym, kind), fallback];
+}
+
 // src/atlas/labels.ts
-var LITCHR_ABBR = {
-  1: "F",
-  2: "Fl",
-  3: "LFl",
-  4: "Oc",
-  5: "Iso",
-  6: "S.Fl",
-  7: "S.LFl",
-  8: "Al.Oc",
-  9: "Al.LFl",
-  10: "Al.Fl",
-  11: "Al.Gp",
-  12: "Mo",
-  13: "Q",
-  14: "VQ",
-  15: "UQ",
-  16: "Al",
-  17: "Al.F.Fl",
-  25: "Q+LFl",
-  26: "VQ+LFl",
-  27: "UQ+LFl",
-  28: "Al",
-  29: "F.LFl"
-};
+var LITCHR_ABBR = s57AbbrTable("LITCHR");
 var COLOUR_ABBR = {
   1: "W",
   3: "R",
@@ -22613,27 +22838,11 @@ function getLabelConfig(layerName, opts = {}) {
         }
       };
     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",
-        ""
-      ];
+      const catfogExpr = s57MatchExpression(
+        "CATFOG",
+        "abbr",
+        ["to-number", ["coalesce", ["get", "CATFOG"], 0], 0]
+      );
       return {
         type: "symbol",
         textField: catfogExpr,
@@ -26189,33 +26398,11 @@ function buildNavAidLabelExpression() {
   ];
 }
 function buildLightLabelExpression() {
-  const litchrExpr = [
-    "match",
-    ["coalesce", ["get", "LITCHR"], 0],
-    1,
-    "F",
-    2,
-    "Fl",
-    3,
-    "LFl",
-    4,
-    "Oc",
-    5,
-    "Iso",
-    6,
-    "S.Fl",
-    7,
-    "S.LFl",
-    12,
-    "Mo",
-    13,
-    "Q",
-    14,
-    "VQ",
-    15,
-    "UQ",
-    ""
-  ];
+  const litchrExpr = s57MatchExpression(
+    "LITCHR",
+    "abbr",
+    ["coalesce", ["get", "LITCHR"], 0]
+  );
   const colourExpr = colourCodeCase(
     [
       ["3", " R"],
@@ -27363,6 +27550,20 @@ var CHART_CASCADE_CODES = {
   Approach: ["1", "2", "3", "4"],
   Harbor: ["1", "2", "3", "4", "5", "6"]
 };
+var CHRT_STYLE_MODES = [
+  "continuous",
+  ...Object.keys(CHART_BAND_CODES).map(
+    (band) => `chart:${band}`
+  )
+];
+function normalizeStyleMode(raw) {
+  if (raw === null || raw === void 0 || raw === "") return "continuous";
+  const lower = raw.toLowerCase();
+  return CHRT_STYLE_MODES.find((mode) => mode.toLowerCase() === lower) ?? null;
+}
+function styleModeBand(mode) {
+  return mode === "continuous" ? null : mode.slice("chart:".length);
+}
 function bandFilterExpression(codes) {
   const list = Array.isArray(codes) ? codes : [codes];
   if (list.length === 1) {
@@ -27478,6 +27679,34 @@ function makeCollapsedBandVariant(layer, B, isExempt) {
   delete collapsed.maxzoom;
   return [collapsed];
 }
+function collapsedOrientationGate(minzoom) {
+  const clauses = [NOT_DOMINATED_FILTER];
+  for (const D of BAND_DRAW_ORDER) {
+    const dMaxzoom = dominatedVariantMaxzoom(D);
+    if (dMaxzoom <= minzoom) continue;
+    clauses.push(["all", dominatedByMinFilter(D), ["<", ["zoom"], dMaxzoom]]);
+  }
+  return ["any", ...clauses];
+}
+function makeCollapsedCrossBandLabel(label, isExempt) {
+  const classMinzoom = label.minzoom ?? 0;
+  const clauses = [];
+  for (const B of BAND_DRAW_ORDER) {
+    const floor = BAND_PRIORITY_RANGES[B].minzoom;
+    const parts = [bandFilterExpression(B)];
+    if (floor > 0) parts.push([">=", ["zoom"], floor]);
+    if (!isExempt) {
+      parts.push(collapsedDominanceGate(B, Math.max(classMinzoom, floor)));
+    }
+    clauses.push(parts.length === 1 ? parts[0] : ["all", ...parts]);
+  }
+  const collapsed = {
+    ...label,
+    filter: combineWithBandFilter(label.filter, ["any", ...clauses])
+  };
+  delete collapsed.maxzoom;
+  return collapsed;
+}
 
 // src/atlas/style-generator.ts
 var META_LAYERS = /* @__PURE__ */ new Set([
@@ -27629,7 +27858,7 @@ var CELL_BAND_OPACITY_CURVE = {
   "5": [[11, 0.6], [13, 0.35], [18, 0.25]],
   "6": [[13, 0.75], [16, 0.55], [22, 0.45]]
 };
-function fanOrientationLabelByCellBand(label) {
+function fanOrientationLabelByCellBand(label, bandFan) {
   const cellBandExpr = [
     "slice",
     ["coalesce", ["get", "_cell_id"], "??9???"],
@@ -27654,6 +27883,16 @@ function fanOrientationLabelByCellBand(label) {
       ...label.paint ?? {},
       "text-opacity": opacityExpr
     };
+    if (bandFan === "collapsed") {
+      variants.push({
+        ...label,
+        id: `${label.id}-cell${code}-notdom`,
+        filter: combineWithBandFilter(cellFiltered, collapsedOrientationGate(minzoom)),
+        minzoom,
+        paint
+      });
+      continue;
+    }
     variants.push({
       ...label,
       id: `${label.id}-cell${code}-notdom`,
@@ -27683,18 +27922,50 @@ function byLabelPriorityBottomUp(bundles) {
     (a, b) => getLabelPriority(b.objectClass) - getLabelPriority(a.objectClass)
   );
 }
-function chartModeFilterForBand(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
-  let filter = combineWithBandFilter(layer.filter, bandFilterExpression(B));
+function chartModeBandClauses(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
+  const parts = [bandFilterExpression(B)];
   if (!isDominanceExempt(layer)) {
     for (const D of higherCascadeBands) {
-      filter = combineWithBandFilter(filter, ["!", dominatedByMinFilter(D)]);
+      parts.push(["!", dominatedByMinFilter(D)]);
     }
   }
   if (lockedBounds && isRequestedBand) {
-    filter = combineWithBandFilter(filter, withinBboxFilter(lockedBounds));
+    parts.push(withinBboxFilter(lockedBounds));
+  }
+  return parts;
+}
+function chartModeFilterForBand(layer, B, higherCascadeBands, lockedBounds, isRequestedBand) {
+  const [first, ...rest] = chartModeBandClauses(
+    layer,
+    B,
+    higherCascadeBands,
+    lockedBounds,
+    isRequestedBand
+  );
+  let filter = combineWithBandFilter(layer.filter, first);
+  for (const part of rest) {
+    filter = combineWithBandFilter(filter, part);
   }
   return filter;
 }
+function makeCollapsedChartLabel(label, cascade, requestedSet, lockedBounds) {
+  const clauses = cascade.map((B, i) => {
+    const parts = chartModeBandClauses(
+      label,
+      B,
+      cascade.slice(i + 1),
+      lockedBounds,
+      requestedSet.has(B)
+    );
+    return parts.length === 1 ? parts[0] : ["all", ...parts];
+  });
+  const collapsed = {
+    ...label,
+    filter: combineWithBandFilter(label.filter, ["any", ...clauses])
+  };
+  delete collapsed.maxzoom;
+  return collapsed;
+}
 function generateStyle(palette = "DAY", opts = {}) {
   const sources = buildSources(opts);
   const sourceId = opts.region ?? DEFAULT_REGION;
@@ -27710,6 +27981,7 @@ function generateStyle(palette = "DAY", opts = {}) {
   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 bandFan = opts.bandFan ?? "collapsed";
   const lockedBounds = opts.chartMode?.lockedBounds;
   const bundles = [];
   for (const objectClass of orderedClasses) {
@@ -27763,6 +28035,12 @@ function generateStyle(palette = "DAY", opts = {}) {
       )
     );
     for (const { label } of chartLabelBundles) {
+      if (bandFan === "collapsed") {
+        labelLayers.push(
+          makeCollapsedChartLabel(label, chartCascade, requestedSet, lockedBounds)
+        );
+        continue;
+      }
       for (let i = 0; i < chartCascade.length; i++) {
         const B = chartCascade[i];
         const higher = chartCascade.slice(i + 1);
@@ -27785,7 +28063,6 @@ function generateStyle(palette = "DAY", opts = {}) {
     }
     layers.push(...labelLayers);
   } else {
-    const bandFan = opts.bandFan ?? "collapsed";
     const emitBand = (base, code) => bandFan === "legacy" ? makeBandVariants(base, code) : makeCollapsedBandVariant(base, code, isDominanceExempt(base));
     for (const code of BAND_DRAW_ORDER) {
       for (const { featureLayers } of regularBundles) {
@@ -27804,7 +28081,7 @@ function generateStyle(palette = "DAY", opts = {}) {
     for (const { objectClass, label } of bundles) {
       if (!label) continue;
       if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-        labelLayers.push(...fanOrientationLabelByCellBand(label));
+        labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan));
       }
     }
     const featureLabelBundles = byLabelPriorityBottomUp(
@@ -27813,6 +28090,10 @@ function generateStyle(palette = "DAY", opts = {}) {
       )
     );
     for (const { label } of featureLabelBundles) {
+      if (bandFan === "collapsed") {
+        labelLayers.push(makeCollapsedCrossBandLabel(label, isDominanceExempt(label)));
+        continue;
+      }
       for (const code of BAND_DRAW_ORDER) {
         labelLayers.push(...emitBand(label, code));
       }
@@ -28612,6 +28893,7 @@ var Chrt = class {
   CHRT_ICON_EXPRESSIONS,
   CHRT_ICON_PREFIX,
   CHRT_SDF_GLYPHS,
+  CHRT_STYLE_MODES,
   Chrt,
   ChrtError,
   DEFAULT_CLICK_TOLERANCE,
@@ -28741,6 +29023,7 @@ var Chrt = class {
   lightColor,
   lightFillExpression,
   lightsIconExpression,
+  normalizeStyleMode,
   normalizeTheme,
   paginate,
   parseListCodes,
@@ -28761,6 +29044,7 @@ var Chrt = class {
   sanitizeCustomStyleConfig,
   scaleSizeValue,
   scaminToMinZoom,
+  styleModeBand,
   withinBboxFilter,
   worldMinusBboxPolygon
 });