signalk-polar-performance-plugin 0.0.37 → 0.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-polar-performance-plugin",
-  "version": "0.0.37",
+  "version": "0.0.40",
   "description": "A plugin that calculates performance information based on a (CSV) polar diagram.",
   "main": "plugin/index.js",
   "scripts": {
@@ -16,6 +16,10 @@
     "url": "https://github.com/htool/signalk-polar-performance-plugin/issues"
   },
   "homepage": "https://github.com/htool/signalk-polar-performance-plugin#readme",
+  "signalk": {
+    "appIcon": "./signalk-logo.png",
+    "displayName": "Polar Performance"
+  },
   "keywords": [
     "signalk-webapp",
     "signalk-node-server-plugin",

package/plugin/index.js

@@ -88,7 +88,6 @@ module.exports = function (app) {
   plugin.start = function (options, restartPlugin) {
     // Here we put our plugin logic
     app.debug('Plugin started');
-    var unsubscribes = [];
     app.debug('Options: %s', JSON.stringify(options))
 
     // Load polar table
@@ -163,14 +162,14 @@ module.exports = function (app) {
     function handleDelta (deltas) {
       deltas.forEach(delta => {
 	      // app.debug('handleData: %s', JSON.stringify(delta))
-	      if (delta.path == 'navigation.speedThroughWater') {
+	      if (delta.path == 'navigation.speedThroughWater' && options.useSOG == false) {
 	        STW = applyDamping (delta.value, 'STW', options.dampingBSP || 0)
           BSP = STW
 	        // app.debug('speedThroughWater (STW): %d', STW)
-	      } else if (delta.path == 'navigation.speedOverGround') {
+	      } else if (delta.path == 'navigation.speedOverGround' && options.useSOG == true) {
 	        SOG = applyDamping (delta.value, 'SOG', options.dampingBSP || 0)
           BSP = SOG
-	        // app.debug('speedThroughWater (STW): %d', STW)
+	        // app.debug('speedOverGround (SOG): %d', SOG)
 	      } else if (delta.path == 'navigation.headingTrue') {
 	        HDG = delta.value
 	        // app.debug('heading (HDG): %d', HDG)
@@ -728,16 +727,15 @@ module.exports = function (app) {
 
   plugin.stop = function () {
     // Here we put logic we need when the plugin stops
-    app.debug('Plugin stopped');
-    plugin.stop = function () {
-      unsubscribes.forEach(f => f());
-      unsubscribes = [];
-      timers.forEach(timer => {
-        clearInterval(timer)
-      }) 
-    };
-
-  };
+    app.debug('Plugin stopped')
+    app.debug('unsubscribes before: %s', JSON.stringify(unsubscribes))
+    unsubscribes.forEach(f => f())
+    unsubscribes = []
+    app.debug('unsubscribes after: %s', JSON.stringify(unsubscribes))
+    timers.forEach(timer => {
+      clearInterval(timer)
+    }) 
+  }
 
   return plugin;
 };

package/public/index.html

@@ -195,16 +195,16 @@ function handleData (data) {
   var value = data.updates[0].values[0].value
 
   if (path == 'performance.polarSpeed') {
-    polarSpeed = msToKts(value)
+    polarSpeed = roundDec(msToKts(value), 1)
     // console.log('polarSpeed set to %s', polarSpeed)
     chartData.datasets[0].data[0].y = polarSpeed
   } else if (path == 'environment.wind.angleTrueWaterDamped') {
-    TWA = radToDeg(value)
+    TWA = roundDec(radToDeg(value),1)
     // console.log('TWA set to %s', TWA)
     chartData.datasets[0].data[0].x = TWA
     chartData.datasets[1].data[0].x = TWA
   } else if (path == 'performance.boatSpeedDamped') {
-    boatSpeed = msToKts(value)
+    boatSpeed = roundDec(msToKts(value),1)
     // console.log('boatSpeed set to %s', boatSpeed)
     chartData.datasets[1].data[0].y = boatSpeed
   }
@@ -227,7 +227,14 @@ function msToKts(ms) {
   return ms * 1.94384
 }
 
-
+function roundDec (value, decimals) {
+  if (typeof value == 'undefined') {
+    return undefined
+  } else {
+    value = Number(value.toFixed(decimals))
+    return value
+  }
+}
 
 </script>