@chrtco/sdk 0.10.25 → 0.10.27

package/CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to `@chrtco/sdk` will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+- **Sector-light arcs were drawn on the wrong side of the light.**
+  `buildSectorArcGeoJSON()` / `buildSectorArcsFC()` painted each sector at the
+  raw `SECTR1`/`SECTR2` bearing measured from the light. S-57 charts those
+  limits as bearings FROM SEAWARD (the light as seen from the vessel), so every
+  arc — and its limit ticks — landed on the reciprocal side: a Maine light
+  charted white 000°–180° / red 180°–000° showed white over the island and red
+  over the channel. Both builders now apply the 180° reciprocal (new export
+  `sectorLimitToArcBearing()`); bearing labels still print the charted value.
+  `SectorInfo.sectorStart`/`sectorEnd` are documented as charted from-seaward
+  values and are unchanged.
+- **All-round lights co-located with sector lights were not drawn.**
+  `buildSectorsFromFeatures()` skipped any `LIGHTS` feature without
+  `SECTR1`/`SECTR2`, so a light like Isle au Haut (`Fl R 4s` all-round plus a
+  white 034°–060° sector) showed the white arc and no red at all. Per S-52
+  LIGHTS05 the all-round light is now emitted over the arc its sectored
+  siblings leave uncovered (new export `uncoveredSectorArcs()`; entries carry
+  `SectorInfo.allRound: true`). A lone all-round light still adds no arc.
+
 ### Added
 - **`StyleGeneratorOptions.labels`** — `"legacy"` (default) or `"placename"`.
   `"placename"` swaps the 9 orientation classes' 54-layer per-band label fan

package/dist/index.cjs

@@ -213,8 +213,10 @@ __export(index_exports, {
   sanitizeCustomStyleConfig: () => sanitizeCustomStyleConfig,
   scaleSizeValue: () => scaleSizeValue,
   scaminToMinZoom: () => scaminToMinZoom,
+  sectorLimitToArcBearing: () => sectorLimitToArcBearing,
   styleModeBand: () => styleModeBand,
   tileTemplate: () => tileTemplate,
+  uncoveredSectorArcs: () => uncoveredSectorArcs,
   withinBboxFilter: () => withinBboxFilter,
   worldMinusBboxPolygon: () => worldMinusBboxPolygon
 });
@@ -3388,13 +3390,54 @@ function buildFlashPattern(decoded) {
   const totalCycle = phases.reduce((sum, p) => sum + p.duration, 0);
   return { phases, totalCycle, notation };
 }
+function uncoveredSectorArcs(sectors) {
+  const norm = (d) => (d % 360 + 360) % 360;
+  const flat = [];
+  for (const sec of sectors) {
+    const a = norm(sec.sectorStart);
+    let sweep = norm(sec.sectorEnd) - a;
+    if (sweep <= 0) sweep += 360;
+    if (sweep >= 360) return [];
+    const b = a + sweep;
+    if (b <= 360) flat.push([a, b]);
+    else {
+      flat.push([a, 360]);
+      flat.push([0, b - 360]);
+    }
+  }
+  if (flat.length === 0) return [{ start: 0, end: 0 }];
+  flat.sort((x, y) => x[0] - y[0]);
+  const merged = [];
+  for (const [a, b] of flat) {
+    const last = merged[merged.length - 1];
+    if (last && a <= last[1]) last[1] = Math.max(last[1], b);
+    else merged.push([a, b]);
+  }
+  const gaps = [];
+  let cursor = 0;
+  for (const [a, b] of merged) {
+    if (a > cursor) gaps.push([cursor, a]);
+    cursor = Math.max(cursor, b);
+  }
+  if (cursor < 360) gaps.push([cursor, 360]);
+  if (gaps.length >= 2 && gaps[0][0] === 0 && gaps[gaps.length - 1][1] === 360) {
+    const first = gaps.shift();
+    const last = gaps.pop();
+    gaps.push([last[0], first[1]]);
+  }
+  return gaps.filter(([a, b]) => Math.abs(b - a) >= 0.05 || b < a).map(([a, b]) => ({ start: norm(a), end: norm(b) }));
+}
 function buildSectorsFromFeatures(features) {
   const sectors = [];
+  const allRound = [];
   for (const f of features) {
     const props = f.properties ?? {};
     const s1 = props.SECTR1 != null ? Number(props.SECTR1) : null;
     const s2 = props.SECTR2 != null ? Number(props.SECTR2) : null;
-    if (s1 == null || s2 == null || isNaN(s1) || isNaN(s2)) continue;
+    if (s1 == null || s2 == null || isNaN(s1) || isNaN(s2)) {
+      if (props.SECTR1 == null && props.SECTR2 == null && parseCode(props.COLOUR) != null) allRound.push(props);
+      continue;
+    }
     const colourCode = parseCode(props.COLOUR);
     const ce = colourCode ? COLOUR_TABLE[colourCode] : null;
     const litchrCode = parseCode(props.LITCHR);
@@ -3413,15 +3456,44 @@ function buildSectorsFromFeatures(features) {
       nominalRange
     });
   }
+  if (sectors.length > 0 && allRound.length > 0) {
+    const gaps = uncoveredSectorArcs(sectors);
+    for (const props of allRound) {
+      const colourCode = parseCode(props.COLOUR);
+      const ce = colourCode ? COLOUR_TABLE[colourCode] : null;
+      if (!ce) continue;
+      const litchrCode = parseCode(props.LITCHR);
+      const le = litchrCode ? LITCHR_TABLE[litchrCode] : null;
+      const sigper = props.SIGPER != null ? Number(props.SIGPER) : null;
+      const group = parseGroup(props.SIGGRP);
+      const notation = buildNotation(le?.abbr ?? null, [ce.abbr], sigper, group);
+      const valnmr = props.VALNMR != null ? Number(props.VALNMR) : null;
+      const nominalRange = valnmr != null && !isNaN(valnmr) && valnmr > 0 ? valnmr : null;
+      for (const gap of gaps) {
+        sectors.push({
+          sectorStart: gap.start,
+          sectorEnd: gap.end,
+          colour: ce.name,
+          colourHex: ce.hex,
+          notation,
+          nominalRange,
+          allRound: true
+        });
+      }
+    }
+  }
   return sectors;
 }
+function sectorLimitToArcBearing(limitDegFromSeaward) {
+  return ((limitDegFromSeaward + 180) % 360 + 360) % 360;
+}
 function buildSectorArcGeoJSON(center, startBearing, endBearing, radiusNm = 0.5, innerRadiusNm = 0, steps = 64) {
   const radiusDeg = radiusNm / 60;
   const innerDeg = innerRadiusNm > 0 ? innerRadiusNm / 60 : 0;
   const [lng, lat] = center;
   const cosLat = Math.cos(lat * Math.PI / 180);
-  const s = (startBearing % 360 + 360) % 360;
-  const e = (endBearing % 360 + 360) % 360;
+  const s = sectorLimitToArcBearing(startBearing);
+  const e = sectorLimitToArcBearing(endBearing);
   let sweep = e - s;
   if (sweep <= 0) sweep += 360;
   const project = (bearingDeg, rDeg) => {
@@ -3476,7 +3548,7 @@ function buildSectorArcsFC(center, sectors, radiusNm = 0.4, innerRadiusFrac = 0.
   const TICK_INNER_OVERHANG = 0.93;
   for (const sec of sectors) {
     for (const bearing of [sec.sectorStart, sec.sectorEnd]) {
-      const rad = bearing * Math.PI / 180;
+      const rad = sectorLimitToArcBearing(bearing) * Math.PI / 180;
       const radiusDeg = radiusNm / 60;
       const innerRadiusDeg = innerNm > 0 ? innerNm / 60 : 0;
       const cosLat = Math.cos(center[1] * Math.PI / 180);
@@ -28637,6 +28709,9 @@ function bandVariantMinzoom(layer, B) {
   if (isExemptOpaqueFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
     return classMinzoom;
   }
+  if (isExemptOpaqueFill(layer)) {
+    return BAND_PRIORITY_RANGES[B].minzoom;
+  }
   return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
 }
 var GENERALISED_AREA_FILL_CLASSES = /* @__PURE__ */ new Set([
@@ -30037,7 +30112,9 @@ function generateStyle(palette = "DAY", opts = {}) {
       }
     }
     {
-      const TERMINAL_FILL_RE = /^s52-(?:LNDARE|DEPARE)-fill-band[456]$/;
+      const TERMINAL_FILL_RE = new RegExp(
+        `^s52-(?:${[...DOMINANCE_EXEMPT_FILL_CLASSES].join("|")})-fill-band[456]$`
+      );
       for (const l of layers) {
         const lay = l;
         if (!TERMINAL_FILL_RE.test(lay.id)) continue;
@@ -30175,7 +30252,7 @@ function generateStyle(palette = "DAY", opts = {}) {
           )) {
             const src = l;
             const landClone = {
-              ...l,
+              ...asBaseTan(l),
               id: `${src.id}-overpair`,
               metadata: { ...src.metadata ?? {}, "chrt:role": "charted-land-repaint" }
             };
@@ -30211,6 +30288,21 @@ function generateStyle(palette = "DAY", opts = {}) {
         ...restAbove.slice(pairAt + 1)
       ];
     }
+    {
+      const hsAt = restFinal.findIndex(
+        (l) => l.type === "hillshade"
+      );
+      let lastRepaint = -1;
+      restFinal.forEach((l, i) => {
+        if (/-overpair(-|$)/.test(l.id)) lastRepaint = i;
+      });
+      if (hsAt !== -1 && lastRepaint > hsAt) {
+        const reordered = [...restFinal];
+        const [hs] = reordered.splice(hsAt, 1);
+        reordered.splice(lastRepaint, 0, hs);
+        restFinal = reordered;
+      }
+    }
     return [restFinal[0], ...baseBlock, ...seaare, ...ordered, ...restFinal.slice(1)];
   })() : layers;
   for (const id of [
@@ -31292,8 +31384,10 @@ var Chrt = class {
   sanitizeCustomStyleConfig,
   scaleSizeValue,
   scaminToMinZoom,
+  sectorLimitToArcBearing,
   styleModeBand,
   tileTemplate,
+  uncoveredSectorArcs,
   withinBboxFilter,
   worldMinusBboxPolygon
 });