node-red-contrib-web-worldmap 3.1.0 → 4.0.0

package/worldmap.html

@@ -617,6 +617,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
         <li><b>delete</b> - when a point or shape is deleted</li>
         <li><b>point</b> - when a point is added manually using right-click</li>
         <li><b>draw</b> - when a shape is added manually to the drawing layer</li>
+        <li><b>drawdelete</b> - when a shape is deleted from the drawing layer</li>
         <li><b>layer</b> - when a base layer is changed</li>
         <li><b>addlayer</b> - when an overlay is added to the map</li>
         <li><b>dellayer</b> - when an overlay is removed from the map</li>
@@ -662,10 +663,10 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                     { value: "connect", label: "Connect"},
                     { value: "disconnect", label: "Disconnect"},
                     { value: "point", label: "Add, move, delete point"},
+                    { value: "draw", label: "Add, edit or delete drawing"},
                     { value: "layer", label: "Add, remove layers"},
                     { value: "bounds", label: "Boundary change"},
                     { value: "files", label: "File drop"},
-                    { value: "draw", label: "Drawing"},
                     { value: "other", label: "All other"}
                 ]
             }]});

package/worldmap.js

@@ -69,12 +69,22 @@ 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 sendToRest = function(m,id) {
+            for (var c in clients) {
+                if (clients.hasOwnProperty(c) && c !== id) {
+                    // console.log("RESEND",m);
+                    clients[c].write(JSON.stringify(m));
+                }
+            }
+        }
+
         var callback = function(client) {
             if (!client.headers.hasOwnProperty("user-agent")) { client.close(); }
             //client.setMaxListeners(0);
             clients[client.id] = client;
             client.on('data', function(message) {
                 message = JSON.parse(message);
+                // console.log("ACTION",message.action,client.id,message)
                 if (message.action === "connected") {
                     var m = {};
                     var c = {init:true};
@@ -113,6 +123,26 @@ module.exports = function(RED) {
                     o.map(v => delete v.tout);
                     setTimeout(function() { client.write(JSON.stringify(o)) }, 250);
                 }
+                if (message.action === "draw") {
+                    delete message.action;
+                    delete message.type;
+                    delete message.options?.pane;
+                    allPoints[message.name] = RED.util.cloneMessage(message);
+                    sendToRest(message,client.id);
+                }
+                if (message.action === "point") {
+                    delete message.action;
+                    sendToRest(message,client.id);
+                }
+                if (message.action === "move") {
+                    delete message.action;
+                    delete message.from;
+                    sendToRest(message,client.id);
+                }
+                if (message.action === "delete" || message.action === "drawdelete") {
+                    delete allPoints[message.name];
+                    sendToRest(message,client.id);
+                }
             });
             client.on('close', function() {
                 delete clients[client.id];
@@ -283,10 +313,10 @@ module.exports = function(RED) {
                         message.content =  Buffer.from(message.content.split('base64,')[1], 'base64');
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
-                    if ((node.events.indexOf("draw")!==-1) && (message.action === "draw"))  {
+                    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,delete,move,draw,files,bounds".indexOf(message.action) === -1) {
+                    if (node.events.indexOf("other")!==-1 && "connected,point,delete,move,draw,drawdelete,files,bounds".indexOf(message.action) === -1) {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
                 }