node-red-contrib-web-worldmap 5.1.6 → 5.3.0

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+ - v5.3.0 - Let msg.payload.popupOptions object set Leaflet popup options so it can be customised. Issue #311
+ - v5.2.0 - Allow left click send back co-ords. Let Button be replaceable more easily and take value property. Issue #308 and #309
  - v5.1.6 - Let Cot __milsym set the SIDC if present.
  - v5.1.5 - Fix links to SIDC unitgenerator so it is now local.
  - v5.1.4 - Fix clearlayer for tracks node.
@@ -8,13 +10,13 @@
  - v5.1.0 - Let special icons be sizeable using iconSize property.
  - v5.0.9 - Slight tidy on flags, bump turf dep.
  - v5.0.8 - Fix flag handling for SIDC 2525D, add example.
- - v5.0.7 - Allow Tooltip options (see new example). #PR295.
+ - v5.0.7 - Allow Tooltip options (see new example). PR #295.
  - v5.0.6 - Tweak SIDC flag handling slightly to show direction if available and moving.
  - 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.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.
- - v5.0.0 - Feedback cleanup PR#281, edgeicons option PR#287, bump libs for vuln fixes.
+ - 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

package/README.md

@@ -13,6 +13,8 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- v5.3.0 - Let msg.payload.popupOptions object set Leaflet popup options so it can be customised. Issue #311
+- v5.2.0 - Allow left click send back co-ords. Let Button be replaceable more easily and take value property. Issue #308 and #309
 - v5.1.6 - Let Cot __milsym set the SIDC if present.
 - v5.1.5 - Fix links to SIDC unitgenerator so it is now local.
 - v5.1.4 - Fix clearlayer for tracks node.
@@ -21,14 +23,13 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 - v5.1.0 - Let special icons be sizeable using iconSize property.
 - v5.0.9 - Slight tidy on flags, bump turf dep.
 - v5.0.8 - Fix flag handling for SIDC 2525D, add example.
-- v5.0.7 - Allow Tooltip options (see new example). #PR295.
+- v5.0.7 - Allow Tooltip options (see new example). PR #295.
 - v5.0.6 - Tweak SIDC flag handling slightly to show direction if available and moving.
 - 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.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.
-- v5.0.0 - v5.0.0 - Feedback cleanup PR#281, edgeicons option PR#287, bump libs for vuln fixes.
-
+- v5.0.0 - Feedback cleanup PR #281, edgeicons option PR #287, bump libs for vuln fixes.
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 
@@ -76,6 +77,7 @@ Optional properties for **msg.payload** include
  - **clickable** : Default true. Setting to false disables showing any popup.
  - **popped** : set to true to automatically open the popup info box, set to false to close it.
  - **popup** : html to fill the popup if you don't want the automatic default of the properties list. Using this overrides photourl, videourl and weblink options.
+ - **popupOptions** : optional object to help style the popup - See Leaflet popup docs for options - eg to add a custom class - `{className:"mySpecialPopup",width:600}`
  - **label** : displays the contents as a permanent label next to the marker, or
  - **tooltip** : displays the contents when you hover over the marker. (Mutually exclusive with label. Label has priority)
  - **tooltipOptions** : custom tooltip/label options  (offset, direction, permanent, sticky, interactive, opacity, className) )

package/node_modules/compression/HISTORY.md

@@ -1,3 +1,9 @@
+1.8.1 / 2025-07-17
+==========
+
+  * deps: on-headers@~1.1.0
+    - Fix [CVE-2025-7339](https://www.cve.org/CVERecord?id=CVE-2025-7339) ([GHSA-76c9-3jph-rj3q](https://github.com/expressjs/on-headers/security/advisories/GHSA-76c9-3jph-rj3q))
+
 1.8.0 / 2025-02-10
 ==================
 

package/node_modules/compression/README.md

@@ -46,7 +46,7 @@ as compressing will transform the body.
 #### Options
 
 `compression()` accepts these properties in the options object. In addition to
-those listed below, [zlib](http://nodejs.org/api/zlib.html) options may be
+those listed below, [zlib](https://nodejs.org/api/zlib.html) options may be
 passed in to the options object or
 [brotli](https://nodejs.org/api/zlib.html#zlib_class_brotlioptions) options.
 
@@ -55,7 +55,7 @@ passed in to the options object or
 Type: `Number`<br>
 Default: `zlib.constants.Z_DEFAULT_CHUNK`, or `16384`.
 
-See [Node.js documentation](http://nodejs.org/api/zlib.html#zlib_memory_usage_tuning)
+See [Node.js documentation](https://nodejs.org/api/zlib.html#zlib_memory_usage_tuning)
 regarding the usage.
 
 ##### filter
@@ -107,7 +107,7 @@ This specifies how much memory should be allocated for the internal compression
 state and is an integer in the range of `1` (minimum level) and `9` (maximum
 level).
 
-See [Node.js documentation](http://nodejs.org/api/zlib.html#zlib_memory_usage_tuning)
+See [Node.js documentation](https://nodejs.org/api/zlib.html#zlib_memory_usage_tuning)
 regarding the usage.
 
 ##### brotli
@@ -161,7 +161,7 @@ set a `Content-Length` response header.
 Type: `Number`<br>
 Default: `zlib.constants.Z_DEFAULT_WINDOWBITS`, or `15`
 
-See [Node.js documentation](http://nodejs.org/api/zlib.html#zlib_memory_usage_tuning)
+See [Node.js documentation](https://nodejs.org/api/zlib.html#zlib_memory_usage_tuning)
 regarding the usage.
 
 ##### enforceEncoding

package/node_modules/compression/package.json

@@ -1,7 +1,7 @@
 {
   "name": "compression",
   "description": "Node.js compression middleware",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "contributors": [
     "Douglas Christopher Wilson <doug@somethingdoug.com>",
     "Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)"
@@ -14,7 +14,7 @@
     "compressible": "~2.0.18",
     "debug": "2.6.9",
     "negotiator": "~0.6.4",
-    "on-headers": "~1.0.2",
+    "on-headers": "~1.1.0",
     "safe-buffer": "5.2.1",
     "vary": "~1.1.2"
   },
@@ -22,14 +22,14 @@
     "after": "0.8.2",
     "eslint": "7.32.0",
     "eslint-config-standard": "14.1.1",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.32.0",
     "eslint-plugin-markdown": "2.2.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "5.2.0",
     "eslint-plugin-standard": "4.1.0",
     "mocha": "9.2.2",
     "nyc": "15.1.0",
-    "supertest": "6.2.3"
+    "supertest": "6.3.4"
   },
   "files": [
     "LICENSE",

package/node_modules/on-headers/HISTORY.md

@@ -1,3 +1,8 @@
+1.1.0 / 2025-07-17
+==================
+  * - Fix [CVE-2025-7339](https://www.cve.org/CVERecord?id=CVE-2025-7339) ([GHSA-76c9-3jph-rj3q](https://github.com/expressjs/multer/security/advisories/GHSA-76c9-3jph-rj3q))
+
+
 1.0.2 / 2019-02-21
 ==================
 

package/node_modules/on-headers/README.md

@@ -2,9 +2,9 @@
 
 [![NPM Version][npm-version-image]][npm-url]
 [![NPM Downloads][npm-downloads-image]][npm-url]
-[![Node.js Version][node-version-image]][node-version-url]
-[![Build Status][travis-image]][travis-url]
-[![Test Coverage][coveralls-image]][coveralls-url]
+[![Node.js Version][node-image]][node-url]
+[![Build Status][ci-image]][ci-url]
+[![Coverage Status][coveralls-image]][coveralls-url]
 
 Execute a listener when a response is about to write headers.
 
@@ -70,12 +70,12 @@ $ npm test
 
 [MIT](LICENSE)
 
+[ci-image]: https://badgen.net/github/checks/jshttp/on-headers/master?label=ci
+[ci-url]: https://github.com/jshttp/on-headers/actions/workflows/ci.yml
 [coveralls-image]: https://badgen.net/coveralls/c/github/jshttp/on-headers/master
 [coveralls-url]: https://coveralls.io/r/jshttp/on-headers?branch=master
-[node-version-image]: https://badgen.net/npm/node/on-headers
-[node-version-url]: https://nodejs.org/en/download
+[node-image]: https://badgen.net/npm/node/on-headers
+[node-url]: https://nodejs.org/en/download
 [npm-downloads-image]: https://badgen.net/npm/dm/on-headers
 [npm-url]: https://npmjs.org/package/on-headers
 [npm-version-image]: https://badgen.net/npm/v/on-headers
-[travis-image]: https://badgen.net/travis/jshttp/on-headers/master
-[travis-url]: https://travis-ci.org/jshttp/on-headers

package/node_modules/on-headers/index.js

@@ -13,6 +13,12 @@
 
 module.exports = onHeaders
 
+var http = require('http')
+
+// older node versions don't have appendHeader
+var isAppendHeaderSupported = typeof http.ServerResponse.prototype.appendHeader === 'function'
+var set1dArray = isAppendHeaderSupported ? set1dArrayWithAppend : set1dArrayWithSet
+
 /**
  * Create a replacement writeHead method.
  *
@@ -74,8 +80,16 @@ function onHeaders (res, listener) {
  */
 
 function setHeadersFromArray (res, headers) {
-  for (var i = 0; i < headers.length; i++) {
-    res.setHeader(headers[i][0], headers[i][1])
+  if (headers.length && Array.isArray(headers[0])) {
+    // 2D
+    set2dArray(res, headers)
+  } else {
+    // 1D
+    if (headers.length % 2 !== 0) {
+      throw new TypeError('headers array is malformed')
+    }
+
+    set1dArray(res, headers)
   }
 }
 
@@ -130,3 +144,37 @@ function setWriteHeadHeaders (statusCode) {
 
   return args
 }
+
+function set2dArray (res, headers) {
+  var key
+  for (var i = 0; i < headers.length; i++) {
+    key = headers[i][0]
+    if (key) {
+      res.setHeader(key, headers[i][1])
+    }
+  }
+}
+
+function set1dArrayWithAppend (res, headers) {
+  for (var i = 0; i < headers.length; i += 2) {
+    res.removeHeader(headers[i])
+  }
+
+  var key
+  for (var j = 0; j < headers.length; j += 2) {
+    key = headers[j]
+    if (key) {
+      res.appendHeader(key, headers[j + 1])
+    }
+  }
+}
+
+function set1dArrayWithSet (res, headers) {
+  var key
+  for (var i = 0; i < headers.length; i += 2) {
+    key = headers[i]
+    if (key) {
+      res.setHeader(key, headers[i + 1])
+    }
+  }
+}

package/node_modules/on-headers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "on-headers",
   "description": "Execute a listener when a response is about to write headers",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "author": "Douglas Christopher Wilson <doug@somethingdoug.com>",
   "license": "MIT",
   "keywords": [
@@ -12,16 +12,16 @@
   ],
   "repository": "jshttp/on-headers",
   "devDependencies": {
-    "eslint": "5.14.1",
-    "eslint-config-standard": "12.0.0",
-    "eslint-plugin-import": "2.16.0",
-    "eslint-plugin-markdown": "1.0.0",
-    "eslint-plugin-node": "8.0.1",
-    "eslint-plugin-promise": "4.0.1",
-    "eslint-plugin-standard": "4.0.0",
-    "istanbul": "0.4.5",
-    "mocha": "6.0.1",
-    "supertest": "3.4.2"
+    "eslint": "6.8.0",
+    "eslint-config-standard": "14.1.1",
+    "eslint-plugin-import": "2.21.2",
+    "eslint-plugin-markdown": "1.0.2",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "4.2.1",
+    "eslint-plugin-standard": "4.0.1",
+    "mocha": "10.2.0",
+    "nyc": "15.1.0",
+    "supertest": "4.0.2"
   },
   "files": [
     "LICENSE",
@@ -34,9 +34,11 @@
   },
   "scripts": {
     "lint": "eslint --plugin markdown --ext js,md .",
-    "test": "mocha --reporter spec --bail --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
+    "test": "mocha --reporter spec --check-leaks test/test.js",
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test",
+    "update-upstream-hashes": "node scripts/update-upstream-hashes.js",
+    "upstream": "mocha --reporter spec --check-leaks test/upstream.js",
     "version": "node scripts/version-history.js && git add HISTORY.md"
   }
 }

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.1.6",
+    "version": "5.3.0",
     "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",
         "cgi": "0.3.1",
-        "compression": "^1.8.0",
+        "compression": "^1.8.1",
         "express": "^4.21.2",
         "sockjs": "~0.3.24"
     },

package/worldmap/worldmap.js

@@ -938,9 +938,9 @@ var feedback = function(n = "map",v,a = "feedback",c) {
     if (c === true) { map.closePopup(); }
 }
 
-// map.on('click', function(e) {
-//    ws.send(JSON.stringify({action:"click", lat:e.latlng.lat.toFixed(5), lon:e.latlng.lng.toFixed(5)}));
-// });
+map.on('click', function(e) {
+    ws.send(JSON.stringify({action:"click", lat:e.latlng.lat.toFixed(5), lon:e.latlng.lng.toFixed(5)}));
+});
 
 // allow double right click to zoom out (if enabled)
 // single right click opens a message window that adds a marker
@@ -1966,7 +1966,6 @@ function setMarker(data) {
                 iconAnchor: [sizc, sizc],
                 html:'<img src="'+svgarrow+'" style="width:'+siz+'px; height:'+siz+'px; -webkit-transform:rotate('+dir+'deg); -moz-transform:rotate('+dir+'deg);"/>',
             });
-            console.log("MM",myMarker)
             marker = L.marker(ll, {title:data["name"], icon:myMarker, draggable:drag});
         }
         else if (data.icon === "wind") {
@@ -2359,31 +2358,37 @@ function setMarker(data) {
     if (data.hasOwnProperty("radius")) { delete data.radius; }
     if (data.hasOwnProperty("greatcircle")) { delete data.greatcircle; }
 
-    // then any remaining properties to the info box
-    var longline = 0;
-    if (data.popup) { words = data.popup; }
-    else {
-        words += '<table>';
-        for (var i in data) {
-            if ((i != "name") && (i != "length") && (i != "clickable")) {
-                if (typeof data[i] === "object") {
-                    words += '<tr><td valign="top">'+ i +'</td><td>' + JSON.stringify(data[i]) + '</td></tr>';
-                }
-                else {
-                    // words += i +" : "+data[i]+"<br/>";
-                    if (data[i].length > longline) { longline = data[i].length; }
-                    words += '<tr><td valign="top">'+ i +'</td><td>' + data[i] + '</td></tr>';
+    if (!data.hasOwnProperty("clickable") && data.clickable != false) {
+        var wopt = { autoClose:false, closeButton:true, closeOnClick:false, minWidth:200 };
+        if (words.indexOf('<video ') >=0 || words.indexOf('<img ') >=0 ) { wopt.maxWidth="640"; } // make popup wider if it has an image or video
+        if (data?.popupOptions) { // allow user to override popup options eg to add className
+            wopt = data.popupOptions;
+            delete data.popupOptions;
+        }
+
+        // then any remaining properties to the info box
+        var longline = 0;
+        if (data.popup) { words = data.popup; }
+        else {
+            words += '<table>';
+            for (var i in data) {
+                if ((i != "name") && (i != "length") && (i != "clickable")) {
+                    if (typeof data[i] === "object") {
+                        words += '<tr><td valign="top">'+ i +'</td><td>' + JSON.stringify(data[i]) + '</td></tr>';
+                    }
+                    else {
+                        // words += i +" : "+data[i]+"<br/>";
+                        if (data[i].length > longline) { longline = data[i].length; }
+                        words += '<tr><td valign="top">'+ i +'</td><td>' + data[i] + '</td></tr>';
+                    }
                 }
             }
+            words += '<tr><td>lat, lon</td><td>'+ marker.getLatLng().toString().replace('LatLng(','').replace(')','') + '</td></tr>';
+            words += '</table>';
         }
-        words += '<tr><td>lat, lon</td><td>'+ marker.getLatLng().toString().replace('LatLng(','').replace(')','') + '</td></tr>';
-        words += '</table>';
-    }
-    words = "<b>"+data["name"]+"</b><br/>" + words.replace(/\${name}/g,data["name"]); //"<button style=\"border-radius:4px; float:right; background-color:lightgrey;\" onclick='popped=false;popmark.closePopup();'>X</button><br/>" + words;
-    var wopt = {autoClose:false, closeButton:true, closeOnClick:false, minWidth:200};
-    if (words.indexOf('<video ') >=0 || words.indexOf('<img ') >=0 ) { wopt.maxWidth="640"; } // make popup wider if it has an image or video
-    if (longline > 100) { wopt.minWidth="640"; } // make popup wider if it has a long line
-    if (!data.hasOwnProperty("clickable") && data.clickable != false) {
+        words = "<b>"+data["name"]+"</b><br/>" + words.replace(/\${name}/g,data["name"]); //"<button style=\"border-radius:4px; float:right; background-color:lightgrey;\" onclick='popped=false;popmark.closePopup();'>X</button><br/>" + words;
+
+        if (longline > 100) { wopt.minWidth="640"; } // make popup wider if it has a long line
         marker.bindPopup(words, wopt);
         marker._popup.dname = data["name"];
     }
@@ -2602,14 +2607,17 @@ function doCommand(cmd) {
     if (cmd.hasOwnProperty("button")) {
         if (!Array.isArray(cmd.button)) { cmd.button = [cmd.button]; }
         cmd.button.forEach(function(b) {
-            if (b.icon) {
-                if (!buttons[b.name]) {
-                    buttons[b.name] = L.easyButton( b.icon, function() {
-                        ws.send(JSON.stringify({action:"button", name:b.name}));
-                    }, b.name, { position:b.position||'topright' }).addTo(map);
+            if (b.name && b.icon) {
+                if (buttons[b.name]) {
+                    buttons[b.name].removeFrom(map);
+                    delete buttons[b.name];
                 }
+                buttons[b.name] = L.easyButton( b.icon, function() {
+                    ws.send(JSON.stringify({action:"button", name:b.name, value:b?.value}));
+                }, b.name, { position:b.position||'topright' });
+                buttons[b.name].addTo(map);
             }
-            else {
+            else if (b.name && !b.icon){
                 if (buttons[b.name]) {
                     buttons[b.name].removeFrom(map);
                     delete buttons[b.name];

package/worldmap.html

@@ -667,6 +667,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                     { value: "layer", label: "Add, remove layers"},
                     { value: "bounds", label: "Boundary change"},
                     { value: "files", label: "File drop"},
+                    { value: "click", label: "Click on map"},
                     { value: "other", label: "All other"}
                 ]
             }]});

package/worldmap.js

@@ -323,7 +323,7 @@ module.exports = function(RED) {
     var WorldMapIn = function(n) {
         RED.nodes.createNode(this,n);
         this.path = n.path || "/worldmap";
-        this.events = n.events || "connect,disconnect,point,layer,bounds,files,draw,other";
+        this.events = n.events || "connect,disconnect,point,layer,bounds,files,draw,click,other";
         if (this.path.charAt(0) != "/") { this.path = "/" + this.path; }
         if (!sockets[this.path]) {
             var libPath = path.posix.join(RED.settings.httpNodeRoot, this.path, 'leaflet', 'sockjs.min.js');
@@ -349,6 +349,9 @@ module.exports = function(RED) {
                     if ((node.events.indexOf("bounds")!==-1) && (message.action === "bounds")) {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
+                    if ((node.events.indexOf("click")!==-1) && (message.action === "click")) {
+                        setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
+                    }
                     if ((node.events.indexOf("point")!==-1) && ((message.action === "point")||(message.action === "move")||(message.action === "delete") ))  {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
@@ -362,7 +365,7 @@ module.exports = function(RED) {
                     if ((node.events.indexOf("draw")!==-1) && ((message.action === "draw")||(message.action === "drawdelete")))  {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
-                    if (node.events.indexOf("other")!==-1 && "connected,point,addlayer,dellayer,delete,move,draw,drawdelete,files,bounds".indexOf(message.action) === -1) {
+                    if (node.events.indexOf("other")!==-1 && "connected,point,addlayer,dellayer,delete,move,draw,drawdelete,files,bounds,click".indexOf(message.action) === -1) {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
                 }