node-red-contrib-web-worldmap 2.37.3 → 2.38.0

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.38.0 - Return client headers as part of connect message.
+ - v2.37.4 - Fix sessionid specific data not to be sent on reload/refresh
  - v2.37.3 - Fix hang on layer change
  - v2.37.2 - If custom layer is only layer then show it automatically. Issue #230
  - v2.37.1 - Warn (and drop) messages that are missing a payload. Issue #229

package/README.md

@@ -7,10 +7,14 @@
 A <a href="https://nodered.org" target="mapinfo">Node-RED</a> node to provide a world
 map web page for plotting "things" on.
 
+Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/dceejay) this project.
+
 ![Map Image](https://dceejay.github.io/pages/images/redmap.png)
 
 ### Updates
 
+- v2.38.0 - Return client headers as part of connect message.
+- v2.37.4 - Fix sessionid specific data not to be sent on reload/refresh
 - v2.37.3 - Fix hang on layer change
 - v2.37.2 - If custom layer is only layer then show it automatically. Issue #230
 - v2.37.1 - Warn (and drop) messages that are missing a payload. Issue #229
@@ -368,7 +372,11 @@ The **worldmap in** node can be used to receive various events from the map. Exa
 
 If File Drop is enabled - then the map can accept files of type gpx, kml, nvg, jpeg, png and geojson. The file content property will always be a binary buffer. The lat, lon of the cursor drop point will be included. Tracks will be locally rendered on the map. The node-red-node-exif node can be used to extract location information from a jpeg image and then geolocate it back on the map. Png images will be located where they are dropped but can then be dragged if required.
 
-All actions also include a `msg._sessionid` property that indicates which client session they came from. Any msg sent out that includes this property will ONLY be sent to that session - so you can target map updates to specific sessions if required.
+All actions also include a:
+`msg._sessionid` property that indicates which client session they came from. Any msg sent out that includes this property will ONLY be sent to that session - so you can target map updates to specific sessions if required.
+'msg._sessionip' property that shows the ip of the client that is connected to the session. 
+
+Only actions "connected" include a msg._clientheaders property that shows the headers sent by the client to make a connection to the session.
 
 
 ### Utility functions
@@ -422,13 +430,15 @@ Optional properties include
  - **zoomlock** - locks the zoom control to the current value and removes zoom control - `{"command":{"zoomlock":true}}`
  - **hiderightclick** - disables the right click that allows adding or deleting points on the map - `{"command":{"hiderightclick":true}}`
  - **coords** - turns on and off a display of the current mouse co-ordinates. Values can be "deg", "dms", or "none" (default). - `{"command":{"coords":"deg"}}`
- - **showruler** - turns on and off a display of the ruler control. Values can be "true" or "false". - `{"command":{"showruler":true}}`
+ - **showruler** - turns on and off a display of the ruler control. Values can be "true" or "false". - `{"command": {"ruler": {"showruler": true}}}`
  - **button** - if supplied with a `name` and `icon` property - adds a button to provide user input - sends
  a msg `{"action":"button", "name":"the_button_name"}` to the worldmap in node. If supplied with a `name` property only, it will remove the button. Optional `position` property can be 'bottomright', 'bottomleft', 'topleft' or 'topright' (default). button can also be an array of button objects.
  - **contextmenu** - html string to define the right click menu when not on a marker. Defaults to the simple add marker input. Empty string `""` disables this right click.
  - **toptitle** - Words to replace title in title bar (if not in iframe)
  - **toplogo** - URL to logo image for top tile bar (if not in iframe) - ideally 60px by 24px.
  - **trackme** - Turns on/off the browser self locating. Boolean false = off, true = cyan circle showing accuracy error, or an object like `{"command":{"trackme":{"name":"Dave","icon":"car","iconColor":"blue","layer":"mytrack","accuracy":false}}}`. Usual marker options can be applied. 
+ - **showmenu** - Show or hide the display of the hamberger menu control in the top right . Values can be "show" or "hide". - `{"command":{"showmenu": "hide"}}`
+ - **showlayers** - Show or hide the display of selectable layers. Does not control the display of an individual layer, rather a users ability to interact with them. Values can be "show" or "hide". - `{"command":{"showlayers": "hide"}}`
 
 #### To switch layer, move map and zoom
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.37.3",
+    "version": "2.38.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

@@ -751,10 +751,6 @@ map.on('moveend', function() {
 map.on('locationfound', onLocationFound);
 map.on('locationerror', onLocationError);
 
-//map.on('contextmenu', function(e) {
-//    ws.send(JSON.stringify({action:"rightclick", lat:e.latlng.lat.toFixed(5), lon:e.latlng.lng.toFixed(5)}));
-//});
-
 // single right click to add a marker
 var addmenu = "<b>Add marker</b><br><input type='text' id='rinput' autofocus onkeydown='if (event.keyCode == 13) addThing();' placeholder='name (,icon/SIDC, layer, colour, heading)'/>";
 if (navigator.onLine) { addmenu += '<br/><a href="https://spatialillusions.com/unitgenerator/" target="_new">MilSymbol SIDC generator</a>'; }
@@ -809,6 +805,10 @@ var addToForm = function(n,v) {
     form[n] = v;
 }
 
+// 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
 var rclicked = false;

package/worldmap.js

@@ -120,6 +120,7 @@ module.exports = function(RED) {
             });
             node.status({fill:"green",shape:"dot",text:"connected "+Object.keys(clients).length,_sessionid:client.id});
         }
+
         node.on('input', function(msg) {
             if (!msg.hasOwnProperty("payload")) { node.warn("Missing payload"); return; }
             if (msg.hasOwnProperty("_sessionid")) {
@@ -134,7 +135,7 @@ module.exports = function(RED) {
                     }
                 }
             }
-            if (msg.payload.hasOwnProperty("name")) {
+            if (msg.payload.hasOwnProperty("name") && !msg.hasOwnProperty("_sessionid")) {
                 allPoints[msg.payload.name] = RED.util.cloneMessage(msg.payload);
                 var t = node.maxage || 3600;
                 if (msg.payload.ttl && msg.payload.ttl < t) { t = msg.payload.ttl; }
@@ -267,7 +268,7 @@ module.exports = function(RED) {
                 message = JSON.parse(message);
                 if (message.hasOwnProperty("action")) {
                     if ((node.events.indexOf("connect")!==-1) && (message.action === "connected")) {
-                        setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
+                        setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip, _clientheaders:client.headers})});
                     }
                     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})});