signalk-race-control 0.4.1 → 0.4.2

package/README.md

@@ -49,10 +49,10 @@ and a live projected finishing order — during and after the race.
   that name is added to any race. A boat that *is* VET-matched never has its TCF
   carried over this way — it always starts from the default until you pick a VET
   alternative or edit it again.
-- **MMSI, remembered across races** — set once per boat (or picked up automatically
-  from a live AIS/self vessel with a matching name), it's remembered in a small
-  cross-race registry: add a boat with the same name in a later race and its MMSI
-  fills in on its own.
+- **MMSI and sail number, remembered across races** — set once per boat (MMSI can
+  also be picked up automatically from a live AIS/self vessel with a matching name),
+  both are remembered in a small cross-race registry: add a boat with the same name
+  in a later race and its MMSI and sail number fill in on their own.
 - **Import a whole fleet from Manage2Sail** — off by default (`raceImportEnabled` in
   the plugin's settings, alongside `vetEnabled`); once turned on, an **Import boats
   from Manage2Sail** section lets you paste a Manage2Sail event URL, pick one or more

package/index.js

@@ -1335,9 +1335,10 @@ module.exports = function (app) {
 
   // Races are kept by id so several can be planned ahead and reviewed after
   // the fact, rather than a single race getting overwritten by Reset.
-  // boatRegistry is a separate, cross-race name->MMSI/TCF memory: once a
-  // boat's MMSI or (for boats outside VET) TCF is entered anywhere, it's
-  // applied automatically next time that name is used in any race.
+  // boatRegistry is a separate, cross-race name->MMSI/sail number/TCF
+  // memory: once a boat's MMSI, sail number, or (for boats outside VET) TCF
+  // is entered anywhere, it's applied automatically next time that name is
+  // used in any race.
   let state = { races: {}, order: [], currentRaceId: null, boatRegistry: {} };
   let dataFile = null;
   const scheduleTimers = new Map(); // raceId -> Timeout, for scheduledStart
@@ -1360,14 +1361,16 @@ module.exports = function (app) {
   }
 
   // Cross-race memory keyed by boat name, merging in whichever fields are
-  // given (mmsi and/or tcf) without clobbering the other. tcf is only ever
-  // written here for boats outside the VET register — see the callers.
+  // given (mmsi, sailNumber, and/or tcf) without clobbering the others. tcf
+  // is only ever written here for boats outside the VET register — see the
+  // callers.
   function upsertBoatRegistry(name, fields) {
     if (!name) return;
     const key = name.trim().toLowerCase();
     const existing = state.boatRegistry[key] || { name: name.trim() };
     existing.name = name.trim();
     if (fields.mmsi) existing.mmsi = String(fields.mmsi).trim();
+    if (fields.sailNumber) existing.sailNumber = String(fields.sailNumber).trim();
     if (fields.tcf != null) existing.tcf = fields.tcf;
     state.boatRegistry[key] = existing;
   }
@@ -1376,11 +1379,6 @@ module.exports = function (app) {
     return state.boatRegistry[(name || '').trim().toLowerCase()] || null;
   }
 
-  function lookupBoatRegistry(name) {
-    const entry = getRegistryEntry(name);
-    return entry ? entry.mmsi : null;
-  }
-
   // vetEnabled is a plugin config setting (Server -> Plugin Config), not
   // per-race and not editable from the webapp itself. Off by default — a
   // fresh install (or one that's never touched this setting) treats every
@@ -2165,23 +2163,26 @@ module.exports = function (app) {
       if (!name) {
         return res.status(400).json({ error: 'name is required' });
       }
+      const registryEntry = getRegistryEntry(name);
       const givenMmsi = ((req.body && req.body.mmsi) || '').toString().trim();
-      const mmsi = givenMmsi || lookupBoatRegistry(name);
+      const mmsi = givenMmsi || (registryEntry && registryEntry.mmsi) || null;
       if (mmsi) upsertBoatRegistry(name, { mmsi });
+      const givenSailNumber = ((req.body && req.body.sailNumber) || '').toString().trim();
+      const sailNumber = givenSailNumber || (registryEntry && registryEntry.sailNumber) || null;
+      if (sailNumber) upsertBoatRegistry(name, { sailNumber });
       const defaultTcf = (plugin.options && plugin.options.defaultTcf) || 1.0;
       // A remembered TCF only applies to boats outside VET — a VET-matched
       // boat should be picked fresh from the register's own dropdown rather
       // than silently carrying over a number from wherever it last raced.
       let tcf = defaultTcf;
-      if (!isVetMatch(name)) {
-        const remembered = getRegistryEntry(name);
-        if (remembered && remembered.tcf != null) tcf = remembered.tcf;
+      if (!isVetMatch(name) && registryEntry && registryEntry.tcf != null) {
+        tcf = registryEntry.tcf;
       }
       const boat = {
         id: makeBoatId(),
         name,
         mmsi: mmsi || null,
-        sailNumber: null,
+        sailNumber,
         tcf,
         finishTime: null,
         startTime: null,
@@ -2292,6 +2293,7 @@ module.exports = function (app) {
       if (!boat) return res.status(404).json({ error: 'No such boat' });
       const sailNumber = ((req.body && req.body.sailNumber) || '').toString().trim();
       boat.sailNumber = sailNumber || null;
+      if (boat.sailNumber) upsertBoatRegistry(boat.name, { sailNumber: boat.sailNumber });
       saveState();
       res.json(boat);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-race-control",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "SignalK plugin and webapp for tracking elapsed and handicap-corrected (Time-on-Time) race time, with a per-boat editable TCF and boat names pulled from AIS when available.",
   "main": "index.js",
   "keywords": [