signalk-polar-performance-plugin 0.0.28 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-polar-performance-plugin",
-  "version": "0.0.28",
+  "version": "0.0.31",
   "description": "A plugin that calculates performance information based on a (CSV) polar diagram.",
   "main": "plugin/index.js",
   "scripts": {

package/plugin/index.js

@@ -299,6 +299,7 @@ module.exports = function (app) {
 	            let VMGLower = polar[indexTWS]['Beat VMG']
 	            let VMGUpper = polar[indexTWS+1]['Beat VMG']
 	            performance.beatVMG = VMGLower + ((VMGUpper - VMGLower) * twsGapRatio)
+	            performance.targetVMG = performance.beatVMG
             }
 	        } else {
             // app.debug('Downwind')
@@ -322,6 +323,7 @@ module.exports = function (app) {
 	            let VMGUpper = polar[indexTWS+1]['Run VMG']
 	          //app.debug('VMGLower: %s VMGUpper: %s', VMGLower, VMGUpper)
 	            performance.runVMG = VMGLower + ((VMGUpper - VMGLower) * twsGapRatio)
+	            performance.targetVMG = performance.runVMG
             }
           }
           // Calculate opposite Tack True
@@ -408,7 +410,7 @@ module.exports = function (app) {
         performance.polarSpeedRatio = BSP / performance.polarSpeed
         if (options.VMG == true) {
           performance.velocityMadeGood = Math.abs(BSP * Math.cos(TWA))
-          performance.polarVelocityMadeGood = Math.abs(performance.targetVelocityMadeGood * Math.cos(targetTWA))
+          performance.polarVelocityMadeGood = performance.targetVMG
           performance.polarVelocityMadeGoodRatio = performance.velocityMadeGood / performance.polarVelocityMadeGood
         }
       } else {
@@ -671,12 +673,26 @@ module.exports = function (app) {
 			    // Doesn't exist yet, make obj for unit
 			    damping[unit] = {Yn: Xn, dt: Date.now()}
 			  }
+        // Edge case when hovering around -pi and +pi
+        if (Xn > Math.PI && damping[unit].Yn < (0-Math.PI)) {
+          Xn = Xn - (2*Math.PI)
+        } else if (Xn < (0-Math.PI) && damping[unit].Yn > Math.PI) {
+          Xn = Xn + (2*Math.PI)
+        }
 	      // Calculate a
 	      let dt = (Date.now() - damping[unit].dt)/1000
 	      damping[unit].dt = Date.now()
 	      let a = dt / (RC + dt)
 			  // Yn = (1-a) * Yn-1 + a * Xn
 			  let Yn = (1-a) * (damping[unit].Yn || Xn) + a * Xn
+
+        // Fix is we go outside -pi to pi
+        if (Yn > Math.PI) {
+          Yn = Yn - Math.PI
+        } else if (Yn < (0-Math.PI)) {
+          Yn = Yn + Math.PI
+        }
+
 			  // Remember Yn
 			  damping[unit].Yn = Yn
 			  // app.debug('Unit: %s  dt: %d  a: %d  obj: %s', unit, dt, a, JSON.stringify(damping[unit]))