node-red-contrib-web-worldmap 5.1.3 → 5.1.4

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
- - v5.1.3 - Fix clearlayer for tracks node.
+ - v5.1.4 - Fix clearlayer for tracks node.
  - v5.1.2 - Fix for longer line msg properties.
  - v5.1.1 - Fix CoT inline image.
  - v5.1.0 - Let special icons be sizeable using iconSize property.

package/README.md

@@ -13,7 +13,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
-- v5.1.3 - Fix clearlayer for tracks node.
+- v5.1.4 - Fix clearlayer for tracks node.
 - v5.1.2 - Fix for longer line msg properties.
 - v5.1.1 - Fix CoT inline image.
 - v5.1.0 - Let special icons be sizeable using iconSize property.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.1.3",
+    "version": "5.1.4",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "@turf/bezier-spline": "~7.2.0",

package/worldmap/worldmap.js

@@ -18,7 +18,7 @@ var menuOpen = false;
 var clusterAt = 0;
 var maxage = 900;   // default max age of icons on map in seconds - cleared after 15 mins
 var baselayername = "OSM grey";     // Default base layer OSM but uniform grey
-var pagefoot = " © DCJ 2023";
+var pagefoot = " © DCJ 2025";
 var inIframe = false;
 var showUserMenu = true;
 var showLayerMenu = true;
@@ -3346,7 +3346,7 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
 // handle TAK messages from TAK server tcp - XML->JSON
 function doTAKjson(p) {
     //console.log("TAK event",p);
-    if (p.type.indexOf('a-') === 0 || p.type.indexOf('b-m-p-') === 0 || p.type.indexOf('b-a-o-') === 0 || p.type.indexOf('b-a-g') === 0) {
+    if (p?.type && (p.type.indexOf('a-') === 0 || p.type.indexOf('b-m-p-') === 0 || p.type.indexOf('b-a-o-') === 0 || p.type.indexOf('b-a-g') === 0)) {
         var d = {};
         d.name = p.detail?.contact?.callsign || p.uid;
         d.lat = Number(p.point.lat);
@@ -3395,14 +3395,14 @@ function doTAKjson(p) {
         setMarker(d);
     }
     else {
-        console.log("Skip TAK type",p.type);
+        console.log("Skip TAK type",p?.type);
     }
 }
 
 // handle TAK messages from TAK Multicast - Protobuf->JSON
 function doTAKMCjson(p) {
     // console.log("TAK Multicast event",p);
-    if (p.type.indexOf('a') === 0) {
+    if (p?.type && p.type.indexOf('a') === 0) {
         var d = {};
         d.lat = p.lat;
         d.lon = p.lon;
@@ -3438,7 +3438,7 @@ function doTAKMCjson(p) {
         setMarker(d);
     }
     else {
-        console.log("Skip TAK type",p.type);
+        console.log("Skip TAK type",p?.type);
     }
 }
 

package/worldmap.js

@@ -402,6 +402,7 @@ module.exports = function(RED) {
 
         var doTrack = function(msg) {
             if (msg.hasOwnProperty("payload") && msg.payload.hasOwnProperty("name")) {
+                if (!msg.payload.layer) { msg.payload.layer = "unknown"; }
                 var newmsg = RED.util.cloneMessage(msg);
                 if (msg.payload.deleted) {
                     if (msg.payload.name.substr(-1) === '_') {
@@ -474,9 +475,13 @@ module.exports = function(RED) {
                             newmsg.payload.layer = newmsg.payload.layer.substr(1);
                         }
                     }
-                    if (node.layer === "single") {
+                    else if (node.layer === "single") {
                         newmsg.payload.layer = "Tracks";
                     }
+                    else {
+                        newmsg.payload.layer = msg.payload.layer;
+
+                    }
                     node.send(newmsg);  // send the track
                 }
             }