node-red-contrib-web-worldmap 5.0.3 → 5.0.5

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+  - v5.0.5 - Tweak SIDC flag handling slightly.
+  - v5.0.4 - Tweak CoT handling slightly.
  - v5.0.3 - Add great context menu example flow. PR#290. Bump express lib. PR#291.
  - v5.0.2 - Fix sidcEdgeIcon docs PR#289.
  - v5.0.1 - Fix isArray error PR #288.

package/README.md

@@ -13,6 +13,8 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- v5.0.5 - Tweak SIDC flag handling slightly.
+- v5.0.4  - Tweak CoT handling slightly.
 - v5.0.3  - Add great context menu example flow. PR#290. Bump express lib. PR#291.
 - v5.0.2  - Fix sidcEdgeIcon docs PR#289.
 - v5.0.1  - Fix isArray error PR #288.

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.0.3",
+    "version": "5.0.5",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "@turf/bezier-spline": "~7.1.0",
         "cgi": "0.3.1",
-        "compression": "^1.7.4",
+        "compression": "^1.7.5",
         "express": "^4.21.1",
         "sockjs": "~0.3.24"
     },

package/worldmap/worldmap.js

@@ -2123,7 +2123,7 @@ function setMarker(data) {
         }
         opts.size = opts.size || sz;
         opts.size = opts.size * (opts.scale || 1);
-        if (data.SIDC.length > 12) {
+        if (data.SIDC.length > 12 && data.SIDC.substr(12,2) !== "**") {
             var cc = data.SIDC.substr(12,2).toLowerCase();
             opts.country = cc.toUpperCase();
             opts.staffComments = emojify(":flag-"+cc+":") + " " + (opts?.staffComments || "");
@@ -3319,19 +3319,28 @@ function doTAKjson(p) {
         d.lon = Number(p.point.lon);
         if (p.type.indexOf('a') === 0) {
             d.hdg = p.detail?.track?.course;
-            d.speed = p.detail?.track?.speed;
-            d.team = p.detail?.__group?.name;
-            d.team = d.team + ' <i style="color:' + d.team + '" class="fa fa-square"></i>';
+            if (p.detail?.track?.speed) {
+                d.speed = Number(p.detail?.track?.speed);
+                if (d.speed == 9999999 || d.speed == 0) { delete d.speed; }
+                else {
+                    d.speed = d.speed + " m/s";
+                    delete d.hdg;
+                    d.course = p.detail?.track?.course;
+                    d.options = { direction: d.course };
+                }
+            }
+            if (p.detail?.__group?.name) {
+                d.team = p.detail?.__group?.name;
+                d.team = d.team + ' <i style="color:' + d.team + '" class="fa fa-square"></i>';
+            }
             d.role = p.detail?.__group?.role;
         }
-        if (d.team == "undefined") { delete d.team; }
         d.type = p.type;
         d.remarks = p.detail?.remarks
         if (p.detail?.remarks && p.detail.remarks.hasOwnProperty["#text"]) {
             d.remarks = p.detail.remarks["#text"];
         }
         d.uid = p.uid;
-
         try {
             var st = (new Date(p.time)).getTime() / 1000;
             var et = (new Date(p.stale)).getTime() / 1000;
@@ -3340,11 +3349,11 @@ function doTAKjson(p) {
             d.ttl = parseInt(et-st);
         }
         catch(e) { console.log(e); }
-        d.alt = Number(p.point.hae) || 9999999;
-        if (d.alt && d.alt == 9999999) { delete d.alt; }
-        if (d.speed && d.speed == 9999999) { delete d.speed; }
-        if (d.hdg && d.hdg == 9999999) { delete d.hdg; }
         handleCoTtypes(d,p);
+        d.alt = Number(p.point.hae) || 9999999;
+        if (d?.alt && parseInt(d.alt) == 9999999) { delete d.alt; }
+        else { d.alt = d.alt + "m"; }
+        if (d?.hdg && parseInt(d.hdg) == 9999999) { delete d.hdg; }
         setMarker(d);
     }
     else {
@@ -3359,26 +3368,35 @@ function doTAKMCjson(p) {
         var d = {};
         d.lat = p.lat;
         d.lon = p.lon;
-        d.team = p.detail?.group?.name;
-        d.team = d.team + ' <i style="color:' + d.team + '" class="fa fa-square"></i>';
+        if (p.detail?.__group?.name) {
+            d.team = p.detail?.__group?.name;
+            d.team = d.team + ' <i style="color:' + d.team + '" class="fa fa-square"></i>';
+        }
         d.role = p.detail?.group?.role;
         d.type = p.type;
         d.uid = p.uid;
         d.name = p.detail?.contact?.callsign || p.uid;
         d.hdg = p.detail?.track?.course;
-        d.speed = p.detail?.track?.speed;
-        if (d.team == "undefined") { delete d.team; }
-
+        if (p.detail?.track?.speed) {
+            d.speed = Number(p.detail?.track?.speed);
+            if (d.speed == 9999999 || d.speed == 0) { delete d.speed; }
+            else {
+                d.speed = d.speed + " m/s";
+                delete d.hdg;
+                d.course = p.detail?.track?.course;
+                d.options = { direction: d.course };
+            }
+        }
         try {
             d.timestamp = (new Date(+p.sendTime)).toISOString();
             d.staletime = (new Date(+p.staleTime)).toISOString();
             d.ttl = parseInt((+p.staleTime / 1000) - (+p.sendTime / 1000));
         } catch(e) { console.log(e); }
+        handleCoTtypes(d,p);
         d.alt = p.hae || 9999999;
         if (d.alt && d.alt == 9999999) { delete d.alt; }
-        if (d.speed && d.speed == 9999999) { delete d.speed; }
+        else { d.alt = d.alt + "m"; }
         if (d.hdg && d.hdg == 9999999) { delete d.hdg; }
-        handleCoTtypes(d,p);
         setMarker(d);
     }
     else {