signalk-ais-navionics-converter 1.0.3 → 1.0.4

package/README.md

@@ -327,4 +327,6 @@ Issues and pull requests are welcome!
  - Changed to "Embedded Plugin Configuration Forms"
  ### Version 1.0.3
  - AIS message types for class A / B separated
- - AIS Websocket server added
+ - AIS Websocket server added
+ ### Version 1.0.4
+ - minor bug corrections for unavailable ROT / Heading

package/ais-encoder.js

@@ -173,17 +173,22 @@ computeAisSogCog(sogValue, sogUnits, cogValue, cogUnits, headingValue, headingUn
   // --- HEADING ---
   //
   // AIS: 511 = not available
-  let headingInt = 511;
+  const HEADING_UNAVALABLE=511
+  let headingInt = HEADING_UNAVALABLE;
 
   // Heading nur gültig, wenn SOG > 0 UND COG gültig
-  if (sogKn >= minAlarmSOG && cog10 !== 3600 && Number.isFinite(headingValue)) {
-
+   if (sogKn >= minAlarmSOG && cog10 !== 3600 && Number.isFinite(headingValue)) {
     let headingDeg;
-
+    
     if (headingUnits) {
       const u = headingUnits.toLowerCase();
       if (u.includes("rad")) {
-        headingDeg = headingValue * 180 / Math.PI;
+        if (units === "rad" && value > 2 * Math.PI) { 
+          // Wert ist definitiv falsch bwz. bei 8.91863247972741 genau gleich 511 Grad === unavailable 
+          headingInt = HEADING_UNAVALABLE;
+        }else{
+          headingDeg = headingValue * 180 / Math.PI;
+        }
       } else if (u.includes("deg")) {
         headingDeg = headingValue;
       } else {
@@ -196,11 +201,15 @@ computeAisSogCog(sogValue, sogUnits, cogValue, cogUnits, headingValue, headingUn
         ? headingValue * 180 / Math.PI
         : headingValue;
     }
-
-    headingDeg = ((headingDeg % 360) + 360) % 360;
-
-    headingInt = Math.round(headingDeg);
-    if (headingInt > 359) headingInt = 359;
+    // Filter für ungültige Werte
+    if (headingDeg >= 360 && headingDeg <= HEADING_UNAVALABLE) {
+      // Wert ist im "ungültig"-Bereich (360-511)
+      headingInt = HEADING_UNAVALABLE;
+    } else {
+      headingDeg = ((headingDeg % 360) + 360) % 360;
+      headingInt = Math.round(headingDeg);
+      if (headingInt > 359) headingInt = 359;
+    }
   }
 
   return { sog10, cog10, headingInt };
@@ -209,6 +218,7 @@ computeAisSogCog(sogValue, sogUnits, cogValue, cogUnits, headingValue, headingUn
 
 computeAisRot(rateValue, rateUnits) {
   // AIS default: ROT not available
+  const ROT_UNAVAILABLE = -2.23402144306284;
   let rot = -128; // standard -128 (unavailable)
 
   // Kein Wert → fertig
@@ -226,6 +236,9 @@ computeAisRot(rateValue, rateUnits) {
 
     if (u.includes("rad/s")) {
       // rad/s → deg/min
+      if (Math.abs(rate - ROT_UNAVAILABLE) < 1e-6) { 
+        return rot; // -128 
+      }
       rate = rate * (180 / Math.PI) * 60;
 
     } else if (u.includes("deg/s")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-ais-navionics-converter",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "SignalK plugin to convert AIS data to NMEA 0183 sentences to TCP clients (e.g. Navionics boating app, OpenCpn) and optional to vesselfinder.com",
   "main": "index.js",
   "keywords": [