node-red-contrib-web-worldmap 5.5.2 → 5.5.4

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+ - v5.5.4 - slight tweak to geojson property display as table
+ - v5.5.3 - ensure SOG gets picked up earlier in chain
  - v5.5.2 - Slight improvement for on/offline choice of map
  - v5.5.1 - Fix maxNativeZoom for pmtiles to pull from tiles files. Issue #312
  - v5.5.0 - Add ability to load raster pmtiles files. Issue #312

package/README.md

@@ -10,6 +10,8 @@ A <a href="https://nodered.org" target="mapinfo">Node-RED</a> node to provide a
 
 ### Updates
 
+- v5.5.4 - slight tweak to geojson property display as table
+- v5.5.3 - ensure SOG gets picked up earlier in chain
 - v5.5.2 - Slight improvement for on/offline choice of map
 - v5.5.1 - Fix maxNativeZoom for pmtiles to pull from tiles files. Issue #312
 - v5.5.0 - Add ability to load raster pmtiles files. Issue #312

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.5.2",
+    "version": "5.5.4",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
         "@turf/bezier-spline": "~7.2.0",

package/worldmap/worldmap.js

@@ -1828,6 +1828,9 @@ function setMarker(data) {
 
     if (data.draggable === true) { drag = true; }
 
+    if (data.sog) { data.speed = data.sog * 0.514444; data.sog = data.sog + " kt"; } // SOG is in knots
+    if (data.SOG) { data.speed = data.SOG * 0.514444; data.SOG = data.SOG + " kt"; } // SOG is in knots
+
     if (data.hasOwnProperty("icon")) {
         var dir = parseFloat(data.track ?? data.hdg ?? data.heading ?? data.bearing ?? "0") + map.getBearing();
         var siz = 32;
@@ -1845,6 +1848,7 @@ function setMarker(data) {
             });
             marker.setHeading(dir);
             q = 'https://www.bing.com/images/search?q='+data.icon+'%20%2B"'+encodeURIComponent(data["name"])+'"';
+            if (data?.IMO) { q = 'https://www.bing.com/images/search?q='+data.IMO; }
             words += '<a href=\''+q+'\' target="_thingpic">Pictures</a><br>';
         }
         else if (data.icon === "plane") {
@@ -2249,8 +2253,6 @@ function setMarker(data) {
         data.alt = +(parseFloat(data.altm)).toFixed(2) + " m";
         delete data.altm;
     }
-    if (data.sog) { data.speed = data.sog * 0.514444; data.sog = data.sog + " kt"; } // SOG is in knots
-    if (data.SOG) { data.speed = data.SOG * 0.514444; data.SOG = data.SOG + " kt"; } // SOG is in knots
 
     // remove items from list of properties, then add all others to popup
     if (data.hasOwnProperty("options")) { delete data.options; }
@@ -3140,7 +3142,7 @@ function doCommand(cmd) {
     // if (cmd.hasOwnProperty("panlock") && lockit === true) { doLock(true); }
 
     if (cmd.hasOwnProperty("zoomLevels")) {
-        if (Array.isArray(cmd.zoomLevels) && cmd?.zoomLevels.length > 0) {
+        if (Array.isArray(cmd.zoomLevels) && cmd.zoomLevels.length > 0) {
             map.options.zooms = cmd.zoomLevels;
         }
         else { delete map.options.zooms; }
@@ -3253,6 +3255,9 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
             delete feature.properties["fill-opacity"];
             delete feature.properties["font-color"];
             delete feature.properties["font-opacity"];
+            // delete feature.properties["styleUrl"];
+            delete feature.properties["styleHash"];
+            delete feature.properties["styleMapHash"];
         }
         if (feature.hasOwnProperty("style")) {
             //console.log("GSTYLE", feature.style)
@@ -3336,12 +3341,21 @@ function doGeojson(n,g,l,o,i) {  // name, geojson, layer, options, icon
             delete tx["_gpxType"];
             var n = tx["name"];
             delete tx["name"];
-            tx = JSON.stringify(tx,null,' ');
-            if ( tx !== "{}") {
-                var gp = '<pre style="overflow-x:scroll">'+tx.replace(/[\{\}"]/g,'')+'</pre>'
-                if (n) { gp = '<b>'+n+'</b>' + gp; }
-                l.bindPopup(gp);
-            }
+            var tx2 = Object.entries(tx);
+            var gp = '<table style="border:none;">';
+            for (var i=0; i < tx2.length; i++) {
+                gp += '<tr><td style="border:none; vertical-align:top; padding-right:3px;">'+tx2[i][0]+'</td><td style="border:none; vertical-align:top;">'+tx2[i][1]+'</td></tr>';
+            }
+            gp += '</table>';
+            //tx = JSON.stringify(tx,null,' ');
+            // if ( tx !== "{}") {
+            //     //var gp = '<pre style="overflow-x:scroll">'+tx.replace(/[\{\}"]/g,'')+'</pre>'
+            //     var gp = '<pre>'+tx.replace(/[\{\}"]/g,'')+'</pre>'
+            //     if (n) { gp = '<b>'+n+'</b>' + gp; }
+            //     l.bindPopup(gp);
+            // }
+            if (n) { gp = '<b>'+n+'</b>' + gp; }
+            if (gp.length > 36) { l.bindPopup(gp); }
         }
         if (o && o.hasOwnProperty("clickable") && o.clickable === true) {
             l.on('click', function (e) {