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

package/CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - 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,6 +13,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- 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.
@@ -25,27 +26,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 - v5.0.2 - Fix sidcEdgeIcon docs PR#289.
 - v5.0.1 - Fix isArray error PR #288.
 - v5.0.0 - v5.0.0 - Feedback cleanup PR#281, edgeicons option PR#287, bump libs for vuln fixes.
-- v4.9.0 - If payload.flag is two char ISO code replace it with flag emoji. Revert part of PR #271
-- v4.8.1 - Slight tidy of some of the geojson handling
-- v4.8.0 - Merged PR for feedback functionality cleanup and example. PR #271 and #272
-- v4.7.0 - Update pmtiles library, fix feedback function inconsistency. Issue #270
-- v4.6.5 - Let geojson allow for generic overrides with .icon and .layer.
-- v4.6.4 - Fix deletion of layers logic to actually fully remove points.
-- v4.6.3 - Fix sending of layer events when not wanted. Issue #262
-- v4.6.2 - Fix multiple use of contextmenu feedback. Issue #259
-- v4.6.1 - Let default pmtiles be light/dark or monocolored.
-- v4.5.2 - Tidy up when pmtiles removed.
-- v4.5.0 - Fix pmtiles to look for maps in userdir rather than modules
-- v4.4.0 - Add quad(copter) drone icon.
-- v4.3.3 - Fix for objects changing layers.
-- v4.3.2 - Fix geojson popup missing label name.
-- v4.3.1 - Small fix to icon transparency, and routing detail.
-- v4.3.0 - Add support for PMtiles files.
-- v4.2.1 - Revert use of optional chaining to extend life slightly. Issue #252
-- v4.2.0 - Let icons also be inline images data:image... 
-- v4.1.0 - Add optional SOG, COG, altft, altm input properties.
-- v4.0.0 - Breaking - Better context menu variable substitution and retention
-            Now uses ${name} syntax rather than $name so we can handle user defined variables in context menus.
+
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 
@@ -723,7 +704,7 @@ There are some internal functions available to make interacting with Node-RED ea
 
  - **addToForm()** : takes a property name value pair to add to a variable called `form`. When used with contextmenu feedback (above) you can set the feedback value to `"_form"` to substitute this accumulated value. This allows you to do things like `onBlur='addToForm(this.name,this.value)'` over several different fields in the menu and then use `feedback(this.name,"_form")` to submit them all at once. For example a simple multiple line form could be as per the example below:
 
- Also if you wish to retain the values between separate openings of this form you can assign property names to the value field in the form `value="${foo}`, etc. These will then appear as part of an **value** property on the worldmap-in node message.
+Retain Values - If you wish to retain the values between separate openings of this form you can assign property names to the value field in the form `value="${foo}`, etc. These will then appear as part of an **value** property on the worldmap-in node message.
 
 ```
 var menu = 'Add some data <input name="foo" value="${foo}" onchange=\'addToForm(this.name,this.value)\'></input><br/>'
@@ -732,6 +713,23 @@ menu += '<button name="my_form" onclick=\'feedback(this.name,"_form","formAction
 msg.payload = { command: { "contextmenu":menu } }
 ```
 
+Custom Feedback Content - The example below shows how you can pass the latitude and longitude location value from the contextmenu popup when right clicking the map. You can also use this method with other data you wish.
+
+```
+var menu ='<center><br/>';
+menu += 'Add some data <input type="text" id="foo" placeholder="foo"><br/>';
+menu += 'Add more data <input type="text" id="bar" placeholder="bar"><br/>';
+menu += '<input type="button" value="Submit" onclick=';
+menu += '\'feedback("myform",{';
+menu += '"foo":document.getElementById("foo").value,';
+menu += '"bar":document.getElementById("bar").value,';
+menu += '"lat":rclk.lat.toFixed(12),';
+menu += '"lon":rclk.lng.toFixed(12),';
+menu += '},"formAction",true)\' > <br/><br/> ';
+msg.payload = { command: { "contextmenu":menu } }
+```
+For a more detailed example flow using this method see: [Moving Icons Demo & Builder](https://github.com/dceejay/RedMap/blob/master/examples/Moving%20Icons%20Demo%20%26%20Builder.json)
+
  - **delMarker()** : takes the name of the marker as a parameter. In a popup this can be specified as `${name}` for dynamic substitution.
 
  - **editPoly()** : takes the name of the shape or line as a parameter. In a popup this can be specified as `${name}` for dynamic substitution.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.1.2",
+    "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
                 }
             }
@@ -494,7 +499,7 @@ module.exports = function(RED) {
                 }
             }
             if (msg.payload?.command?.clear) {
-                if (!isArray(msg.payload?.command?.clear)) {
+                if (!Array.isArray(msg.payload?.command?.clear)) {
                     msg.payload.command.clear = [ msg.payload.command.clear ]
                 }
                 msg.payload.command.clear.forEach(function(el) {
@@ -508,7 +513,7 @@ module.exports = function(RED) {
                 })
             }
             if (msg.payload?.command?.clearlayer) {
-                if (!isArray(msg.payload?.command?.clearlayer)) {
+                if (!Array.isArray(msg.payload?.command?.clearlayer)) {
                     msg.payload.command.clearlayer = [ msg.payload.command.clearlayer ]
                 }
                 msg.payload.command.clearlayer.forEach(function(el) {