@sailingnaturali/signalk-dsc 0.3.1 → 0.4.0

package/README.md

@@ -48,8 +48,12 @@ For every DSC call heard by a connected radio:
   Full detail (MMSI, coordinates, reported time, transport) goes to the call
   log and the logbook entry instead, so TTS pipelines stay terse.
 - **Remote-vessel deltas** — the caller's `navigation.position` (and a distress
-  notification) under `vessels.urn:mrn:imo:mmsi:<caller>`, so chartplotters can
-  show where the call came from.
+  notification) under the caller's context, so chartplotters can show where the
+  call came from. A **distress** caller is emitted under the Search-and-Rescue
+  context `sar.urn:mrn:imo:mmsi:<caller>` — which plotters like
+  [Freeboard-SK](https://github.com/SignalK/freeboard-sk) render as a distress
+  (SaR) target rather than an ordinary AIS vessel; every other category stays
+  under `vessels.urn:mrn:imo:mmsi:<caller>`.
 - Every stored call carries an `ownShip` snapshot of the moment it arrived —
   position, course, heading, speed, wind, pressure, and (when a source publishes them)
   sea state, visibility, and cloud coverage. Absent sensor, absent field.

package/index.js

@@ -244,8 +244,14 @@ module.exports = function makePlugin(app) {
     return event;
   }
 
-  function remoteContext(mmsi) {
-    return `vessels.urn:mrn:imo:mmsi:${mmsi}`;
+  // The SignalK context the caller's position is emitted under. A distress
+  // caller is a vessel in extremis, so it goes under the Search-and-Rescue
+  // context (`sar.`) — which chartplotters (e.g. Freeboard-SK) render as a
+  // distress/SaR target rather than an ordinary AIS vessel. Every other
+  // category stays under `vessels.` like any AIS contact.
+  function callerContext(category, mmsi) {
+    const prefix = category === 'distress' ? 'sar' : 'vessels';
+    return `${prefix}.urn:mrn:imo:mmsi:${mmsi}`;
   }
 
   // Custom sentence parsers override the stock hooks (a superset of the
@@ -263,8 +269,8 @@ module.exports = function makePlugin(app) {
         receivedAt: input.tags && input.tags.timestamp,
       });
 
-      // Upstream-compatible delta under the sender's context so chartplotters
-      // and AIS-style consumers see the caller's position.
+      // Delta under the caller's context so chartplotters and AIS-style
+      // consumers see the caller's position (distress → SaR target).
       if (parsed.mmsi) {
         const values = [];
         if (parsed.position) {
@@ -281,7 +287,10 @@ module.exports = function makePlugin(app) {
           });
         }
         if (values.length) {
-          return { context: remoteContext(parsed.mmsi), updates: [{ values }] };
+          return {
+            context: callerContext(parsed.category, parsed.mmsi),
+            updates: [{ values }],
+          };
         }
       }
     } catch (err) {
@@ -306,7 +315,7 @@ module.exports = function makePlugin(app) {
       const refined = refinePosition(target.position, ext);
       store.update(target.id, { position: refined, positionResolution: 'enhanced' });
       return {
-        context: remoteContext(ext.mmsi),
+        context: callerContext(target.category, ext.mmsi),
         updates: [{ values: [{ path: 'navigation.position', value: refined }] }],
       };
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailingnaturali/signalk-dsc",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Receive, log, and alert on DSC (VHF digital selective calling) calls — distress, urgency, safety, routine — from NMEA 0183 ($CDDSC/$CDDSE) and NMEA 2000 (PGN 129808).",
   "main": "index.js",
   "scripts": {