@chrtco/sdk 0.10.23 → 0.10.24

package/dist/index.js

@@ -22431,13 +22431,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",
@@ -22456,7 +22466,7 @@ function buildHarbourFacilityLabelExpression() {
   return [
     "case",
     HAS_OBJNAM,
-    ["get", "OBJNAM"],
+    OBJNAM_TEXT,
     listAttrCase("CATHAF", catalogueNamePairs("CATHAF"), "")
   ];
 }
@@ -23013,31 +23023,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"], '"']
+      ]
     ]
   ];
 }
@@ -23144,7 +23160,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
@@ -23213,7 +23229,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,
@@ -23226,7 +23242,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,
@@ -23240,7 +23256,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,
@@ -23254,7 +23270,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,
@@ -23268,7 +23284,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,
@@ -23326,7 +23342,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
@@ -23448,7 +23464,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]],
@@ -23469,7 +23485,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]],
@@ -23489,7 +23505,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "CANALS":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: [
           "interpolate",
           ["linear"],
@@ -23513,7 +23529,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
@@ -23545,7 +23561,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]],
@@ -23569,7 +23585,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BRIDGE":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 9,
         textColor: "#bfa88a",
         textHaloColor: DARK_BG,
@@ -23588,7 +23604,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "PILPNT":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: "#c8c0b0",
         textHaloColor: DARK_BG,
@@ -23599,7 +23615,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "MORFAC":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: "#c8c0b0",
         textHaloColor: DARK_BG,
@@ -23610,7 +23626,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "SLCONS":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: "#bfa88a",
         textHaloColor: DARK_BG,
@@ -23625,7 +23641,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "BUISGL":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: 8,
         textColor: DARK_BG,
         textHaloColor: "#c8c0b0",
@@ -23641,7 +23657,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]],
@@ -23725,7 +23741,7 @@ function getLabelConfig(layerName, opts = {}) {
     case "PRDARE":
       return {
         type: "symbol",
-        textField: ["get", "OBJNAM"],
+        textField: OBJNAM_TEXT,
         textSize: [
           "interpolate",
           ["linear"],
@@ -27105,7 +27121,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),
     ""
   ];
 }
@@ -27521,7 +27537,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],
@@ -28238,6 +28254,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);
@@ -29824,6 +29852,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) => {
@@ -29965,7 +29994,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);