@chrtco/sdk 0.10.23 → 0.10.25

package/dist/index.cjs

@@ -4764,7 +4764,7 @@ var S52_DAY = {
   SNDG1: "#7d898c",
   SNDG2: "#070707",
   DEPSC: "#525a5c",
-  DEPCN: "#7d898c",
+  DEPCN: "#555555",
   // Utility / infrastructure
   UINFD: "#070707",
   UINFF: "#7d898c",
@@ -4838,7 +4838,7 @@ var S52_DUSK = {
   SNDG1: "#606060",
   SNDG2: "#b0b0b0",
   DEPSC: "#606060",
-  DEPCN: "#606060",
+  DEPCN: "#2E2E2E",
   UINFD: "#b0b0b0",
   UINFF: "#606060",
   UINFR: "#b05060",
@@ -4909,7 +4909,24 @@ var S52_NIGHT = {
   SNDG1: "#383028",
   SNDG2: "#c8aa78",
   DEPSC: "#383028",
-  DEPCN: "#383028",
+  // ⚠ DELIBERATE DEVIATION from the published S-52 NIGHT value (#1f2223),
+  // recorded here because `docs/validation/s52-spec-gap-matrix.json` tracks
+  // this token as `value-differs` and the CHRTstyles programme is bringing
+  // colours TO spec — this one moves further away, on purpose.
+  //
+  // Spec NIGHT DEPCN is near-black, which measures ~1.1:1 against this
+  // palette's own deep water (#051a28). S-52's NIGHT table assumes a
+  // dark-adapted eye in a darkened wheelhouse; on a phone or a laptop at
+  // anchor it is not dim, it is absent — reported as "can't see bottom
+  // contours in night mode only". A contour nobody can see fails the
+  // standard's intent while matching its number.
+  //
+  // The palette already makes this trade elsewhere and in the same
+  // direction: NIGHT's CHBLK/CSTLN/OUTLW are #c8aa78, light warm linework on
+  // dark water. This value is that family, dimmed to stay subordinate to the
+  // coastline. Revisit with the CHRTstyles programme, which owns the
+  // spec-vs-legibility call across all 63 tokens.
+  DEPCN: "#A68E84",
   UINFD: "#c8aa78",
   UINFF: "#383028",
   UINFR: "#682030",
@@ -5843,7 +5860,16 @@ var S52_LOOKUP = {
     category: "Depths",
     displayCategory: "STANDARD",
     int1Ref: "I30",
-    style: { type: "line", paint: { "line-color": "CHGRD", "line-width": 0.5 } },
+    // S-52 names a dedicated depth-contour colour, and this used the shared
+    // chart-grey instead. Reported 2026-09-02: "can't see bottom contours in
+    // night mode only" — measured at 1.06:1 against the deepest NIGHT water,
+    // which is invisible. DAY was 2.00:1 and DUSK 1.63:1 off the same token,
+    // so the bug was worst where the palette is darkest.
+    //
+    // CHGRD is shared by dozens of linestyles (s52-linestyles-generated.ts),
+    // so it could not be retuned for contours without moving all of them.
+    // DEPCN exists in all three palettes and is the token S-52 specifies.
+    style: { type: "line", paint: { "line-color": "DEPCN", "line-width": 0.5 } },
     viewingGroup: 13030,
     scamin: 45e3
   },
@@ -22653,13 +22679,23 @@ var HAS_OBJNAM = [
   ["has", "OBJNAM"],
   ["!=", ["coalesce", ["get", "OBJNAM"], ""], ""]
 ];
+var OBJNAM_TEXT = [
+  "case",
+  [
+    "all",
+    ["has", "NOBJNM"],
+    [">=", ["index-of", "?", ["coalesce", ["get", "OBJNAM"], ""]], 0]
+  ],
+  ["get", "NOBJNM"],
+  ["get", "OBJNAM"]
+];
 function catalogueNamePairs(acronym) {
   const names = s57NameTable(acronym);
   return Object.keys(names).map(Number).sort((a, b) => a - b).map((code) => [String(code), names[code]]);
 }
 function buildLandmarkLabelExpression() {
   const categoryExpr = listAttrCase("CATLMK", catalogueNamePairs("CATLMK"), "");
-  const base = ["case", HAS_OBJNAM, ["get", "OBJNAM"], categoryExpr];
+  const base = ["case", HAS_OBJNAM, OBJNAM_TEXT, categoryExpr];
   const conspic = s57AbbrTable("CONVIS")[1] ?? "";
   const conspicExpr = [
     "case",
@@ -22678,7 +22714,7 @@ function buildHarbourFacilityLabelExpression() {
   return [
     "case",
     HAS_OBJNAM,
-    ["get", "OBJNAM"],
+    OBJNAM_TEXT,
     listAttrCase("CATHAF", catalogueNamePairs("CATHAF"), "")
   ];
 }
@@ -23235,31 +23271,37 @@ function extractNavAidDesignation(objnam) {
   return token;
 }
 function navAidDesignationTextExpression(objnam, colourPrefix) {
-  const len = ["length", objnam];
+  const name = ["var", "navAidName"];
+  const len = ["length", name];
   const tokenBranches = [];
   for (let k = 1; k <= 4; k++) {
     tokenBranches.push(
       [
         "all",
         [">", len, k],
-        ["==", ["slice", objnam, ["-", len, k + 1], ["-", len, k]], " "]
+        ["==", ["slice", name, ["-", len, k + 1], ["-", len, k]], " "]
       ],
-      ["slice", objnam, ["-", len, k]]
+      ["slice", name, ["-", len, k]]
     );
   }
   return [
     "let",
-    "desig",
-    ["case", ...tokenBranches, ""],
+    "navAidName",
+    objnam,
     [
-      "case",
+      "let",
+      "desig",
+      ["case", ...tokenBranches, ""],
       [
-        "any",
-        ["==", ["var", "desig"], ""],
-        ["match", ["var", "desig"], [...NAV_DESIGNATION_STOPWORDS], true, false]
-      ],
-      ["concat", colourPrefix, objnam],
-      ["concat", colourPrefix, '"', ["var", "desig"], '"']
+        "case",
+        [
+          "any",
+          ["==", ["var", "desig"], ""],
+          ["match", ["var", "desig"], [...NAV_DESIGNATION_STOPWORDS], true, false]
+        ],
+        ["concat", colourPrefix, name],
+        ["concat", colourPrefix, '"', ["var", "desig"], '"']
+      ]
     ]
   ];
 }
@@ -23366,7 +23408,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildLandRegionTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         // Tier-1 entry moved from z5 to z7: undersea-relief names without a
         // generic keyword ("Three Dory", "Outer Fall") can't be demoted by
         // pattern, so the overview/general bands stay clean by holding ALL
@@ -23435,7 +23477,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BOYLAT":
       return {
         type: "symbol",
-        textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
+        textField: ["coalesce", ["get", "_navAidLabel"], OBJNAM_TEXT],
         textSize: NAV_AID_LABEL_TEXT_SIZE,
         textFont: NAV_AID_LABEL_FONT,
         textColor: DARK_BG,
@@ -23448,7 +23490,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BCNLAT":
       return {
         type: "symbol",
-        textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
+        textField: ["coalesce", ["get", "_navAidLabel"], OBJNAM_TEXT],
         textSize: NAV_AID_LABEL_TEXT_SIZE,
         textFont: NAV_AID_LABEL_FONT,
         textColor: DARK_BG,
@@ -23462,7 +23504,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BCNCAR":
       return {
         type: "symbol",
-        textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
+        textField: ["coalesce", ["get", "_navAidLabel"], OBJNAM_TEXT],
         textSize: NAV_AID_LABEL_TEXT_SIZE,
         textFont: NAV_AID_LABEL_FONT,
         textColor: DARK_BG,
@@ -23476,7 +23518,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BCNSPP":
       return {
         type: "symbol",
-        textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
+        textField: ["coalesce", ["get", "_navAidLabel"], OBJNAM_TEXT],
         textSize: NAV_AID_LABEL_TEXT_SIZE,
         textFont: NAV_AID_LABEL_FONT,
         textColor: DARK_BG,
@@ -23490,7 +23532,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BOYSAW":
       return {
         type: "symbol",
-        textField: ["coalesce", ["get", "_navAidLabel"], ["get", "OBJNAM"]],
+        textField: ["coalesce", ["get", "_navAidLabel"], OBJNAM_TEXT],
         textSize: NAV_AID_LABEL_TEXT_SIZE,
         textFont: NAV_AID_LABEL_FONT,
         textColor: DARK_BG,
@@ -23548,7 +23590,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildSeaAreaTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         // Default tier (CATSEA=0, uncategorised: canyons, seamounts, fishing
         // banks etc.) is suppressed at overview/general/coastal scales because
         // it floods the overview with hundreds of small italic labels that
@@ -23670,7 +23712,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildLakeTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: tieredSizeCurve(tierExpr, [
           [7, [9, 0]],
           [9, [11, 0]],
@@ -23691,7 +23733,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildRiverTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: tieredSizeCurve(tierExpr, [
           [7, [9, 0]],
           [9, [11, 0]],
@@ -23711,7 +23753,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "CANALS":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: [
           "interpolate",
           ["linear"],
@@ -23735,7 +23777,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildLandAreaTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         // Tier 2 is the SMALL island — the one the owner cannot identify.
         // Its old curve peaked at 10 px and fell to 10 px, i.e. it never got
         // its own scale: a name that only exists because you zoomed in was
@@ -23767,7 +23809,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildBuiltUpAreaTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: tieredSizeCurve(tierExpr, [
           [3, [11, 0, 0]],
           [5, [13, 0, 0]],
@@ -23791,7 +23833,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BRIDGE":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 9,
         textColor: "#bfa88a",
         textHaloColor: DARK_BG,
@@ -23810,7 +23852,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "PILPNT":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: "#c8c0b0",
         textHaloColor: DARK_BG,
@@ -23821,7 +23863,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "MORFAC":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: "#c8c0b0",
         textHaloColor: DARK_BG,
@@ -23832,7 +23874,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "SLCONS":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: "#bfa88a",
         textHaloColor: DARK_BG,
@@ -23847,7 +23889,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BUISGL":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: DARK_BG,
         textHaloColor: "#c8c0b0",
@@ -23863,7 +23905,7 @@ function getLabelConfig(layerName, opts = {}) {
       const tierExpr = buildAirportTierExpression();
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: tieredSizeCurve(tierExpr, [
           [7, [9, 0]],
           [9, [11, 0]],
@@ -23947,7 +23989,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "PRDARE":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: [
           "interpolate",
           ["linear"],
@@ -27327,7 +27369,7 @@ function buildNavAidLabelExpression() {
     // doesn't precompute `_navAidLabel`, so before this expression every
     // production buoy label carried its full 30-40 glyph OBJNAM, the
     // biggest single driver of Harbor/Approach label overprint (E3).
-    navAidDesignationTextExpression(["get", "OBJNAM"], colourPrefix),
+    navAidDesignationTextExpression(OBJNAM_TEXT, colourPrefix),
     ""
   ];
 }
@@ -27743,7 +27785,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
           "icon-allow-overlap": true,
           "icon-ignore-placement": false,
           "symbol-placement": "point",
-          "text-field": ["case", ["has", "OBJNAM"], ["get", "OBJNAM"], ""],
+          "text-field": ["case", ["has", "OBJNAM"], OBJNAM_TEXT, ""],
           "text-size": ["interpolate", ["linear"], ["zoom"], 11, 9, 16, 11],
           "text-anchor": "top",
           "text-offset": [0, 1.4],
@@ -28460,6 +28502,18 @@ function buildLabelLayer2(objectClass, ct, sourceId = DEFAULT_REGION, depthUnits
         ["round", ["*", ["to-number", ["get", "VALDCO"]], 3.28084]],
         "ft"
       ];
+    } else if (objectClass === "UWTROC" || objectClass === "OBSTRN" || objectClass === "WRECKS") {
+      const valsouFt = [
+        "to-number",
+        ["coalesce", ["get", "VALSOU"], ["get", "valsou"], 0],
+        0
+      ];
+      textField = [
+        "case",
+        [">", valsouFt, 0],
+        ["concat", ["to-string", ["round", ["*", valsouFt, 3.28084]]], "ft"],
+        ""
+      ];
     }
   }
   const labelPriority = getLabelPriority(objectClass);
@@ -29605,6 +29659,7 @@ var DOMINANCE_EXEMPT_CLASSES = /* @__PURE__ */ new Set([
   "RTPBCN",
   "RDOSTA"
 ]);
+var FINE_LAND_REPAINT_MIN_BAND = 4;
 function isDominanceExempt(layer) {
   for (const cls of DOMINANCE_EXEMPT_CLASSES) {
     if (layer.id.startsWith(`s52-${cls}-`)) return true;
@@ -30046,6 +30101,7 @@ function generateStyle(palette = "DAY", opts = {}) {
   }
   const symbolSet = opts.symbolSet ?? "s52";
   const spriteBase = `${opts.tileBaseUrl ?? "https://tiles.chrt.co"}/v1/sprites`;
+  const glyphsBase = `${opts.tileBaseUrl ?? "https://tiles.chrt.co"}/v1/glyphs`;
   const isLndareFill = (l) => /^s52-LNDARE-fill-band\d+$/.test(l.id);
   const isWaterBaseFill = (l) => /^s52-(DEPARE|DRGARE|UNSARE)-fill-band\d+$/.test(l.id);
   const bandOf = (l) => {
@@ -30113,6 +30169,20 @@ function generateStyle(palette = "DAY", opts = {}) {
             repaint.push(domVariant);
           }
         }
+        if (parseInt(b, 10) >= FINE_LAND_REPAINT_MIN_BAND) {
+          for (const l of relocated.filter(
+            (x) => bandOf(x) === b && isLndareFill(x)
+          )) {
+            const src = l;
+            const landClone = {
+              ...l,
+              id: `${src.id}-overpair`,
+              metadata: { ...src.metadata ?? {}, "chrt:role": "charted-land-repaint" }
+            };
+            delete landClone.maxzoom;
+            repaint.push(landClone);
+          }
+        }
       }
       const isCoalneLine = (l) => /^s52-COALNE-line-band\d(-domBy\d)?$/.test(l.id);
       for (const l of layers.filter(isCoalneLine)) {
@@ -30187,7 +30257,23 @@ function generateStyle(palette = "DAY", opts = {}) {
     ...symbolSet !== "s101" && {
       sprite: `${spriteBase}/${symbolSet}-${palette.toLowerCase()}`
     },
-    glyphs: "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
+    // ⚠ DEPLOY ORDER. This URL is baked into the style by callers on BOTH
+    // sides: the tile-worker's /v1/styles route AND the app's own
+    // `generateStyle` call in ChartCanvas.tsx, which ships from Railway on a
+    // SEPARATE deploy from the Workers. The glyph objects must be in R2 and
+    // the /v1/glyphs route live BEFORE any client asks for this URL — if the
+    // frontend ships first, every label on the chart goes blank, not just the
+    // ones with an ʻokina. Land the tile-worker deploy first, or revert this
+    // one line to the openmaptiles URL to fall back.
+    //
+    // Self-hosted, beside the sprite sheets on the same host. Was
+    // fonts.openmaptiles.org, whose 2013-vintage Open Sans has NO GLYPH for
+    // U+02BB ʻOKINA (a CONSONANT in Hawaiian) or five other codepoints that
+    // occur in NOAA names — MapLibre draws a missing glyph as nothing, so
+    // "Island of Hawaiʻi" rendered with a hole in it. Our ranges keep every
+    // upstream glyph byte-identical and composite only those six in from
+    // Noto Sans; see scripts/generate-glyphs.mjs.
+    glyphs: `${glyphsBase}/{fontstack}/{range}.pbf`,
     layers: emitted
   };
   if (symbolSet === "s101") return applyS101SymbolSet(style);