node-red-contrib-web-worldmap 4.3.1 → 4.3.2

package/CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v4.3.2 - Fix geojson popup missing label name.
  - v4.3.1 - Small fix to icon transparency, and routing detail.
  - v4.3.0 - Add support for PMtiles files.
  - v4.2.1 - Revert use of optional chaining to extend life slightly. Issue #252

package/README.md

@@ -13,6 +13,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- v4.3.2  - Fix geojson popup missing label name.
 - v4.3.1  - Small fix to icon transparency, and routing detail.
 - v4.3.0  - Add support for PMtiles files.
 - v4.2.1  - Revert use of optional chaining to extend life slightly. Issue #252

package/package.json

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

package/worldmap/worldmap.js

@@ -117,7 +117,7 @@ console.log("CONNECT TO",location.pathname + 'socket');
 
 var handleData = function(data) {
     if (Array.isArray(data)) {
-        //console.log("ARRAY");
+        //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")) {
@@ -1716,8 +1716,16 @@ function setMarker(data) {
         delete data.position;
         ll = new L.LatLng((data.lat*1), (data.lon*1));
     }
-    else if (data.hasOwnProperty("lat") && data.hasOwnProperty("lon")) { ll = new L.LatLng((data.lat*1), (data.lon*1)); }
-    else if (data.hasOwnProperty("latitude") && data.hasOwnProperty("longitude")) { ll = new L.LatLng((data.latitude*1), (data.longitude*1)); }
+    else if (data.hasOwnProperty("lat") && data.hasOwnProperty("lon")) {
+        if (isNaN(data.lat*1)) { console.log("Invalid lat: lat:",data.lat, " - lon:",data.lon); return; }
+        if (isNaN(data.lon*1)) { console.log("Invalid lon: lat:",data.lat, " - lon:",data.lon); return; }
+        ll = new L.LatLng((data.lat*1), (data.lon*1));
+    }
+    else if (data.hasOwnProperty("latitude") && data.hasOwnProperty("longitude")) {
+        if (isNaN(data.latitude*1)) { console.log("Invalid latitude: lat:",data.latitude, " - lon:",data.longitude); return; }
+        if (isNaN(data.longitude*1)) { console.log("Invalid longitude: lat:",data.latitude, " - lon:",data.longitude); return; }
+        ll = new L.LatLng((data.latitude*1), (data.longitude*1));
+    }
     else {
         // console.log("No location:",data);
         return;
@@ -2128,6 +2136,7 @@ function setMarker(data) {
     // remove items from list of properties, then add all others to popup
     if (data.hasOwnProperty("options")) { delete data.options; }
     if (data.hasOwnProperty("icon")) { delete data.icon; }
+    if (data.hasOwnProperty("iconSize")) { delete data.iconSize; }
     if (data.hasOwnProperty("iconColor")) { delete data.iconColor; }
     if (data.hasOwnProperty("photourl")) {
         words += "<img src=\"" + data.photourl + "\" style=\"max-width:100%; max-height:250px; margin-top:10px;\"><br/>";
@@ -3143,7 +3152,9 @@ function doGeojson(n,g,l,o) {  // name, geojson, layer, options
             delete tx["name"];
             tx = JSON.stringify(tx,null,' ');
             if ( tx !== "{}") {
-                l.bindPopup('<b>'+n+'</b><pre style="overflow-x:scroll">'+tx.replace(/[\{\}"]/g,'')+'</pre>');
+                var gp = '<pre style="overflow-x:scroll">'+tx.replace(/[\{\}"]/g,'')+'</pre>'
+                if (n) { gp = '<b>'+n+'</b>' + gp; }
+                l.bindPopup(gp);
             }
         }
         if (o && o.hasOwnProperty("clickable") && o.clickable === true) {