@meri-imperiumi/signalk-triplogger 1.1.0 → 1.2.0

package/.github/workflows/publish.yml

@@ -9,8 +9,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/checkout@v3.0.2
+      - uses: actions/setup-node@v3.4.1
         with:
           node-version: 12
       - run: npm install
@@ -20,8 +20,8 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/checkout@v3.0.2
+      - uses: actions/setup-node@v3.4.1
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/

package/.github/workflows/test.yml

@@ -10,9 +10,9 @@ jobs:
       matrix:
         node-version: [12.x]
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.1.5
+      uses: actions/setup-node@v3.4.1
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install
@@ -24,6 +24,6 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-    - uses: ridedott/merge-me-action@v2.9.110
+    - uses: ridedott/merge-me-action@v2.10.22
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/README.md

@@ -6,6 +6,10 @@ The plugin monitors vessel `navigation.state` as set by the [signalk-autostate](
 
 ## Changes
 
+* 1.2.0 (April 27th 2023)
+  - Added support for populating `navigation.log` for totals
+* 1.1.1 (February 28th 2023)
+  - Fix issue when `navigation.position` doesn't contain coordinates
 * 1.1.0 (March 4th 2022)
   - Persist logs for current day/month/year, also by sailing/motoring
 * 1.0.1 (February 18th 2022)

package/index.js

@@ -16,6 +16,7 @@ module.exports = (app) => {
     const dateString = new Date().toISOString();
     return [
       'current', // Current trip
+      'total', // Total log
       dateString.substr(0, 4), // Annual log
       dateString.substr(0, 7), // Monthly log
       dateString.substr(0, 10), // Daily log
@@ -74,6 +75,24 @@ module.exports = (app) => {
     function resetTrip() {
       logs.current.reset();
       const resetTime = logs.current.log.started;
+      const values = [
+        {
+          path: 'navigation.trip.log',
+          value: logs.current.log.total,
+        },
+        {
+          path: 'navigation.trip.lastReset',
+          value: resetTime,
+        },
+      ];
+      if (options.totals) {
+        const base = options.totals_base || 0;
+        values.push({
+          path: 'navigation.log',
+          value: logs.total.log.total + base,
+        });
+      }
+
       app.handleMessage(plugin.id, {
         context: `vessels.${app.selfId}`,
         updates: [
@@ -82,16 +101,7 @@ module.exports = (app) => {
               label: plugin.id,
             },
             timestamp: (new Date().toISOString()),
-            values: [
-              {
-                path: 'navigation.trip.log',
-                value: logs.current.log.total,
-              },
-              {
-                path: 'navigation.trip.lastReset',
-                value: resetTime,
-              },
-            ],
+            values,
           },
         ],
       });
@@ -106,6 +116,19 @@ module.exports = (app) => {
           return logs[logName].save();
         })))
         .then(() => {
+          const values = [
+            {
+              path: 'navigation.trip.log',
+              value: logs.current.log.total,
+            },
+          ];
+          if (options.totals) {
+            const base = options.totals_base || 0;
+            values.push({
+              path: 'navigation.log',
+              value: logs.total.log.total + base,
+            });
+          }
           app.handleMessage(plugin.id, {
             context: `vessels.${app.selfId}`,
             updates: [
@@ -114,12 +137,7 @@ module.exports = (app) => {
                   label: plugin.id,
                 },
                 timestamp: (new Date().toISOString()),
-                values: [
-                  {
-                    path: 'navigation.trip.log',
-                    value: logs.current.log.total,
-                  },
-                ],
+                values,
               },
             ],
           });
@@ -163,6 +181,10 @@ module.exports = (app) => {
               handleState(v.value);
             }
             if (v.path === 'navigation.position') {
+              if (Number.isNaN(Number(v.value.latitude))
+                || Number.isNaN(Number(v.value.longitude))) {
+                return;
+              }
               const newPosition = new Point(v.value.latitude, v.value.longitude);
               if (lastPosition) {
                 const distance = lastPosition.distanceTo(newPosition) * 1000;
@@ -198,6 +220,16 @@ module.exports = (app) => {
         default: 10000,
         title: 'How often to update log, in milliseconds',
       },
+      totals: {
+        type: 'boolean',
+        default: true,
+        title: 'Publish a total number in navigation.log',
+      },
+      totals_base: {
+        type: 'number',
+        default: 0,
+        title: 'Add this number to the totals (in meters)',
+      },
     },
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meri-imperiumi/signalk-triplogger",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Log the length of the current trip",
   "main": "index.js",
   "scripts": {
@@ -26,8 +26,8 @@
     "where": "^0.4.1"
   },
   "devDependencies": {
-    "eslint": "^7.14.0",
-    "eslint-config-airbnb-base": "^14.0.0",
+    "eslint": "^8.14.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.18.2"
   },
   "publishConfig": {