node-red-contrib-web-worldmap 2.23.0 → 2.23.4

package/worldmap/worldmap.js

@@ -673,7 +673,7 @@ var addThing = function() {
     var hdg = parseFloat(bits[4] || 0);
     var drag = true;
     var regi = /^[S,G,E,I,O][A-Z]{3}.*/i;  // if it looks like a SIDC code
-    var d = {action:"point", name:bits[0].trim(), layer:lay, draggable:drag, lat:rclk.lat, lon:rclk.lng, hdg:hdg};
+    var d = {action:"point", name:bits[0].trim(), layer:lay, draggable:drag, lat:rclk.lat, lon:rclk.lng, hdg:hdg, ttl:0 };
     if (regi.test(icon)) {
         d.SIDC = (icon.toUpperCase()+"------------").substr(0,12);
     }
@@ -1351,13 +1351,15 @@ function setMarker(data) {
     opt.color = data.color || data.lineColor || "#910000";
     opt.fillColor = data.fillColor || "#910000";
     opt.stroke = (data.hasOwnProperty("stroke")) ? data.stroke : true;
-    opt.weight = data.weight || 2;
-    opt.opacity = data.opacity || 1;
+    opt.weight = data.weight;
+    opt.opacity = data.opacity;
     opt.fillOpacity = data.fillOpacity;
     opt.clickable = (data.hasOwnProperty("clickable")) ? data.clickable : false;
     opt.fill = (data.hasOwnProperty("fill")) ? data.fill : true;
     if (data.hasOwnProperty("dashArray")) { opt.dashArray = data.dashArray; }
     if (opt.fillOpacity === undefined) { opt.fillOpacity = 0.2; }
+    if (opt.opacity === undefined) { opt.opacity = 1; }
+    if (opt.weight === undefined) { opt.weight = 2; }
 
     // Replace building
     if (data.hasOwnProperty("building")) {
@@ -1432,6 +1434,9 @@ function setMarker(data) {
         if (data.area.length === 2) { polyarea = L.rectangle(data.area, opt); }
         else { polyarea = L.polygon(data.area, opt); }
         polygons[data.name] = rightmenu(polyarea);
+        if (data.hasOwnProperty("fit") && data.fit === true) {
+            map.fitBounds(polygons[data.name].getBounds(),{padding:[50,50]})
+        }
     }
     else if (data.hasOwnProperty("sdlat") && data.hasOwnProperty("sdlon")) {
         if (!data.hasOwnProperty("iconColor")) { opt.color = "blue"; }     //different standard Color Settings
@@ -2062,9 +2067,11 @@ function setMarker(data) {
 function doCommand(cmd) {
     // console.log("COMMAND",cmd);
     if (cmd.init && cmd.hasOwnProperty("maplist")) {
+        basemaps = [];
         addBaseMaps(cmd.maplist,cmd.layer);
     }
     if (cmd.init && cmd.hasOwnProperty("overlist")) {
+        overlays = [];
         addOverlays(cmd.overlist);
     }
     if (cmd.hasOwnProperty("toptitle")) {

package/worldmap.html

@@ -383,6 +383,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
             return 'The map can be found [here]('+RED.settings.httpNodeRoot.slice(0,-1)+this.path+').';
         },
         oneditprepare: function() {
+            var mshort;
             if (this.maplist === undefined) {
                 $("#node-input-maplist").val("OSMG,OSMC,EsriC,EsriS,EsriT,EsriO,EsriDG,NatGeo,UKOS,OpTop,SW");
                 this.maplist = "OSMG,OSMC,EsriC,EsriS,EsriT,EsriO,EsriDG,NatGeo,UKOS,OpTop,SW";
@@ -398,7 +399,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
             }]});
             $("#node-input-layer").typedInput({type:"laye", types:[{
                 value: "laye",
-                options: mlist
+                options: mshort
             }]});
             $("#node-input-overlist").typedInput({type:"overlay", types:[{
                 value: "overlay",
@@ -406,7 +407,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                 options: olist
             }]});
             $("#node-input-maplist").on('change', function(event, type, value) {
-                var mshort = mlist.filter(e => value.indexOf(e.value)!==-1);
+                mshort = mlist.filter(e => value.indexOf(e.value)!==-1);
                 mshort.push({ value:"Custom", label:"Custom Map Provider" });
                 $("#node-input-layer").typedInput("types", [{
                     value: "laye",
@@ -493,6 +494,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                     return this.name?"node_label_italic":"";
                 },
                 oneditprepare: function() {
+                    var mshort;
                     if (this.maplist === undefined) {
                         $("#node-input-maplist").val("OSMG,OSMC,EsriC,EsriS,EsriT,EsriO,EsriDG,NatGeo,UKOS,OpTop,SW");
                         this.maplist = "OSMG,OSMC,EsriC,EsriS,EsriT,EsriO,EsriDG,NatGeo,UKOS,OpTop,SW";
@@ -508,7 +510,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                     }]});
                     $("#node-input-layer").typedInput({type:"laye", types:[{
                         value: "laye",
-                        options: mlist
+                        options: mshort
                     }]});
                     $("#node-input-overlist").typedInput({type:"overlay", types:[{
                         value: "overlay",
@@ -516,7 +518,7 @@ If <i>Web Path</i> is left empty, then by default <code>⌘⇧m</code> - <code>c
                         options: olist
                     }]});
                     $("#node-input-maplist").on('change', function(event, type, value) {
-                        var mshort = mlist.filter(e => value.indexOf(e.value)!==-1);
+                        mshort = mlist.filter(e => value.indexOf(e.value)!==-1);
                         mshort.push({ value:"Custom", label:"Custom Map Provider" });
                         $("#node-input-layer").typedInput("types", [{
                             value: "laye",

package/worldmap.js

@@ -486,16 +486,16 @@ module.exports = function(RED) {
                     node.send(newmsg);
                 }
                 if (leafletHull.length === 2 && (oldl === 1 || oldl === 3)) {
-                    newmsg.payload.deleted = true;
-                    node.send(newmsg);
-                    delete newmsg.payload.deleted;
+                    var newmsg2 = RED.util.cloneMessage(newmsg);
+                    newmsg2.payload.deleted = true;
+                    node.send(newmsg2);
                     newmsg.payload.line = leafletHull;
                     node.send(newmsg);
                 }
                 if (leafletHull.length === 3 && oldl === 2) {
-                    newmsg.payload.deleted = true;
-                    node.send(newmsg);
-                    delete newmsg.payload.deleted;
+                    var newmsg3 = RED.util.cloneMessage(newmsg);
+                    newmsg3.payload.deleted = true;
+                    node.send(newmsg3);
                 }
                 if (leafletHull.length >= 3) {
                     newmsg.payload.area = leafletHull;