node-red-contrib-web-worldmap 2.26.1 → 2.27.0

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.27.0 - Reload existing markers for late joiners
+ - v2.26.1 - Add QTH/Maidenhead option also
  - v2.26.0 - Add UTM and MGRS to coordinate display options.
  - v2.25.0 - Add bounds command to set overall map bounds.
  - v2.24.3 - Fix geojson incorrect fill.

package/README.md

@@ -11,6 +11,8 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.27.0 - Reload existing markers for late joiners
+- v2.26.1 - Add QTH/Maidenhead option also
 - v2.26.0 - Add UTM and MGRS to coordinate display options.
 - v2.25.0 - Add bounds command to set overall map bounds.
 - v2.24.3 - Fix geojson incorrect fill.
@@ -141,6 +143,8 @@ following the great circle between the two co-ordinates is plotted.
 
     msg.payload = {name:"GC1", color:"#ff00ff", greatcircle:[ [51.464,0], [25.76,-80.18] ] }
 
+Shapes can also have a **popup** property containing html, but you MUST also set a property `clickable:true` in order to allow it to be seen.
+
 There are extra optional properties you can specify - see Options below.
 
 
@@ -255,6 +259,7 @@ Areas, Rectangles, Lines, Circles and Ellipses can also specify more optional pr
 
 Other properties can be found in the leaflet documentation.
 
+Shapes can also have a **popup** property containing html, but you MUST also set a property `clickable:true` in order to allow it to be seen.
 
 ### Drawing
 

package/package.json

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

package/worldmap/worldmap.js

@@ -170,6 +170,9 @@ if (inIframe === true) {
 
 // Create the Initial Map object.
 map = new L.map('map',{zoomSnap: 0.1}).setView(startpos, startzoom);
+map.whenReady(function() {
+    connect();
+});
 
 var droplatlng;
 var target = document.getElementById("map")
@@ -912,7 +915,6 @@ var addBaseMaps = function(maplist,first) {
     }
 }
 
-
 // Now add the overlays
 var addOverlays = function(overlist) {
     //console.log("OVERLAYS",overlist)
@@ -2190,6 +2192,7 @@ function doCommand(cmd) {
         if (cmd.coords == "dms") { opts.gpsLong = true; }
         if (cmd.coords == "utm") { opts.utm = true; }
         if (cmd.coords == "mgrs") { opts.utmref = true; }
+        if (cmd.coords == "qth") { opts.qth = true; }
         coords.options = opts;
         coords.addTo(map);
     }
@@ -2711,5 +2714,3 @@ function doGeojson(n,g,l,o) {
     layers[lay].addLayer(markers[n]);
     map.addLayer(layers[lay]);
 }
-
-connect();

package/worldmap.html

@@ -85,6 +85,7 @@
         <option value="dms">D.M.S</option>
         <option value="utm">UTM</option>
         <option value="mgrs">MGRS</option>
+        <option value="qth">QTH/Maidenhead</option>
     </select>
     <i class="fa fa-th" style="margin-left:22px;"></i> Graticule
     <select id="node-input-showgrid" style="width:101px;">
@@ -243,6 +244,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
         <option value="dms">D.M.S</option>
         <option value="utm">UTM</option>
         <option value="mgrs">MGRS</option>
+        <option value="gth">QTH/Maidenhead</option>
     </select>
     <i class="fa fa-th" style="margin-left:22px;"></i> Graticule
     <select id="node-input-showgrid" style="width:101px;">

package/worldmap.js

@@ -15,6 +15,7 @@ module.exports = function(RED) {
     }
 
     function worldMap(node, n) {
+        var allPoints = {};
         RED.nodes.createNode(node,n);
         node.lat = n.lat || "";
         node.lon = n.lon || "";
@@ -61,6 +62,17 @@ module.exports = function(RED) {
         RED.httpNode.use(node.path, express.static(__dirname + '/worldmap'));
         // RED.httpNode.use(node.path, express.static(__dirname + '/worldmap', {maxage:3600000}));
 
+        // var cleanup = function() {
+        //     var d = Date.now();
+        //     for (var m in allPoints) {
+        //         if (allPoints[m].ts < d) {
+        //             console.log("DING",m)
+        //             delete allPoints[m];
+        //         }
+        //     }
+        // }
+        // var stale = setInterval(function() { cleanup() }, 20000);
+
         var callback = function(client) {
             if (!client.headers.hasOwnProperty("user-agent")) { client.close(); }
             //client.setMaxListeners(0);
@@ -100,6 +112,10 @@ module.exports = function(RED) {
                     if (node.name) { c.toptitle = node.name; }
                     //console.log("INIT",c)
                     client.write(JSON.stringify({command:c}));
+                    var o = Object.values(allPoints);
+                    o.map(v => delete v.tout);
+                    //console.log("AP",o.length);
+                    setTimeout(function() { client.write(JSON.stringify(o)) }, 250);
                 }
             });
             client.on('close', function() {
@@ -121,8 +137,15 @@ module.exports = function(RED) {
                     }
                 }
             }
+            if (msg.payload.hasOwnProperty("name")) {
+                allPoints[msg.payload.name] = msg.payload;
+                var t = node.maxage || 3600;
+                if (msg.payload.ttl && msg.payload.ttl < t) { t = msg.payload.ttl; }
+                allPoints[msg.payload.name].tout = setTimeout( function() { delete allPoints[msg.payload.name] }, t * 1000 );
+            }
         });
         node.on("close", function() {
+            // if (stale) { clearInterval(stale); }
             for (var c in clients) {
                 if (clients.hasOwnProperty(c)) {
                     clients[c].end();