@meri-imperiumi/signalk-dead-reckoning 0.14.0 → 0.14.2

package/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.14.2] - 2026-10-19
+
+### Fixed
+- **Routes and tracks crossing the antimeridian no longer draw a line around the planet.** An active-route leg straddling ±180° longitude (Fiji↔Samoa, Tonga's eastern islands, the Bering Strait) rendered as a horizontal stroke spanning the whole chart width — Leaflet joins two raw longitudes straight through the primary world frame instead of hopping the seam. Route lines draw unwrapped (`vm.unwrapLineLongitudes`: every point shifted ±360° onto the previous point's longitude strip) and repeat on the ±360° world copies the view can sit over (`vm.worldCopies`), so the leg renders as the short hop over the dateline with waypoint markers and the "next" emphasis intact; the ghost (DR) and GPS tracks get the same treatment, as a boat logging fixes across the seam produced the identical artifact in its track.
+
+## [0.14.1] - 2026-10-19
+
+### Added
+- **Warning region shapes on the chart (signalk-passage-briefing work doc #48).** The passage-briefing plugin now publishes METAREA and CAP warning areas as `regions` resources (native Polygon/MultiPolygon features paired with their point notes) — the chart draws them: fetched with the same view-scoped query as the notes (`/signalk/v2/api/resources/regions`, matched by geometry-bbox distance), rendered on a "Regions" layers-control toggle mounted by default, in the plugin console's visual language — severity red for `GALE`/`HURRICANE`/`DENSE FOG`/… keyword texts (the shared highlighter), bulletin orange otherwise, heavier stroke for severe, and a dashed outline for the briefing plugin's own bbox-approximate areas (the honesty cue that the shape is the queried bbox). Rings unwrap against the view's longitude frame so a METAREA spanning the dateline draws as one polygon, and both published geometry shapes are accepted (standard-nested and the bulletin engine's flat coordinate chains). A note whose region shape draws stays hidden — the extent renders once — and clicking a shape opens the pick menu at the clicked point with the href-paired note's detail (title, body, Edit/Delete), the same surface as clicking the note marker.
+- **The chart pick menu shows the clicked coordinates** (helm request): the picked position renders in the watchkeeper's own position format (decimal/DM/DMS, shared with the sight panel) above the bearing and distance rows.
+
+### Fixed
+- **Radar-range chart picks seed the clicked object's coordinates again.** `seedObjectPosition` looked the coord fieldset up at shadow-root level, and both the vertical (distance-CPL) and radar forms carry a `data-prefix="center"` fieldset — the query returned the vertical form's (first in document order), so a "Radar range at" pick switched to the radar tab but filled the hidden distance-CPL form, leaving the radar form's Object position empty. The lookup is now scoped to the switched-to form.
+
+### Changed
+- **Chartplotter zoom and follow-mode handling (helm feedback).** Wheel zoom is now continuous and fast: Leaflet's stock ScrollWheelZoom — which quantizes each debounced wheel burst to whole zoom levels and plays an animation per level (a jerky staircase), and whose sigmoid curve is meaningless under fractional zoom, making a detent move the chart ~0.01 levels — is replaced by a custom rAF-batched handler: wheel deltas accumulate per animation frame and apply as an un-animated fractional zoom at stock Leaflet speed (~one level per detent) with no jumps and no debounce lag. The anchor is follow-aware across every zoom gesture and locked to the BOAT'S POSITION rather than the map center: the wheel handler re-centers each animation frame on the DR position (the center can drift from the vessel between ticks — keyboard pans never fire dragstart, extensions may recenter — and anchoring the center would freeze that drift for the whole gesture, which read as "zoom snaps to whatever was the map center"), while pinch snaps the boat to center at touchstart (before Leaflet captures the gesture anchor) and double-click snaps back after Leaflet's center jump; with follow off the gestures anchor at the cursor as before, and follow is authoritative over the view while engaged: the ◎ re-center pans to the follow target un-animated (immediately) — the live DR position, falling back to the GNSS fix while the DR engine is idle so the button never engages into a silent no-op, with the camera locked onto DR once its positions flow (`vm.followTarget`: a live DR position always wins, so GPS fixes ticking faster than the DR engine cannot drag the view between the two marks; a stale DR position transfers to the fix exactly once, and DR resuming takes the camera back), the keyboard pan handler stands down while following (arrow pans never fire dragstart, so the view would otherwise drift off the vessel and snap back at the next DR tick), and the plotter-extension `map.center`/`map.fitBounds` affordances are refused with a `VIEW_LOCKED` error while follow is engaged (the host reads the lock through a dedicated `getFollow` accessor — `getMap` keeps returning the raw Leaflet map the overlay machinery hooks) — freeform view moves happen only once follow is released. Also moved `customElements.define("dr-map-view")` after the `NauticalScaleControl` class declaration — the synchronous upgrade of an in-DOM element runs `connectedCallback` → `initMap` → `new NauticalScaleControl()`, which threw "Cannot access before initialization" on any page where the element exists before the module evaluates (found by driving the map headless). Follow mode is now **off by default** — the map still opens centered on the vessel (one-shot fit on the first GPS fix, or the first DR position when no fix has arrived) but the helm keeps control of the view. The ◎ button is a real toggle: click to engage follow (and pan to the DR position, clearing the settle window so it always takes effect at once), click again to let go; dragging the chart lets go as before. The zoom-dependent re-renders (range rings, laylines, downstream note refetch) run on a trailing debounce instead of per zoom step.
+
 ## [0.14.0] - 2026-10-18
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meri-imperiumi/signalk-dead-reckoning",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "Offline-first dead reckoning and sensor fusion engine for Signal K",
   "main": "plugin/index.js",
   "scripts": {

package/public/dr-app.js

@@ -140,10 +140,7 @@ template.innerHTML = /* html */ `
        look, the glance gets the gist. */
     .dr-status {
       margin: 0;
-      max-width: 22rem;
       white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
       font-family: ui-monospace, "Fira Code", monospace;
       font-size: 0.75rem;
       color: var(--text-muted);
@@ -158,8 +155,7 @@ template.innerHTML = /* html */ `
       --theme-color: var(--color-green);
       color: var(--color-green);
     }
-    .dr-status.alert,
-    .dr-status.retrying {
+    .dr-status.alert {
       --theme-color: var(--color-red);
       color: var(--color-red);
       font-weight: 600;
@@ -179,29 +175,44 @@ template.innerHTML = /* html */ `
       background: var(--color-teal);
       color: var(--bg-base);
     }
-    /* Failover control — top-right panel, inline with the status
-       badge: one row, same vertical size as the tools panel. Alternate-
-       power semantics: orange, red when engaged (DR authoritative).
-       The button keeps its minimum width — SPEC §14.1: prominent,
-       always human-initiated. */
+    /* Stream link badge — [ONLINE]/[OFFLINE], color-coded; the full
+       connection detail (reconnecting…, which endpoint) rides the
+       badge's tooltip. */
+    .dr-link {
+      font-family: ui-monospace, "Fira Code", monospace;
+      font-size: 0.75rem;
+      color: var(--color-orange);
+    }
+    .dr-link.online {
+      color: var(--color-green);
+    }
+    .dr-link.offline {
+      color: var(--color-red);
+      font-weight: 600;
+    }
+    /* Failover control — top-right panel, one compact badge row:
+       [ONLINE] DR[ON] GNSS[OK] [OVERRIDE]. Alternate-power semantics:
+       orange, red when engaged (DR authoritative). The button stays
+       prominent (SPEC §14.1: always human-initiated) without eating
+       the top bar. */
     .dr-gps {
       display: flex;
       flex-direction: row;
       align-items: center;
       justify-content: flex-end;
-      gap: 0.75rem;
+      gap: 0.5rem;
       flex-wrap: wrap;
     }
     .dr-override {
       display: flex;
       align-items: center;
       justify-content: flex-end;
-      gap: 0.75rem;
+      gap: 0.4rem;
       flex-wrap: wrap;
     }
     .dr-override button {
       --theme-color: var(--color-orange);
-      min-width: 13rem;
+      min-width: 5.5rem;
     }
     .dr-override button.engaged,
     .dr-override button.engaged:hover,
@@ -218,6 +229,9 @@ template.innerHTML = /* html */ `
       letter-spacing: 0.08em;
       color: var(--text-muted);
     }
+    .dr-override #dr-override-state.off {
+      color: var(--color-orange);
+    }
     /* Pending-observations drawer: docked left, below the entry
        tools; the list scrolls inside, the panel never grows past the
        viewport. The whole box (toggle included) disappears when there
@@ -357,7 +371,6 @@ template.innerHTML = /* html */ `
       }
       .dr-status {
         font-size: 0.7rem;
-        max-width: 14rem;
       }
       .dr-override button {
         min-width: 11rem;
@@ -421,19 +434,20 @@ template.innerHTML = /* html */ `
       <div class="dr-top-col">
         <section class="sk-floating dr-tools">
           <button id="btn-sight">⊕ Sight / LOP</button>
-          <button id="btn-coord-fix" title="Confirm a fix at coordinates — prefilled from the current GNSS position, editable for offline/known-position fixes">⊙ Fix at coordinates</button>
+          <button id="btn-coord-fix" title="Fix at coordinates — prefilled from the current GNSS position, editable for offline/known-position fixes">⊙ FIX AT</button>
           <button id="btn-pending" aria-expanded="false" aria-controls="dr-pending-drawer" hidden>◧ Pending</button>
         </section>
         <dr-ext-widget-area anchor="top-left"></dr-ext-widget-area>
       </div>
       <div class="dr-top-col dr-top-col-right">
         <section class="sk-floating dr-gps">
-          <div class="dr-status" id="dr-status-panel">
-            <span id="dr-status-text">Connecting to Signal K…</span>
+          <span class="dr-link" id="dr-link" title="Connecting to Signal K…">[CONNECTING…]</span>
+          <div class="dr-status" id="dr-status-panel" title="No dead-reckoning data">
+            <span id="dr-status-text">DR[—]</span>
           </div>
           <div class="dr-override">
-            <button id="dr-override-btn">Engage OVERRIDE</button>
-            <span id="dr-override-state">NORMAL (GPS authoritative)</span>
+            <span id="dr-override-state" title="Normal — the GNSS fix is authoritative">GNSS[OK]</span>
+            <button id="dr-override-btn" title="Toggle DR-authoritative override — while engaged the dead-reckoned position steers the chart and the GNSS fix is not trusted">OVERRIDE</button>
           </div>
         </section>
         <dr-ext-widget-area anchor="top-right"></dr-ext-widget-area>
@@ -783,6 +797,11 @@ class DrApp extends HTMLElement {
      * source of truth is the server's v2 resources API; the cache lets
      * saves update markers without a full refetch. */
     this.notesById = new Map();
+    /** Signal K regions cache (passage-briefing work doc #48): id →
+     * region resource. The warning shapes published alongside the
+     * notes — fetched with the same view-scoped query, drawn on the
+     * chart as polygon extents. */
+    this.regionsById = new Map();
     /** Bounds the last in-view notes fetch covered (fetchNotesInView
      * margin guard) — null until the first view-driven fetch.
      * @type {{west: number, south: number, east: number, north: number}|null} */
@@ -906,6 +925,7 @@ class DrApp extends HTMLElement {
       // The chart, once it exists — map overlays composite onto it and
       // the map capability reads/drives its viewport.
       getMap: () => this.map?.map ?? null,
+      getFollow: () => this.map?.follow ?? false,
     });
     // The host hooks the Leaflet events itself, but discovery can land
     // before the chart exists — forward the element's own view-change
@@ -1256,15 +1276,32 @@ class DrApp extends HTMLElement {
   async fetchNotes(view) {
     try {
       const query = view ? `?${vm.notesViewQuery(view)}` : "";
-      const res = await fetch(`/signalk/v2/api/resources/notes${query}`);
-      if (!res.ok) return;
-      const collection = await res.json();
-      if (view) {
-        for (const [id, note] of Object.entries(collection ?? {})) {
-          this.notesById.set(id, note);
+      const [notesRes, regionsRes] = await Promise.all([
+        fetch(`/signalk/v2/api/resources/notes${query}`),
+        fetch(`/signalk/v2/api/resources/regions${query}`),
+      ]);
+      if (notesRes.ok) {
+        const collection = await notesRes.json();
+        if (view) {
+          for (const [id, note] of Object.entries(collection ?? {})) {
+            this.notesById.set(id, note);
+          }
+        } else {
+          this.notesById = new Map(Object.entries(collection ?? {}));
+        }
+      }
+      // Regions ride the same view-scoped query: the regions provider
+      // matches by geometry-bbox distance (a region has no position
+      // of its own — the paired note is the queryable anchor).
+      if (regionsRes.ok) {
+        const collection = await regionsRes.json();
+        if (view) {
+          for (const [id, region] of Object.entries(collection ?? {})) {
+            this.regionsById.set(id, region);
+          }
+        } else {
+          this.regionsById = new Map(Object.entries(collection ?? {}));
         }
-      } else {
-        this.notesById = new Map(Object.entries(collection ?? {}));
       }
       this.renderNotes();
     } catch {
@@ -1296,8 +1333,16 @@ class DrApp extends HTMLElement {
 
   /** @returns {void} */
   renderNotes() {
-    const collection = Object.fromEntries(this.notesById);
-    this.map?.renderNotes(vm.notesRenderSpecs(collection), this.notesById);
+    const notes = Object.fromEntries(this.notesById);
+    const regions = Object.fromEntries(this.regionsById);
+    const referenceLon = this.map?.map?.getCenter()?.lng ?? null;
+    const shapes = vm.regionShapes(regions, referenceLon);
+    this.map?.renderRegions(shapes, this.regionsById);
+    // A note whose region shape draws stays hidden: the region carries
+    // the warning's true extent, the note is its anchored detail — the
+    // pair renders once (href-linked, `*-area-` ids).
+    const drawn = new Set(shapes.map((shape) => shape.id));
+    this.map?.renderNotes(vm.notesRenderSpecs(notes, drawn), this.notesById);
   }
 
   /**
@@ -1964,18 +2009,21 @@ class DrApp extends HTMLElement {
   renderOverride(active) {
     if (!this.btn || !this.stateLabel) return;
     this.btn.classList.toggle("engaged", active);
-    this.btn.textContent = active ? "Release OVERRIDE" : "Engage OVERRIDE";
-    this.stateLabel.textContent = active
-      ? "OVERRIDE (DR authoritative)"
-      : "NORMAL (GPS authoritative)";
+    this.stateLabel.classList.toggle("off", active);
+    this.stateLabel.textContent = active ? "GNSS[OFF]" : "GNSS[OK]";
+    this.stateLabel.title = active
+      ? "Override engaged — the dead-reckoned position is authoritative; the GNSS fix is not trusted"
+      : "Normal — the GNSS fix is authoritative";
   }
 
   /**
-   * Renders the DR engine state — explains why the readout is empty
-   * when idle (moored, no speed/heading) so the user isn't left
-   * guessing.
+   * Renders the DR engine state as a compact badge (DR[ON], DR[IDLE],
+   * DR[FOULED]…) with the full explanatory text on the badge's
+   * tooltip — the helm reads the row at a glance and hovers for the
+   * why.
    *
-   * @param {{status: string, reason?: string}|null} value
+   * @param {{status: string, reason?: string, moving?: boolean,
+   *   fouled?: boolean, transient?: boolean}|null} value
    * @returns {void}
    */
   renderDrState(value) {
@@ -1983,43 +2031,54 @@ class DrApp extends HTMLElement {
     const text = this.shadowRoot.querySelector("#dr-status-text");
     if (!panel || !text) return;
     panel.classList.remove("idle", "underway", "alert", "transient");
-    if (!value) {
-      text.textContent = "No dead-reckoning data";
-      return;
+    let title = "No dead-reckoning data";
+    if (value) {
+      if (value.status === "idle") {
+        panel.classList.add("idle");
+        if (value.moving) panel.classList.add("alert");
+      } else if (value.status === "underway") {
+        panel.classList.add("underway");
+        if (value.fouled) panel.classList.add("alert");
+        else if (value.transient) panel.classList.add("transient");
+      } else if (value.status === "warm" && value.fouled) {
+        // The engine runs warm on a tied-up boat (SPEC §5) — muted,
+        // unless the speed sensor is crying wolf.
+        panel.classList.add("alert");
+      }
+      title =
+        vm.drStatusText({ ...value, navState: this.vesselNavState }) ?? title;
     }
-    if (value.status === "idle") {
-      panel.classList.add("idle");
-      if (value.moving) panel.classList.add("alert");
-    } else if (value.status === "underway") {
-      panel.classList.add("underway");
-      if (value.fouled) panel.classList.add("alert");
-      else if (value.transient) panel.classList.add("transient");
-    } else if (value.status === "warm") {
-      // Engine alive, boat tied up — muted, no status color crying wolf.
-      if (value.fouled) panel.classList.add("alert");
-    }
-    const next = vm.drStatusText({ ...value, navState: this.vesselNavState });
-    if (next != null) text.textContent = next;
+    text.textContent = vm.drStatusBadge(value);
+    panel.title = title;
   }
 
   /**
-   * Renders the stream link state so a dropped connection is visible
-   * immediately.
+   * Renders the stream link state as a compact [ONLINE]/[OFFLINE]
+   * badge (color-coded) with the full connection detail on its
+   * tooltip — a dropped connection is visible immediately without
+   * eating the top bar.
    *
    * @param {{state: "connecting"|"open"|"retrying"}} status
    * @returns {void}
    */
   renderLinkStatus(status) {
-    const panel = this.shadowRoot.querySelector("#dr-status-panel");
-    const text = this.shadowRoot.querySelector("#dr-status-text");
-    if (!panel || !text) return;
-    panel.classList.remove("retrying");
-    if (status.state === "connecting") {
-      text.textContent = "Connecting to Signal K…";
-    } else if (status.state === "retrying") {
-      panel.classList.add("retrying");
-      text.textContent = "Signal K link lost — reconnecting…";
-    } else if (status.state === "open") {
+    const link = this.shadowRoot.querySelector("#dr-link");
+    if (link) {
+      link.classList.remove("online", "offline");
+      if (status.state === "open") {
+        link.textContent = "[ONLINE]";
+        link.classList.add("online");
+        link.title = "Signal K stream connected";
+      } else if (status.state === "retrying") {
+        link.textContent = "[OFFLINE]";
+        link.classList.add("offline");
+        link.title = "Signal K link lost — reconnecting…";
+      } else {
+        link.textContent = "[CONNECTING…]";
+        link.title = "Connecting to Signal K…";
+      }
+    }
+    if (status.state === "open") {
       // Re-seed AIS static data on (re)connect (work doc #23) — names
       // and MMSIs don't ride position deltas.
       this.bootstrapAis();
@@ -2028,7 +2087,6 @@ class DrApp extends HTMLElement {
       // while offline) reappear without a page reload.
       this.fetchNotes();
     }
-    // "open" — let the DR state panel take over once data flows.
   }
 }
 

package/public/dr-ext-host.js

@@ -89,6 +89,9 @@ export class PlotterExtHost {
    * @param {() => object|null} [opts.getMap] - the Leaflet map once
    *   the chart exists (dr-app wires it to `<dr-map-view>`); null
    *   until then — the overlay machinery no-ops without a chart
+   * @param {() => boolean} [opts.getFollow] - whether center-on-vessel
+   *   (follow) is engaged: while it is, the view is locked and freeform
+   *   extension moves are refused
    * @param {{depth: string}} [opts.units] - the user's preferred units
    *   (`units.get`)
    * @param {Storage} [opts.storage]
@@ -99,6 +102,7 @@ export class PlotterExtHost {
     this.stream = opts.stream;
     this.mount = opts.mount;
     this.getMap = opts.getMap ?? (() => null);
+    this.getFollow = opts.getFollow ?? (() => false);
     this.units = opts.units ?? { depth: "m" };
     this.storage = opts.storage ?? globalThis.localStorage;
     this.fetchImpl = opts.fetchImpl ?? globalThis.fetch?.bind(globalThis);
@@ -629,6 +633,10 @@ export class PlotterExtHost {
         }
         const map = this.getMap?.();
         if (!map) throw notSupported("map");
+        // Center-on-vessel owns the view while engaged: the chart is
+        // locked on the DR position and freeform view moves (an
+        // extension's included) only happen once follow is released.
+        if (this.getFollow?.()) throw viewLocked("map.center");
         const zoom =
           params.zoom === undefined || params.zoom === null
             ? undefined
@@ -650,6 +658,7 @@ export class PlotterExtHost {
         }
         const map = this.getMap?.();
         if (!map) throw notSupported("map");
+        if (this.getFollow?.()) throw viewLocked("map.fitBounds");
         const [west, south, east, north] = b;
         // Antimeridian form (west > east): unwrap east so Leaflet's
         // bounds span the short way round.
@@ -1262,6 +1271,23 @@ function badParams(message) {
   });
 }
 
+/**
+ * The chart is locked on the vessel (center-on-vessel engaged) — view
+ * moves are refused until follow is released.
+ *
+ * @param {string} method - the refused affordance, for the message
+ * @returns {RpcError}
+ */
+function viewLocked(method) {
+  return new RpcError(
+    `${method} refused: the chart is locked on the vessel (center-on-vessel engaged) — release follow to move the view`,
+    {
+      code: RPC_ERRORS.HOST_ERROR,
+      reason: "VIEW_LOCKED",
+    },
+  );
+}
+
 /**
  * @param {unknown} keys
  * @returns {string[]|undefined}