@chrtco/sdk 0.7.5 → 0.7.7

package/dist/index.d.cts

@@ -951,6 +951,8 @@ interface NauticalSymbol {
     description?: string;
     /** S-52 Presentation Library symbol name */
     s52PlRef?: string;
+    /** S-57 object class (e.g. "LNDMRK") when it can't be derived from s52PlRef's prefix */
+    s57Class?: string;
     /** Grouping key for family clustering */
     group?: string;
     /** IDs of related variant symbols */

package/dist/index.d.ts

@@ -951,6 +951,8 @@ interface NauticalSymbol {
     description?: string;
     /** S-52 Presentation Library symbol name */
     s52PlRef?: string;
+    /** S-57 object class (e.g. "LNDMRK") when it can't be derived from s52PlRef's prefix */
+    s57Class?: string;
     /** Grouping key for family clustering */
     group?: string;
     /** IDs of related variant symbols */

package/dist/index.js

@@ -3143,18 +3143,37 @@ function depareFillExpression(ct = "DAY") {
     resolveColor("DEPDW", ct)
   ];
 }
-function colourCodeCase(cases, fallback) {
-  const colourStr = ["to-string", ["coalesce", ["get", "COLOUR"], ["get", "colour"], ""]];
+function listAttrString(attr) {
+  return ["to-string", ["coalesce", ["get", attr], ["get", attr.toLowerCase()], ""]];
+}
+function listAttrCase(attr, cases, fallback) {
+  const attrStr = listAttrString(attr);
   const expr = ["case"];
   for (const [code, value] of cases) {
-    expr.push([">=", ["index-of", `"${code}"`, colourStr], 0], value);
+    expr.push([">=", ["index-of", `"${code}"`, attrStr], 0], value);
+  }
+  for (const [code, value] of cases) {
+    expr.push(["==", attrStr, code], value);
   }
   for (const [code, value] of cases) {
-    expr.push(["==", colourStr, code], value);
+    expr.push(["==", attrStr, `[${code}]`], value);
   }
   expr.push(fallback);
   return expr;
 }
+function listAttrHas(attr, codes) {
+  const attrStr = listAttrString(attr);
+  const clauses = [];
+  for (const code of codes) {
+    clauses.push([">=", ["index-of", `"${code}"`, attrStr], 0]);
+    clauses.push(["==", attrStr, code]);
+    clauses.push(["==", attrStr, `[${code}]`]);
+  }
+  return ["any", ...clauses];
+}
+function colourCodeCase(cases, fallback) {
+  return listAttrCase("COLOUR", cases, fallback);
+}
 function lightColor(props, ct = "DAY") {
   const raw = props.COLOUR ?? props.colour;
   const code = Array.isArray(raw) ? Number(raw[0]) : typeof raw === "string" && raw.startsWith("[") ? Number(JSON.parse(raw)[0]) : Number(raw ?? 0);
@@ -5191,9 +5210,12 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkSpire,
     group: "landmarks",
     description: "Church spire or steeple, conspicuous from seaward. Useful for visual fixing.",
-    s52PlRef: "LNDMRK17",
+    // CATLMK 20 alone has no dedicated PL symbol (renders POSGEN01/03); church spires carry
+    // FUNCTN 20/21 and render as the religious-building symbol BUIREL01 (BUIREL13 when conspicuous)
+    s52PlRef: "BUIREL01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 17,
+    attributeValue: 20,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Spire, building, position circle" }],
     lineStyles: [{ element: "Building outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5208,9 +5230,11 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkTower,
     group: "landmarks",
     description: "Tower conspicuous from seaward. General-purpose landmark symbol.",
-    s52PlRef: "LNDMRK20",
+    s52PlRef: "TOWERS01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 20,
+    attributeValue: 17,
+    // TOWERS03 = conspicuous variant
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower body, cap, position circle" }],
     lineStyles: [{ element: "Tower outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5225,9 +5249,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkChimney,
     group: "landmarks",
     description: "Industrial chimney or smokestack visible from the sea.",
-    s52PlRef: "LNDMRK01",
+    s52PlRef: "CHIMNY01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 1,
+    attributeValue: 3,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Chimney body, smoke, position circle" }],
     lineStyles: [{ element: "Body outline", width: 0.8, color: "#000000" }, { element: "Smoke plume", width: 1, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5242,9 +5267,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkFlagstaff,
     group: "landmarks",
     description: "Flagstaff or flagpole conspicuous from seaward.",
-    s52PlRef: "LNDMRK03",
+    s52PlRef: "FLGSTF01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 3,
+    attributeValue: 5,
     renderSize: "32x32",
     colors: [
       { token: "CHBLK", hex: "#000000", usage: "Pole and position circle" },
@@ -5262,9 +5288,11 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkMonument,
     group: "landmarks",
     description: "Monument or memorial conspicuous from the sea.",
-    s52PlRef: "LNDMRK05",
+    s52PlRef: "MONUMT12",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 5,
+    attributeValue: 9,
+    // MONUMT02 = non-conspicuous variant
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Monument body, base, position circle" }],
     lineStyles: [{ element: "Body outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5279,9 +5307,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkWindmill,
     group: "landmarks",
     description: "Traditional windmill with rotating vanes. Conspicuous landmark.",
-    s52PlRef: "LNDMRK21",
+    s52PlRef: "WNDMIL12",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 7,
+    attributeValue: 18,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, vanes, hub, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Vane arms", width: 1.2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5296,9 +5325,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkWindTurbine,
     group: "landmarks",
     description: "Modern 3-blade wind turbine. Increasingly common offshore landmark.",
-    s52PlRef: "LNDMRK22",
+    s52PlRef: "WIMCON11",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 26,
+    attributeValue: 19,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, blades, hub, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Blades", width: 1.2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5313,9 +5343,11 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkDome,
     group: "landmarks",
     description: "Dome or cupola (e.g., observatory, mosque) visible from the sea.",
-    s52PlRef: "LNDMRK03",
+    s52PlRef: "DOMES011",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 6,
+    attributeValue: 15,
+    // DOMES001 = non-conspicuous variant
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Dome, base, position circle" }],
     lineStyles: [{ element: "Base outline", width: 0.8, color: "#000000" }, { element: "Dome curve", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5330,9 +5362,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkRadarScanner,
     group: "landmarks",
     description: "Radar scanner antenna conspicuous from seaward.",
-    s52PlRef: "LNDMRK12",
+    s52PlRef: "RASCAN01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 9,
+    attributeValue: 16,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, scanner dish, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Scanner frame", width: 1.5, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5347,9 +5380,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkDishAerial,
     group: "landmarks",
     description: "Satellite dish or parabolic antenna visible from the sea.",
-    s52PlRef: "LNDMRK12",
+    s52PlRef: "DSHAER01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 12,
+    attributeValue: 4,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tower, dish, position circle" }],
     lineStyles: [{ element: "Tower", width: 1.5, color: "#000000" }, { element: "Dish curve", width: 1.5, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5364,9 +5398,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkWaterTower,
     group: "landmarks",
     description: "Water tower. Elevated tank on supporting structure, conspicuous landmark.",
-    s52PlRef: "LNDMRK19",
-    attributeKey: "CATLMK",
-    attributeValue: 15,
+    s52PlRef: "TOWERS12",
+    s57Class: "SILTNK",
+    attributeKey: "CATSIL",
+    attributeValue: 4,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Tank, legs, position circle" }],
     lineStyles: [{ element: "Leg outlines", width: 1.2, color: "#000000" }, { element: "Tank outline", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5381,9 +5416,11 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkRadioTvMast,
     group: "landmarks",
     description: "Radio or television transmission mast with horizontal cross-arms.",
-    s52PlRef: "LNDMRK10",
+    // Radio/TV masts are CATLMK 7 (mast) + FUNCTN in S-57, so both mast entries share MSTCON04
+    s52PlRef: "MSTCON04",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 8,
+    attributeValue: 7,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Mast, cross-arms, top, position circle" }],
     lineStyles: [{ element: "Main mast", width: 1.5, color: "#000000" }, { element: "Cross-arms", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5398,9 +5435,12 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkCross,
     group: "landmarks",
     description: "Religious cross or calvary conspicuous from seaward.",
-    s52PlRef: "LNDMRK05",
+    // The PL has no dedicated symbol for CATLMK 14 (cross/calvary) — S-52 falls back to the
+    // generic position symbol POSGEN01 (POSGEN03 when conspicuous)
+    s52PlRef: "POSGEN01",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 10,
+    attributeValue: 14,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Cross arms and position circle" }],
     lineStyles: [{ element: "Vertical arm", width: 2, color: "#000000" }, { element: "Horizontal arm", width: 2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5415,9 +5455,11 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkMast,
     group: "landmarks",
     description: "General mast (not radio/TV). Pole with spherical top.",
-    s52PlRef: "LNDMRK10",
+    s52PlRef: "MSTCON04",
+    s57Class: "LNDMRK",
     attributeKey: "CATLMK",
-    attributeValue: 14,
+    attributeValue: 7,
+    // MSTCON14 = conspicuous variant
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Mast pole, top ball, position circle" }],
     lineStyles: [{ element: "Mast pole", width: 2, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5432,9 +5474,10 @@ var NAUTICAL_SYMBOLS = [
     getSvg: landmarkSilo,
     group: "landmarks",
     description: "Silo, grain elevator, or storage tank conspicuous from the sea.",
-    s52PlRef: "LNDMRK17",
-    attributeKey: "CATLMK",
-    attributeValue: 33,
+    s52PlRef: "SILBUI01",
+    s57Class: "SILTNK",
+    attributeKey: "CATSIL",
+    attributeValue: 1,
     renderSize: "32x32",
     colors: [{ token: "CHBLK", hex: "#000000", usage: "Body, dome top, position circle" }],
     lineStyles: [{ element: "Body outline", width: 0.8, color: "#000000" }, { element: "Dome curve", width: 0.8, color: "#000000" }, { element: "Position circle", width: 0.6, pattern: "2, 2", color: "#000000" }],
@@ -5836,27 +5879,18 @@ function getIconExpression(layerName) {
     ];
   }
   if (layerName === "LNDMRK") {
-    return [
-      "match",
-      ["coalesce", ["get", "CATLMK"], ["get", "catlmk"], 0],
-      1,
-      "CAIRNS11",
-      // Cairn
-      17,
-      "BCNTOW01",
-      // Tower
-      18,
-      "LNDMRK18",
+    return listAttrCase("CATLMK", [
+      ["18", "LNDMRK18"],
       // Windmill (4-vane)
-      19,
-      "LNDMRK19",
+      ["19", "LNDMRK19"],
       // Wind motor / turbine (3-blade)
-      20,
-      "BCNTOW01",
+      ["1", "CAIRNS11"],
+      // Cairn
+      ["17", "BCNTOW01"],
+      // Tower
+      ["20", "BCNTOW01"]
       // Spire → tower
-      "BCNTOW01"
-      // Default: tower
-    ];
+    ], "BCNTOW01");
   }
   if (layerName === "DAYMAR") {
     return [
@@ -5996,18 +6030,12 @@ function getIconExpression(layerName) {
     ];
   }
   if (layerName === "LIGHTS") {
-    return [
-      "match",
-      ["coalesce", ["get", "CATLIT"], ["get", "catlit"], 0],
-      8,
-      "LIGHTS82",
-      // Aero light
-      9,
-      "LIGHTS82",
-      // Air obstruction light
-      "LIGHTS11"
-      // Default: major light
-    ];
+    return listAttrCase("CATLIT", [
+      ["8", "LIGHTS82"],
+      // Floodlight
+      ["9", "LIGHTS82"]
+      // Strip light
+    ], "LIGHTS11");
   }
   return SYMBOL_MAP[layerName] ?? "";
 }
@@ -6699,6 +6727,11 @@ var LABEL_BEHAVIOR = {
 function getLabelBehavior(layerName) {
   return LABEL_BEHAVIOR[layerName] ?? "feature-band-gated";
 }
+var LABEL_ANCHOR_FILTER = [
+  "!=",
+  ["get", "_label_anchor"],
+  false
+];
 function getLabelConfig(layerName, opts = {}) {
   const ct = opts.colorTable ?? "DAY";
   switch (layerName) {
@@ -7490,6 +7523,18 @@ function preprocessSoundings(fc) {
   }
   return { type: "FeatureCollection", features };
 }
+function firstListCode(raw) {
+  if (raw == null) return NaN;
+  if (Array.isArray(raw)) return Number(raw[0]);
+  if (typeof raw === "string" && raw.startsWith("[")) {
+    try {
+      const arr = JSON.parse(raw);
+      if (Array.isArray(arr)) return Number(arr[0]);
+    } catch {
+    }
+  }
+  return Number(raw);
+}
 function preprocessLights(fc) {
   return {
     type: "FeatureCollection",
@@ -7498,7 +7543,7 @@ function preprocessLights(fc) {
       const parts = [];
       const litchr = Number(props.LITCHR);
       if (litchr && LITCHR_ABBR[litchr]) parts.push(LITCHR_ABBR[litchr]);
-      const colour = Number(props.COLOUR);
+      const colour = firstListCode(props.COLOUR);
       if (colour && COLOUR_ABBR[colour]) parts.push(COLOUR_ABBR[colour]);
       const sigper = Number(props.SIGPER);
       if (sigper && sigper > 0) parts.push(sigper + "s");
@@ -7572,7 +7617,7 @@ function preprocessNavAids(fc) {
       const match = objnam.match(/(\d+[A-Z]?)\s*$/);
       if (!match) return f;
       const designation = match[1];
-      const colourCode = Number(props.COLOUR);
+      const colourCode = firstListCode(props.COLOUR);
       const prefix = NAV_COLOUR_PREFIX[colourCode];
       const label = prefix ? `${prefix} "${designation}"` : `"${designation}"`;
       return {
@@ -8141,6 +8186,18 @@ var S101_FEATURES = [
     isNewInS101: false,
     attributes: ["categoryOfLandmark", "function", "visuallyConspicuous"]
   },
+  {
+    featureClass: "SiloStorageTank",
+    name: "Silo / Storage Tank",
+    s57Equivalent: "SILTNK",
+    section: "E",
+    group: "landmarks",
+    category: "geo",
+    description: "An enclosed structure for storing bulk solids or liquids (silo, grain elevator, water tower, tank). Often conspicuous and useful for position fixing.",
+    portrayalRef: "SILTNK_S101",
+    isNewInS101: false,
+    attributes: ["categoryOfSiloTank", "colour", "visuallyConspicuous"]
+  },
   // ── Section D: Bridges ──
   {
     featureClass: "Bridge",
@@ -9651,23 +9708,30 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION) {
     }
     if (objectClass === "LNDMRK" && resolved.type === "symbol") {
       const baseFilterParts = layer.filter && layer.filter[0] === "all" ? layer.filter.slice(1) : layer.filter ? [layer.filter] : [];
-      const catlmk = ["coalesce", ["get", "CATLMK"], ["get", "catlmk"], 0];
-      const isWind = ["any", ["==", catlmk, 18], ["==", catlmk, 19]];
-      const isLighthouse = ["==", catlmk, 17];
+      const isWind = listAttrHas("CATLMK", ["18", "19"]);
+      const isLighthouse = listAttrHas("CATLMK", ["17"]);
       const scaminFloor = scaminToMinZoom(entry?.scamin);
       const windLayer = {
         ...layer,
         id: `s52-${objectClass}-wind-symbol`,
-        filter: ["all", ...baseFilterParts, isWind]
+        filter: ["all", ...baseFilterParts, isWind],
+        // Explicit, not inherited: turbines share exact coordinates with
+        // their aviation-light LIGHTS feature; without allow-overlap the
+        // turbine icon loses collision to the LIGHTS flare and vanishes.
+        // (The value currently also arrives via the entry-layout
+        // spread-last chain, but that chain is fragile — see s52-lookup
+        // LNDMRK entry — so the intent is pinned here.)
+        layout: { ...layer.layout ?? {}, "icon-allow-overlap": true }
       };
       delete windLayer.minzoom;
       const lighthouseLayer = {
         ...layer,
         id: `s52-${objectClass}-lighthouse-symbol`,
-        filter: ["all", ...baseFilterParts, isLighthouse],
+        filter: ["all", ...baseFilterParts, isLighthouse, ["!", isWind]],
         layout: {
           ...layer.layout ?? {},
-          "icon-image": "LIGHTHOUSE01"
+          "icon-image": "LIGHTHOUSE01",
+          "icon-allow-overlap": true
         }
       };
       delete lighthouseLayer.minzoom;
@@ -10548,7 +10612,7 @@ function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION, depthUnits
     delete layer.filter;
   }
   if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-    delete layer.filter;
+    layer.filter = LABEL_ANCHOR_FILTER;
   }
   return layer;
 }