node-red-contrib-web-worldmap 5.6.2 → 5.7.0

package/worldmap.js

@@ -129,7 +129,7 @@ module.exports = function(RED) {
                     if (node.name) { c.toptitle = node.name; }
                     //console.log("INIT",c)
                     client.write(JSON.stringify({command:c}));
-                    for (var p=0; p < pmtiles.length; p++) {
+                    for (var p=0; p < (pmtiles||[]).length; p++) {
                         fs.symlink(RED.settings.userDir+'/'+pmtiles[p], __dirname+'/worldmap/'+pmtiles[p], 'file', (err) => {
                             if (err && err.code !== "EEXIST") { console.log(err); }
                         })
@@ -197,11 +197,13 @@ module.exports = function(RED) {
                 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; }
-                allPoints[msg.payload.name].tout = setTimeout( function() { delete allPoints[msg.payload.name] }, t * 1000 );
+                (function(name) {
+                    allPoints[name].tout = setTimeout(function() { delete allPoints[name]; }, t * 1000);
+                })(msg.payload.name);
             }
             if (msg.payload?.command?.map?.delete) {
                 var ddd = msg.payload.command.map.delete;
-                if (!Array.isArray(ddd)) { ddd = [cmd.map.delete]; }
+                if (!Array.isArray(ddd)) { ddd = [ddd]; }
                 for (let a=0; a < ddd.length; a++) {
                     for (let p in allPoints) {
                         if (allPoints.hasOwnProperty(p)) {
@@ -384,7 +386,7 @@ module.exports = function(RED) {
                 }
             }
             clients = {};
-            sockets[this.path].removeListener('connection', callback);
+            sockets[node.path].removeListener('connection', callback);
             node.status({});
         });
         sockets[this.path].on('connection', callback);
@@ -398,7 +400,7 @@ module.exports = function(RED) {
         this.pointsarray = {};
         this.layer = n.layer || "combined"; // separate, single
         this.smooth = n.smooth || false;
-        var node = this;
+        const node = this;
         var bezierSpline = require("@turf/bezier-spline").default;
 
         var doTrack = function(msg) {
@@ -409,7 +411,7 @@ module.exports = function(RED) {
                     if (msg.payload.name.substr(-1) === '_') {
                         var a = node.pointsarray[msg.payload.name.substr(0,msg.payload.name.length-1)].pop();
                         node.pointsarray[msg.payload.name.substr(0,msg.payload.name.length-1)] = [ a ];
-                        node.send(newmsg);
+                        // node.send(newmsg);
                     }
                     else {
                         delete node.pointsarray[msg.payload.name];
@@ -488,7 +490,7 @@ module.exports = function(RED) {
             }
             if (msg.payload?.command?.map?.delete) {
                 var ddd = msg.payload.command.map.delete;
-                if (!Array.isArray(ddd)) { ddd = [cmd.map.delete]; }
+                if (!Array.isArray(ddd)) { ddd = [ddd]; }
                 for (let a=0; a < ddd.length; a++) {
                     for (let p in node.pointsarray) {
                         if (node.pointsarray.hasOwnProperty(p)) {

package/node_modules/hasown/.eslintrc

@@ -1,5 +0,0 @@
-{
-	"root": true,
-
-	"extends": "@ljharb",
-}

package/worldmap/leaflet/Leaflet.Dialog.css

@@ -1,106 +0,0 @@
-.leaflet-control-dialog {
-  position: absolute;
-  background-color: #fff;
-  padding: 0px;
-  text-align: left;
-  border-radius: 4px;
-  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.65);
-}
-
-.leaflet-control-dialog .leaflet-control-dialog-inner {
-  position: relative;
-  box-sizing: border-box;
-  float: left;
-  width: 100%;
-  height: 100%;
-  padding: 20px 0px;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-grabber {
-  position: absolute;
-  box-sizing: border-box;
-  width: 20px;
-  height: 20px;
-  top: 0px;
-  left: 0px;
-  padding: 3px;
-  font-size: 15px;
-  line-height: 15px;
-  color: #ccc;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-grabber:hover {
-  cursor: grab;
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-close {
-  position: absolute;
-  box-sizing: border-box;
-  width: 20px;
-  height: 20px;
-  top: 0px;
-  right: 0px;
-  padding: 2px;
-  font-size: 16px;
-  line-height: 16px;
-  color: #666;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-close:hover {
-  cursor: pointer;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-contents {
-  position: relative;
-  float: left;
-  width: 100%;
-  height: 100%;
-  margin: 0px;
-  padding: 0 20px;
-  min-height: 50px;
-  overflow: auto;
-  box-sizing: border-box;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-resizer {
-  position: absolute;
-  box-sizing: border-box;
-  width: 20px;
-  height: 20px;
-  bottom: 0px;
-  right: 0px;
-  padding: 2px;
-  font-size: 16px;
-  line-height: 16px;
-  color: #ccc;
-}
-
-.leaflet-control-dialog
-  .leaflet-control-dialog-inner
-  .leaflet-control-dialog-resizer:hover {
-  cursor: grab;
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
-}
-
-.fa-rotate-45 {
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-}

package/worldmap/leaflet/Leaflet.Dialog.js

@@ -1,372 +0,0 @@
-L.Control.Dialog = L.Control.extend({
-  options: {
-    size: [ 300, 300 ],
-    minSize: [ 100, 100 ],
-    maxSize: [ 350, 350 ],
-    anchor: [ 250, 250 ],
-    position: "topleft",
-    initOpen: true
-  },
-
-  initialize: function(options) {
-    this.options = JSON.parse(JSON.stringify(this.options));
-    L.setOptions(this, options);
-
-    this._attributions = {};
-  },
-
-  onAdd: function(map) {
-    this._initLayout();
-    this._map = map;
-
-    this.update();
-
-    if (!this.options.initOpen) {
-      this.close();
-    }
-
-    return this._container;
-  },
-
-  open: function() {
-    if (!this._map) {
-      return;
-    }
-    this._container.style.visibility = "";
-
-    this._map.fire("dialog:opened", this);
-
-    return this;
-  },
-
-  close: function() {
-    this._container.style.visibility = "hidden";
-
-    this._map.fire("dialog:closed", this);
-    return this;
-  },
-
-  destroy: function() {
-    if (!this._map) {
-      return this;
-    }
-
-    this._map.fire("dialog:destroyed", this);
-    this.remove();
-
-    if (this.onRemove) {
-      this.onRemove(this._map);
-    }
-
-    return this;
-  },
-
-  setLocation: function(location) {
-    location = location || [ 250, 250 ];
-
-    this.options.anchor[0] = 0;
-    this.options.anchor[1] = 0;
-    this._oldMousePos.x = 0;
-    this._oldMousePos.y = 0;
-
-    this._move(location[1], location[0]);
-
-    return this;
-  },
-
-  setSize: function(size) {
-    size = size || [ 300, 300 ];
-
-    this.options.size[0] = 0;
-    this.options.size[1] = 0;
-    this._oldMousePos.x = 0;
-    this._oldMousePos.y = 0;
-
-    this._resize(size[0], size[1]);
-
-    return this;
-  },
-
-  lock: function() {
-    this._resizerNode.style.visibility = "hidden";
-    this._grabberNode.style.visibility = "hidden";
-    this._closeNode.style.visibility = "hidden";
-
-    this._map.fire("dialog:locked", this);
-    return this;
-  },
-
-  unlock: function() {
-    this._resizerNode.style.visibility = "";
-    this._grabberNode.style.visibility = "";
-    this._closeNode.style.visibility = "";
-
-    this._map.fire("dialog:unlocked", this);
-    return this;
-  },
-
-  freeze: function() {
-    this._resizerNode.style.visibility = "hidden";
-    this._grabberNode.style.visibility = "hidden";
-
-    this._map.fire("dialog:frozen", this);
-    return this;
-  },
-
-  unfreeze: function() {
-    this._resizerNode.style.visibility = "";
-    this._grabberNode.style.visibility = "";
-
-    this._map.fire("dialog:unfrozen", this);
-    return this;
-  },
-
-  hideClose: function() {
-    this._closeNode.style.visibility = "hidden";
-
-    this._map.fire("dialog:closehidden", this);
-    return this;
-  },
-
-  showClose: function() {
-    this._closeNode.style.visibility = "";
-
-    this._map.fire("dialog:closeshown", this);
-    return this;
-  },
-
-  hideResize: function() {
-    this._resizerNode.style.visibility = "hidden";
-
-    this._map.fire("dialog:resizehidden", this);
-    return this;
-  },
-
-  showResize: function() {
-    this._resizerNode.style.visibility = "";
-
-    this._map.fire("dialog:resizeshown", this);
-    return this;
-  },
-
-  setContent: function(content) {
-    this._content = content;
-    this.update();
-    return this;
-  },
-
-  getContent: function() {
-    return this._content;
-  },
-
-  getElement: function() {
-    return this._container;
-  },
-
-  update: function() {
-    if (!this._map) {
-      return;
-    }
-
-    this._container.style.visibility = "hidden";
-
-    this._updateContent();
-    this._updateLayout();
-
-    this._container.style.visibility = "";
-    this._map.fire("dialog:updated", this);
-  },
-
-  _initLayout: function() {
-    var className = "leaflet-control-dialog",
-      container = (this._container = L.DomUtil.create("div", className));
-
-    container.style.width = this.options.size[0] + "px";
-    container.style.height = this.options.size[1] + "px";
-
-    container.style.top = this.options.anchor[0] + "px";
-    container.style.left = this.options.anchor[1] + "px";
-
-    var stop = L.DomEvent.stopPropagation;
-    L.DomEvent.on(container, "click", stop)
-      .on(container, "mousedown", stop)
-      .on(container, "touchstart", stop)
-      .on(container, "dblclick", stop)
-      .on(container, "mousewheel", stop)
-      .on(container, "contextmenu", stop)
-      .on(container, "MozMousePixelScroll", stop);
-
-    var innerContainer = (this._innerContainer = L.DomUtil.create(
-      "div",
-      className + "-inner"
-    ));
-
-    var grabberNode = (this._grabberNode = L.DomUtil.create(
-      "div",
-      className + "-grabber"
-    ));
-    var grabberIcon = L.DomUtil.create("i", "fa fa-arrows");
-    grabberNode.appendChild(grabberIcon);
-
-    L.DomEvent.on(grabberNode, "mousedown", this._handleMoveStart, this);
-
-    var closeNode = (this._closeNode = L.DomUtil.create(
-      "div",
-      className + "-close"
-    ));
-    var closeIcon = L.DomUtil.create("i", "fa fa-times");
-    closeNode.appendChild(closeIcon);
-    L.DomEvent.on(closeNode, "click", this._handleClose, this);
-
-    var resizerNode = (this._resizerNode = L.DomUtil.create(
-      "div",
-      className + "-resizer"
-    ));
-    var resizeIcon = L.DomUtil.create("i", "fa fa-arrows-h fa-rotate-45");
-    resizerNode.appendChild(resizeIcon);
-
-    L.DomEvent.on(resizerNode, "mousedown", this._handleResizeStart, this);
-
-    var contentNode = (this._contentNode = L.DomUtil.create(
-      "div",
-      className + "-contents"
-    ));
-
-    container.appendChild(innerContainer);
-
-    innerContainer.appendChild(contentNode);
-    innerContainer.appendChild(grabberNode);
-    innerContainer.appendChild(closeNode);
-    innerContainer.appendChild(resizerNode);
-
-    this._oldMousePos = { x: 0, y: 0 };
-  },
-
-  _handleClose: function() {
-    this.close();
-  },
-
-  _handleResizeStart: function(e) {
-    this._oldMousePos.x = e.clientX;
-    this._oldMousePos.y = e.clientY;
-
-    L.DomEvent.on(this._map, "mousemove", this._handleMouseMove, this);
-    L.DomEvent.on(this._map, "mouseup", this._handleMouseUp, this);
-
-    this._map.fire("dialog:resizestart", this);
-    this._resizing = true;
-  },
-
-  _handleMoveStart: function(e) {
-    this._oldMousePos.x = e.clientX;
-    this._oldMousePos.y = e.clientY;
-
-    L.DomEvent.on(this._map, "mousemove", this._handleMouseMove, this);
-    L.DomEvent.on(this._map, "mouseup", this._handleMouseUp, this);
-
-    this._map.fire("dialog:movestart", this);
-    this._moving = true;
-  },
-
-  _handleMouseMove: function(e) {
-    var diffX = e.originalEvent.clientX - this._oldMousePos.x,
-      diffY = e.originalEvent.clientY - this._oldMousePos.y;
-
-    // this helps prevent accidental highlighting on drag:
-    if (e.originalEvent.stopPropagation) {
-      e.originalEvent.stopPropagation();
-    }
-    if (e.originalEvent.preventDefault) {
-      e.originalEvent.preventDefault();
-    }
-
-    if (this._resizing) {
-      this._resize(diffX, diffY);
-    }
-
-    if (this._moving) {
-      this._move(diffX, diffY);
-    }
-  },
-
-  _handleMouseUp: function() {
-    L.DomEvent.off(this._map, "mousemove", this._handleMouseMove, this);
-    L.DomEvent.off(this._map, "mouseup", this._handleMouseUp, this);
-
-    if (this._resizing) {
-      this._resizing = false;
-      this._map.fire("dialog:resizeend", this);
-    }
-
-    if (this._moving) {
-      this._moving = false;
-      this._map.fire("dialog:moveend", this);
-    }
-  },
-
-  _move: function(diffX, diffY) {
-    var newY = this.options.anchor[0] + diffY;
-    var newX = this.options.anchor[1] + diffX;
-
-    this.options.anchor[0] = newY;
-    this.options.anchor[1] = newX;
-
-    this._container.style.top = this.options.anchor[0] + "px";
-    this._container.style.left = this.options.anchor[1] + "px";
-
-    this._map.fire("dialog:moving", this);
-
-    this._oldMousePos.y += diffY;
-    this._oldMousePos.x += diffX;
-  },
-
-  _resize: function(diffX, diffY) {
-    var newX = this.options.size[0] + diffX;
-    var newY = this.options.size[1] + diffY;
-
-    if (newX <= this.options.maxSize[0] && newX >= this.options.minSize[0]) {
-      this.options.size[0] = newX;
-      this._container.style.width = this.options.size[0] + "px";
-      this._oldMousePos.x += diffX;
-    }
-
-    if (newY <= this.options.maxSize[1] && newY >= this.options.minSize[1]) {
-      this.options.size[1] = newY;
-      this._container.style.height = this.options.size[1] + "px";
-      this._oldMousePos.y += diffY;
-    }
-
-    this._map.fire("dialog:resizing", this);
-  },
-
-  _updateContent: function() {
-    if (!this._content) {
-      return;
-    }
-
-    var node = this._contentNode;
-    var content =
-      typeof this._content === "function" ? this._content(this) : this._content;
-
-    if (typeof content === "string") {
-      node.innerHTML = content;
-    } else {
-      while (node.hasChildNodes()) {
-        node.removeChild(node.firstChild);
-      }
-      node.appendChild(content);
-    }
-  },
-
-  _updateLayout: function() {
-    this._container.style.width = this.options.size[0] + "px";
-    this._container.style.height = this.options.size[1] + "px";
-
-    this._container.style.top = this.options.anchor[0] + "px";
-    this._container.style.left = this.options.anchor[1] + "px";
-  }
-});
-
-L.control.dialog = function(options) {
-  return new L.Control.Dialog(options);
-};