signalk-polar-performance-plugin 0.0.34 → 0.0.36

package/package.json

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

package/plugin/index.js

@@ -164,11 +164,11 @@ module.exports = function (app) {
       deltas.forEach(delta => {
 	      // app.debug('handleData: %s', JSON.stringify(delta))
 	      if (delta.path == 'navigation.speedThroughWater') {
-	        STW = applyDamping (delta.value, 'BSP', options.dampingBSP || 0)
+	        STW = applyDamping (delta.value, 'STW', options.dampingBSP || 0)
           BSP = STW
 	        // app.debug('speedThroughWater (STW): %d', STW)
 	      } else if (delta.path == 'navigation.speedOverGround') {
-	        SOG = applyDamping (delta.value, 'BSP', options.dampingBSP || 0)
+	        SOG = applyDamping (delta.value, 'SOG', options.dampingBSP || 0)
           BSP = SOG
 	        // app.debug('speedThroughWater (STW): %d', STW)
 	      } else if (delta.path == 'navigation.headingTrue') {
@@ -195,6 +195,10 @@ module.exports = function (app) {
     function sendUpdates (perfObj) {
       let values = []
       let metas = []
+      values.push({path: 'performance.boatSpeedDamped', value: roundDec(BSP)})
+      metas.push({path: 'performance.boatSpeedDamped', value: {"units": "m/s"}})
+      values.push({path: 'environment.wind.angleTrueWaterDamped', value: roundDec(TWA)})
+      metas.push({path: 'environment.wind.angleTrueWaterDamped', value: {"units": "rad"}})
       if (typeof perfObj.beatAngle != 'undefined') {
         if (options.beatAngle == true) {
           values.push({path: 'performance.beatAngle', value: roundDec(perfObj.beatAngle)})
@@ -409,6 +413,7 @@ module.exports = function (app) {
       }
       // Calculate polar performance ratio
       if (typeof performance.polarSpeed != 'undefined') {
+        app.debug('performance.polarSpeedRatio = BSP (%s)/ performance.polarSpeed (%s)', msToKts(BSP).toFixed(2), msToKts(performance.polarSpeed).toFixed(2))
         performance.polarSpeedRatio = BSP / performance.polarSpeed
         if (options.VMG == true) {
           performance.velocityMadeGood = Math.abs(BSP * Math.cos(TWA))

package/public/index.html

@@ -8,13 +8,51 @@
 <canvas id="myChart" style="width:100%;max-width:1200px"></canvas>
 
 <script>
+
+var polarSpeed, boatSpeed, TWA
+var myChart, chartData
+
 $.getJSON("/plugins/signalk-polar-performance-plugin/chartData", function(json) {
-  showChart(json)
+
+  // Add actual values dots
+  json.datasets.unshift({
+    label: 'Polar Speed',
+    backgroundColor: 'rgba(0,255,0,0.7)',
+    borderColor: 'rgba(0,255,0,0.2)',
+    borderWidth: 1,
+    radius: 30,
+    type: 'bubble',
+    data: [
+      {
+        y: 0,
+        x: 0,
+        r: 10
+      }
+    ]
+  },
+  {
+    label: 'Boat Speed',
+    backgroundColor: 'rgba(0,150,255,0.7)',
+    borderColor: 'rgba(0,150,255,0.2)',
+    borderWidth: 1,
+    radius: 30,
+    type: 'bubble',
+    data: [
+      {
+        y: 0,
+        x: 0,
+        r: 10
+      }
+    ]
+  })
+
+  chartData = json
+  showChart(chartData)
 })
 
 function showChart (data) {
   console.log(data)
-  new Chart("myChart", {
+  myChart = new Chart("myChart", {
     type: "scatter",
     data: data,
     options: {
@@ -104,5 +142,92 @@ function showChart (data) {
   ctx.style.backgroundColor = 'rgba(0,0,0,0.8)'
   ctx.style.fontColor = 'white'
 }
+
+
+function connect () {
+  console.log("connect()")
+  ws = new WebSocket((window.location.protocol === 'https:' ? 'wss' : 'ws') + "://" + window.location.host + "/signalk/v1/stream?subscribe=none");
+  ws.onopen = function() {
+    
+    // Start listening for value updates
+    startListeners();
+
+    ws.onmessage = function(event) {
+      if (event.data.includes('signalk-server')) {
+        welcomeMessage = event.data;
+        console.log("Skipping welcome message: " + welcomeMessage)
+      } else {
+        handleData(JSON.parse(event.data));
+      }
+    }
+
+    ws.onclose = function() {
+      console.log("WebSocket closed")
+    }
+
+    ws.onerror = function(err) {
+      console.log("WebSocket connection error: " + err.message + " - closing connection");
+    }
+    
+  }
+}
+
+function startListeners () {
+  var paths = [{'path': 'environment.wind.angleTrueWaterDamped'}, {'path': 'performance.polarSpeed'}, {'path': 'performance.boatSpeedDamped'}]
+
+  var subscriptionObject = {
+    "context": "vessels.self",
+    "policy" : "ideal",
+    "minPeriod": 2000,
+    "subscribe": paths
+  }
+
+  var subscriptionMessage = JSON.stringify(subscriptionObject);
+  console.log("subscriptionMessage: " + subscriptionMessage);
+  ws.send(subscriptionMessage);
+}
+
+function handleData (data) {
+  if (typeof data.updates[0].meta != 'undefined') {
+    return
+  }
+  var path = data.updates[0].values[0].path
+  var value = data.updates[0].values[0].value
+
+  if (path == 'performance.polarSpeed') {
+    polarSpeed = msToKts(value)
+    // console.log('polarSpeed set to %s', polarSpeed)
+    chartData.datasets[0].data[0].y = polarSpeed
+  } else if (path == 'environment.wind.angleTrueWaterDamped') {
+    TWA = radToDeg(value)
+    // 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)
+    // console.log('boatSpeed set to %s', boatSpeed)
+    chartData.datasets[1].data[0].y = boatSpeed
+  }
+}
+
+
+connect()
+
+setInterval(updateChart, 300)
+
+function updateChart () {
+  myChart.update()
+}
+
+function radToDeg(radians) {
+  return radians * 180 / Math.PI
+}
+
+function msToKts(ms) {
+  return ms * 1.94384
+}
+
+
+
 </script>