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

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### 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
  - v4.2.0 - Let icons also be inline images data:image... 

package/README.md

@@ -13,6 +13,8 @@ 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
 - v4.2.0  - Let icons also be inline images data:image... 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "4.3.0",
+    "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",
@@ -25,7 +25,10 @@
         "node-red",
         "map",
         "world",
-        "tak"
+        "tak",
+        "pmtiles",
+        "esri",
+        "gis"
     ],
     "node-red": {
         "version": ">=2.0.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")) {
@@ -1278,7 +1278,7 @@ var addOverlays = function(overlist) {
                 return x.lng+","+x.lat;
             })).join(';');
 
-            fetch('https://router.project-osrm.org/route/v1/driving/'+p)
+            fetch('https://router.project-osrm.org/route/v1/driving/'+p+'?overview=full')
                 .then(response => response.json())
                 .then(data => {
                     if (data.code !== "Ok") { sendDrawing(n); }
@@ -1554,15 +1554,12 @@ function setMarker(data) {
     opt.color = opt.color ?? data.color ?? data.lineColor ?? "#910000";
     opt.fillColor = opt.fillColor ?? data.fillColor ?? "#910000";
     opt.stroke = opt.stroke ?? (data.hasOwnProperty("stroke")) ? data.stroke : true;
-    opt.weight = opt.weight ?? data.weight;
-    opt.opacity = opt.opacity ?? data.opacity;
-    opt.fillOpacity = opt.fillOpacity ?? data.fillOpacity;
+    opt.weight = opt.weight ?? data.weight ?? 2;
+    opt.opacity = opt.opacity ?? data.opacity ?? 1;
+    if (!data.SIDC) { opt.fillOpacity = opt.fillOpacity ?? data.fillOpacity ?? 0.2; }
     opt.clickable = (data.hasOwnProperty("clickable")) ? data.clickable : false;
     opt.fill = 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")) {
@@ -1719,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;
@@ -2056,6 +2061,7 @@ function setMarker(data) {
         });
         marker =  L.marker(ll, { title:data.name, icon:myicon, draggable:drag });
         edgeAware();
+        delete data.options;
     }
     else { // Otherwise just a generic map marker pin
         myMarker = L.VectorMarkers.icon({
@@ -2130,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/>";
@@ -2567,7 +2574,7 @@ function doCommand(cmd) {
             basemaps[baselayername].addTo(map);
         }
     }
-    // Add a new PMtiles/PBF feature layer
+    // Add a new PMtiles/PBF feature baselayer
     if (cmd.map && cmd.map.hasOwnProperty("name") && cmd.map.hasOwnProperty("pmtiles") ) {
         try {
             if (basemaps.hasOwnProperty(cmd.map.name)) {
@@ -2865,7 +2872,7 @@ function doCommand(cmd) {
         if (cmd.map.hasOwnProperty("fly") && cmd.map.fly === true) { map.flyToBounds(overlays[cmd.map.overlay].getBounds()); }
         else if (cmd.map.hasOwnProperty("fit") && cmd.map.fit === true) { map.fitBounds(overlays[cmd.map.overlay].getBounds()); }
     }
-    // Add a new overlay layer
+    // Add a new leaflet (or WMS) overlay layer
     if (cmd.map && cmd.map.hasOwnProperty("overlay") && cmd.map.hasOwnProperty("url") && cmd.map.hasOwnProperty("opt")) {
         console.log("New overlay:",cmd.map.overlay);
         if (overlays.hasOwnProperty(cmd.map.overlay)) { existsalready = true; }
@@ -3145,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) {