node-red-contrib-web-worldmap 5.0.8 → 5.0.9

package/worldmap/worldmap.js

@@ -118,17 +118,17 @@ console.log("CONNECT TO",location.pathname + 'socket');
 var handleData = function(data) {
     if (Array.isArray(data)) {
         // console.log("ARRAY:",data.length);
-        for (var prop in data) {
-            if (data[prop].command) { doCommand(data[prop].command); delete data[prop].command; }
-            if (data[prop].hasOwnProperty("name")) {
-                setMarker(data[prop]);
-                // bnds.extend(markers[data[prop].name].getLatLng());
-            }
-            else if (data[prop].hasOwnProperty("filename") && data[prop].filename === "doc.kml") {
-                data = {command:{map:{overlay:"KML", kml:data[prop].payload}}};
+        for (var prop of data) {
+            if (prop.command) { doCommand(prop.command); delete prop.command; }
+            if (prop.hasOwnProperty("name")) {
+                setMarker(prop);
+                // bnds.extend(markers[prop.name].getLatLng());
+            }
+            else if (prop.hasOwnProperty("filename") && prop.filename === "doc.kml") {
+                data = {command:{map:{overlay:"KML", kml:prop.payload}}};
                 doCommand(data.command); return;
             }
-            else { console.log("SKIP array item",data[prop]); }
+            else { console.log("SKIP array item",prop); }
         }
     }
     else {
@@ -146,25 +146,25 @@ var handleData = function(data) {
         }
 
         // handle any commands in the data
-        if (data.command) { doCommand(data.command); delete data.command; }
+        if (data?.command) { doCommand(data.command); delete data.command; }
 
         // handle raw geojson type msg
-        if (data.hasOwnProperty("type") && data.type.indexOf("Feature") === 0) {
+        if (data?.type && data.type.indexOf("Feature") === 0) {
             if (data?.properties?.title) {
                 doGeojson(data.properties.title,data,data?.layer,data?.options,data?.icon) // name, geojson, layer, options, icon
             }
             else { doGeojson("geojson",data,data?.layer,data?.options,data?.icon); }
         }
         // handle TAK json (from tak-ingest node or fastxml node)
-        else if (data.hasOwnProperty("event") && data.event.hasOwnProperty("point")) {
+        else if (data?.event?.point) {
             doTAKjson(data.event);
         }
         // handle TAK json (from multicast Protobuf via tak-ingest node)
-        else if (data.hasOwnProperty("cotEvent") && data.cotEvent.hasOwnProperty("lat") && data.cotEvent.hasOwnProperty("lon")) {
+        else if (data?.cotEvent && data.cotEvent.hasOwnProperty("lat") && data.cotEvent.hasOwnProperty("lon")) {
             doTAKMCjson(data.cotEvent);
         }
         // handle default worldmap json msg
-        else if (data.hasOwnProperty("name")) { setMarker(data); }
+        else if (data?.name) { setMarker(data); }
         else {
             if (JSON.stringify(data) !== '{}') {
                 console.log("SKIP",data);
@@ -329,7 +329,7 @@ var errRing;
 function onLocationFound(e) {
     if (followState === true) { map.panTo(e.latlng); }
     if (followMode.icon) {
-        var self = {name:followMode.name || "self", lat:e.latlng.lat, lon:e.latlng.lng, hdg:e.heading, speed:(e.speed*1 ?? undefined), layer:followMode.layer, icon:followMode.icon, iconColor:followMode.iconColor ?? "#910000" };
+        var self = {name:followMode.name || "self", lat:e.latlng.lat, lon:e.latlng.lng, hdg:isNaN(e?.heading * 1) ? undefined : e?.heading * 1, speed:isNaN(e?.speed * 1) ? undefined : e?.speed * 1, layer:followMode.layer, icon:followMode.icon, iconColor:followMode.iconColor ?? "#910000" };
         setMarker(self);
     }
     if (e.heading !== null) { map.setBearing(e.heading); }
@@ -344,7 +344,7 @@ function onLocationFound(e) {
         //     L.polygon([ e.latlng, lla ], {color:"00ffff", weight:3, opacity:0.5, clickable:false}).addTo(map);
         // }
     }
-    ws.send(JSON.stringify({action:"point", lat:e.latlng.lat.toFixed(5), lon:e.latlng.lng.toFixed(5), point:"self", hdg:e.heading, speed:(e.speed*1 ?? undefined)}));
+    ws.send(JSON.stringify({action:"point", lat:e.latlng.lat.toFixed(5), lon:e.latlng.lng.toFixed(5), point:"self", hdg:isNaN(e?.heading * 1) ? undefined : e?.heading * 1, speed:isNaN(e?.speed * 1) ? undefined : e?.speed * 1}));
 }
 
 function onLocationError(e) { console.log(e.message); }
@@ -452,8 +452,9 @@ var edgeAware = function () {
     var viewBounds = L.latLngBounds(map.options.crs.pointToLatLng(L.point(pSW.x - (pCenter.x - pSW.x ), pSW.y - (pCenter.y - pSW.y )), map.getZoom()) , map.options.crs.pointToLatLng(L.point(pNE.x + (pNE.x - pCenter.x) , pNE.y + (pNE.y - pCenter.y) ), map.getZoom()) );
     for (var id in markers) {
         if (allData[id] && allData[id].hasOwnProperty("SIDC")) {
-            markerLatLng = markers[id].getLatLng();
+            var markerLatLng = markers[id].getLatLng();
             if ( viewBounds.contains(markerLatLng) && !mapBounds.contains(markerLatLng) ) {
+                var x,y;
                 var k = (markerLatLng.lat - mapBoundsCenter.lat) / (markerLatLng.lng - mapBoundsCenter.lng);
 
                 if (markerLatLng.lng > mapBoundsCenter.lng) { x = mapBounds.getEast() - mapBoundsCenter.lng; }
@@ -726,12 +727,12 @@ function clearSearch() {
         }
     }
     removeMarks();
-    if (lockit) {
+    // if (lockit) {
         document.getElementById('searchResult').innerHTML = "";
-    }
-    else {
-        document.getElementById('searchResult').innerHTML = "";
-    }
+    // }
+    // else {
+    //     document.getElementById('searchResult').innerHTML = "";
+    // }
 }
 
 function removeMarks() {
@@ -902,7 +903,7 @@ var addThing = function() {
     colo = colorKeywordToRGB(colo);
     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 regi = /^[SGEIO][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, ttl:0 };
     if (regi.test(icon)) {
         d.SIDC = (icon.toUpperCase()+"------------").substr(0,12);
@@ -1266,7 +1267,7 @@ var addOverlays = function(overlist) {
         };
 
         var decode = function (encoded, options) {
-            options = defaultOptions(options);
+            options = defaultOptions();
             var flatPoints = decodeDeltas(encoded);
             var points = [];
             for (var i = 0, len = flatPoints.length; i + (options.dimension - 1) < len;) {
@@ -1280,7 +1281,7 @@ var addOverlays = function(overlist) {
         }
 
         var decodeDeltas = function (encoded, options) {
-            options = defaultOptions(options);
+            options = defaultOptions();
             var lastNumbers = [];
             var numbers = decodeFloats(encoded, options);
             for (var i = 0, len = numbers.length; i < len;) {
@@ -1292,7 +1293,7 @@ var addOverlays = function(overlist) {
         }
 
         var decodeFloats = function (encoded, options) {
-            options = defaultOptions(options);
+            options = defaultOptions();
             var numbers = decodeSignedIntegers(encoded);
             for (var i = 0, len = numbers.length; i < len; ++i) {
                 numbers[i] /= options.factor;
@@ -1564,6 +1565,7 @@ var rangerings = function(latlng, options) {
 
 // the MAIN add marker or shape to map function
 function setMarker(data) {
+    if (!data) { return; }
     var rightmenu = function(m) {
         m.on('click', function(e) {
             var fb = allData[data["name"]];
@@ -1756,7 +1758,7 @@ function setMarker(data) {
         polygons[data["name"]].lay = lay;
         // if clickable then add popup
         if (opt.clickable === true) {
-            var words = "<b>"+data["name"]+"</b>";
+            let words = "<b>"+data["name"]+"</b>";
             if (data.popup) { words = words + "<br/>" + data.popup.replace(/\${name}/g,data["name"]); }
             polygons[data["name"]].bindPopup(words, {autoClose:false, closeButton:true, closeOnClick:true, minWidth:200});
         }
@@ -1852,11 +1854,11 @@ function setMarker(data) {
             data.iconColor = data.iconColor ?? "black";
             icon = '<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="20" height="20">';
             icon += '<path d="M15.388 4.781c.068.068.061.154-.171.656-.028.06-.18.277-.18.277s.102.113.13.14c.054.055.078.175.056.27-.068.295-.89 1.47-1.35 1.93-.285.286-.432.481-.422.56.009.068.117.356.24.64.219.5.3.599 2.762 3.339 1.95 2.169 2.546 2.87 2.582 3.028.098.439-.282.847-1.264 1.356l-.507.263-7.389-5.29-4.43 3.365.102.18c.056.099.519.676 1.029 1.283.51.607.933 1.161.94 1.232.026.284-1.111 1.177-1.282 1.006-.27-.27-1.399-1.131-1.494-1.14-.068-.007-1.04-.747-1.37-1.077-.329-.33-1.07-1.301-1.076-1.37-.01-.094-.871-1.224-1.14-1.493-.171-.171.722-1.308 1.006-1.282.07.007.625.43 1.231.94.607.51 1.185.973 1.283 1.029l.18.101 3.365-4.43-5.29-7.388.263-.507c.51-.982.918-1.362 1.357-1.264.158.035.859.632 3.028 2.581 2.74 2.462 2.838 2.544 3.339 2.762.284.124.572.232.639.24.08.01.274-.136.56-.422.46-.46 1.635-1.282 1.93-1.35.095-.022.216.003.27.057.028.028.139.129.139.129s.217-.153.277-.18c.502-.233.59-.238.657-.17z" fill="'+data.iconColor+'"/></svg>';
-            var svgplane = "data:image/svg+xml;base64," + btoa(icon);
+            var svgsplane = "data:image/svg+xml;base64," + btoa(icon);
             myMarker = L.divIcon({
                 className:"planeicon",
                 iconAnchor: [16, 16],
-                html:'<img src="'+svgplane+'" style="width:32px; height:32px; -webkit-transform:rotate('+(dir - 45)+'deg); -moz-transform:rotate('+(dir - 45)+'deg);"/>'
+                html:'<img src="'+svgsplane+'" style="width:32px; height:32px; -webkit-transform:rotate('+(dir - 45)+'deg); -moz-transform:rotate('+(dir - 45)+'deg);"/>'
             });
             marker = L.marker(ll, {title:data["name"], icon:myMarker, draggable:drag});
         }
@@ -2052,7 +2054,7 @@ function setMarker(data) {
         }
         else if (data.icon.match(/^:.*:$/g)) { // emoji icon :smile:
             var em = emojify(data.icon);
-            var col = data.iconColor ?? "#910000";
+            let col = data.iconColor ?? "#910000";
             myMarker = L.divIcon({
                 className:"emicon",
                 html: '<center><span style="font-size:2em; color:'+col+'">'+em+'</span></center>',
@@ -2062,7 +2064,7 @@ function setMarker(data) {
             labelOffset = [12,-4];
         }
         else if (data.icon.match(/^https?:.*$|^\/|^data:image\//)) { // web url icon https://...
-            var sz = data.iconSize ?? 32;
+            let sz = data.iconSize ?? 32;
             myMarker = L.icon({
                 iconUrl: data.icon,
                 iconSize: [sz, sz],
@@ -2074,8 +2076,8 @@ function setMarker(data) {
             delete data.iconSize;
         }
         else if (data.icon.substr(0,3) === "fa-") { // fa icon
-            var col = data.iconColor ?? "#910000";
-            var imod = "";
+            let col = data.iconColor ?? "#910000";
+            let imod = "";
             if (data.icon.indexOf(" ") === -1) { imod = "fa-2x "; }
             myMarker = L.divIcon({
                 className:"faicon",
@@ -2088,8 +2090,8 @@ function setMarker(data) {
             labelOffset = [8,-8];
         }
         else if (data.icon.substr(0,3) === "wi-") { // weather icon
-            var col = data.iconColor ?? "#910000";
-            var imod = "";
+            let col = data.iconColor ?? "#910000";
+            let imod = "";
             if (data.icon.indexOf(" ") === -1) { imod = "wi-2x "; }
             myMarker = L.divIcon({
                 className:"wiicon",
@@ -2123,12 +2125,15 @@ function setMarker(data) {
         }
         opts.size = opts.size || sz;
         opts.size = opts.size * (opts.scale || 1);
-        if (data.SIDC.length > 12 && /^[A-Za-z]{2}$/gm.test(data.SIDC.substr(12,2))) {
+        if (!data.flag && data.SIDC.length > 12 && /^[A-Za-z]{2}$/gm.test(data.SIDC.substr(12,2))) {
             var cc = data.SIDC.substr(12,2).toLowerCase();
             opts.country = cc.toUpperCase();
             opts.staffComments = emojify(":flag-"+cc+":") + " " + (opts?.staffComments || "");
             data.flag = opts.country.toUpperCase() + " " + emojify(":flag-"+cc+":");
         }
+        else if(/\p{Emoji}/u.test(data.flag)) {
+            opts.staffComments = data.flag + " " + (opts?.staffComments || "");
+        }
         if (data.SIDC.length == 12 && data?.flag && data.flag.length == 2) {
             opts.staffComments = emojify(":flag-"+data.flag.toLowerCase()+":") + " " + (opts?.staffComments || "");
         }
@@ -2141,7 +2146,7 @@ function setMarker(data) {
                 opts.country = data.flag.toUpperCase() + " " + emojify(":flag-"+data.flag.toLowerCase()+":");
             }
         }
-        console.log("OPTS",opts)
+        //console.log("OPTS",opts)
         data.speed = opts?.speed || data?.speed; // If SIDC then options.speed can override the speed.
         if (data?.speed && !opts?.direction) { opts.direction = data?.track || data?.hdg || data?.heading || data?.COG || data?.bearing }
         if (data.speed == undefined) { delete data.speed; }
@@ -2195,9 +2200,9 @@ function setMarker(data) {
         marker.on('dragend', function (e) {
             var l = marker.getLatLng().toString().replace('LatLng(','lat, lon : ').replace(')','')
             marker.setPopupContent(marker.getPopup().getContent().split("lat, lon")[0] + l);
-            var b = marker.getPopup().getContent().split("heading : ");
-            if (b.length === 2) { b = parseFloat(b[1].split("<br")[0]); }
-            else { b = undefined; }
+            // var b = marker.getPopup().getContent().split("heading : ");
+            // if (b.length === 2) { b = parseFloat(b[1].split("<br")[0]); }
+            // else { b = undefined; }
 
             var fb = allData[marker.name];
             fb.action = "move";
@@ -2304,7 +2309,7 @@ function setMarker(data) {
         delete data.popped;
     }
     // If .label then use that rather than name tooltip
-    if (data.label) {
+    if (data.hasOwnProperty("label")) {
         if (typeof data.label === "boolean" && data.label === true) {
             marker.bindTooltip(data["name"], data.tooltipOptions || { permanent:true, direction:"right", offset:labelOffset });
         }
@@ -2315,7 +2320,7 @@ function setMarker(data) {
         delete data.label;
     }
     // otherwise check for .tooltip then use that rather than name tooltip
-    else if (data.tooltip) {
+    else if (data.hasOwnProperty("tooltip")) {
         if (typeof data.tooltip === "string" && data.tooltip.length > 0) {
             marker.bindTooltip(data.tooltip, data.tooltipOptions || { direction:"bottom", offset:[0,4] });
             delete marker.options.title;
@@ -2447,7 +2452,7 @@ function setMarker(data) {
                     polygon.setStyle({opacity:0});
                 }
             }
-            polygon.name = data["name"];
+            if (polygon !== null) { polygon.name = data["name"]; }
             if (polygons[data["name"]] != null && polygons[data["name"]].hasOwnProperty("_layers")) {
                 polygons[data["name"]].addLayer(polygon);
             }
@@ -2553,7 +2558,7 @@ function doCommand(cmd) {
     }
     if (cmd.hasOwnProperty("grid")) {
         if (cmd.grid.hasOwnProperty("showgrid")) {
-            var changed = false;
+            let changed = false;
             if ((cmd.grid.showgrid == "true" || cmd.grid.showgrid == true ) && !showGrid) { changed = true; }
             if ((cmd.grid.showgrid == "false" || cmd.grid.showgrid == false ) && showGrid) { changed = true; }
             if (changed) {
@@ -2572,7 +2577,7 @@ function doCommand(cmd) {
     }
     if (cmd.hasOwnProperty("ruler")) {
         if (cmd.ruler.hasOwnProperty("showruler")) {
-            var changed = false;
+            let changed = false;
             if ((cmd.ruler.showruler == "true" || cmd.ruler.showruler == true ) && !showRuler) { changed = true; }
             if ((cmd.ruler.showruler == "false" || cmd.ruler.showruler == false ) && showRuler) { changed = true; }
             if (changed) {
@@ -2702,7 +2707,7 @@ function doCommand(cmd) {
                 basemaps[cmd.map.name].removeFrom(map);
                 existsalready = true;
             }
-            var opt = {};
+            let opt = {};
             if (cmd.map.hasOwnProperty("opt")) { opt = cmd.map.opt || {}; }
 
             if (!opt.paintRules && !opt.labelRules && !opt.backgroundColor && !opt.theme) {
@@ -2758,7 +2763,7 @@ function doCommand(cmd) {
             existsalready = true;
         }
         try {
-            var opt = cmd.map.opt || {};
+            let opt = cmd.map.opt || {};
             if (opt.hasOwnProperty("style")) { opt.style = new Function('return ' + opt.style)(); }
             else {
                 opt.style = function(feature) {
@@ -3225,7 +3230,7 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
     opt.pointToLayer = function (feature, latlng) {
         var myMarker;
         if (feature.properties.hasOwnProperty("icon")) {
-            var regi = /^[S,G,E,I,O][A-Z]{3}.*/i;  // if it looks like a SIDC code
+            var regi = /^[SGEIO][A-Z]{3}.*/i;  // if it looks like a SIDC code
             if (regi.test(feature.properties.icon)) {
                 feature.properties.SIDC = (feature.properties.icon.toUpperCase()+"------------").substr(0,12);
                 delete feature.properties.icon;
@@ -3271,7 +3276,7 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
             });
         }
         if (!feature.properties.hasOwnProperty("title") && feature.properties.hasOwnProperty("marker-symbol")) {
-            if (!feature.properties["marker-symbol"].indexOf('fa-') === 0) {
+            if (feature.properties["marker-symbol"].indexOf('fa-') !== 0) {
                 feature.properties.title = feature.properties["marker-symbol"];
             }
         }
@@ -3422,7 +3427,7 @@ function doTAKMCjson(p) {
 }
 
 function convertCOTtoCIFColour(color) {
-    const c = parseInt(color);
+    // const c = parseInt(color);
     const arr = new ArrayBuffer(4);
     const view = new DataView(arr);
     view.setUint32(0, color, false);

package/worldmap.js

@@ -201,7 +201,7 @@ module.exports = function(RED) {
                 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 );
             }
-            if (msg?.payload?.command?.map?.delete) {
+            if (msg.payload?.command?.map?.delete) {
                 var ddd = msg.payload.command.map.delete;
                 if (!Array.isArray(ddd)) { ddd = [cmd.map.delete]; }
                 for (let a=0; a < ddd.length; a++) {
@@ -227,7 +227,8 @@ module.exports = function(RED) {
             for (var i=0; i < RED.httpNode._router.stack.length; i++) {
                 var r = RED.httpNode._router.stack[i];
                 if ((r.name === "serveStatic") && (r.regexp.test(node.path))) {
-                    RED.httpNode._router.stack.splice(i, 1)
+                    RED.httpNode._router.stack.splice(i, 1);
+                    i = i-1;
                 }
             }
             node.status({});
@@ -479,7 +480,7 @@ module.exports = function(RED) {
                     node.send(newmsg);  // send the track
                 }
             }
-            if (msg?.payload?.command?.map?.delete) {
+            if (msg.payload?.command?.map?.delete) {
                 var ddd = msg.payload.command.map.delete;
                 if (!Array.isArray(ddd)) { ddd = [cmd.map.delete]; }
                 for (let a=0; a < ddd.length; a++) {
@@ -492,8 +493,8 @@ module.exports = function(RED) {
                     }
                 }
             }
-            if (msg?.payload?.command?.clear) {
-                if (!isArray(msg?.payload?.command?.clear)) {
+            if (msg.payload?.command?.clear) {
+                if (!isArray(msg.payload?.command?.clear)) {
                     msg.payload.command.clear = [ msg.payload.command.clear ]
                 }
                 msg.payload.command.clear.forEach(function(el) {
@@ -506,8 +507,8 @@ module.exports = function(RED) {
                     }
                 })
             }
-            if (msg?.payload?.command?.clearlayer) {
-                if (!isArray(msg?.payload?.command?.clearlayer)) {
+            if (msg.payload?.command?.clearlayer) {
+                if (!isArray(msg.payload?.command?.clearlayer)) {
                     msg.payload.command.clearlayer = [ msg.payload.command.clearlayer ]
                 }
                 msg.payload.command.clearlayer.forEach(function(el) {

package/worldmap/leaflet/dialog-polyfill.css

@@ -1,37 +0,0 @@
-dialog {
-  position: absolute;
-  left: 0; right: 0;
-  width: -moz-fit-content;
-  width: -webkit-fit-content;
-  width: fit-content;
-  height: -moz-fit-content;
-  height: -webkit-fit-content;
-  height: fit-content;
-  margin: auto;
-  border: solid;
-  padding: 1em;
-  background: white;
-  color: black;
-  display: block;
-}
-
-dialog:not([open]) {
-  display: none;
-}
-
-dialog + .backdrop {
-  position: fixed;
-  top: 0; right: 0; bottom: 0; left: 0;
-  background: rgba(0,0,0,0.1);
-}
-
-._dialog_overlay {
-  position: fixed;
-  top: 0; right: 0; bottom: 0; left: 0;
-}
-
-dialog.fixed {
-  position: fixed;
-  top: 50%;
-  transform: translate(0, -50%);
-}