node-red-contrib-web-worldmap 5.6.0 → 5.6.2

package/CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Change Log for Node-RED Worldmap
 
+ - v5.6.1 - Also call autoswitch on initial connect to ensure map in view.
  - v5.6.0 - Autoswitch pmtiles basemaps based on zoom and/or coverage.
  - v5.5.8 - Bump qs dep for CVE
  - v5.5.7 - Fix COG handling for built in icons, bump various libs for CVEs

package/README.md

@@ -10,6 +10,7 @@ A <a href="https://nodered.org" target="mapinfo">Node-RED</a> node to provide a
 
 ### Updates
 
+- v5.6.1 - Also call autoswitch on initial connect to ensure map in view.
 - v5.6.0 - Autoswitch pmtiles basemaps based on zoom and/or coverage.
 - v5.5.8 - Bump qs dep for CVE
 - v5.5.7 - Fix COG handling for built in icons, bump various libs for CVEs
@@ -21,12 +22,6 @@ A <a href="https://nodered.org" target="mapinfo">Node-RED</a> node to provide a
 - v5.4.0 - Let msg.payload.command.zoomLevels set an array of acceptable zoom levels. Issue #312
 - v5.3.0 - Let msg.payload.popupOptions object set Leaflet popup options so it can be customised. Issue #311
 - v5.2.0 - Allow left click send back co-ords. Let Button be replaceable more easily and take value property. Issue #308 and #309
-- v5.1.6 - Let Cot __milsym set the SIDC if present.
-- v5.1.5 - Fix links to SIDC unitgenerator so it is now local.
-- v5.1.4 - Fix clearlayer for tracks node.
-- v5.1.2 - Fix for longer line msg properties.
-- v5.1.1 - Fix CoT inline image.
-- v5.1.0 - Let special icons be sizeable using iconSize property.
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 

package/node_modules/path-to-regexp/index.js

@@ -94,6 +94,7 @@ function pathToRegexp(path, keys, options) {
       pos = offset + match.length;
 
       if (match === '*') {
+        backtrack = '';
         extraOffset += 3;
         return '(.*)';
       }
@@ -123,6 +124,7 @@ function pathToRegexp(path, keys, options) {
         + ')'
         + optional;
 
+      backtrack = '';
       extraOffset += result.length - match.length;
 
       return result;

package/node_modules/path-to-regexp/package.json

@@ -1,7 +1,7 @@
 {
   "name": "path-to-regexp",
   "description": "Express style path to RegExp utility",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "files": [
     "index.js",
     "LICENSE"

package/package.json

@@ -1,18 +1,18 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.6.0",
+    "version": "5.6.2",
     "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
     "dependencies": {
-        "@turf/bezier-spline": "~7.3.4",
+        "@turf/bezier-spline": "7.3.4",
         "cgi": "0.3.1",
-        "compression": "^1.8.1",
-        "express": "^4.22.1",
-        "sockjs": "~0.3.24"
+        "compression": "1.8.1",
+        "express": "4.22.1",
+        "sockjs": "0.3.24"
     },
     "overrides": {
         "express": {
             "body-parser": {
-                "qs": "^6.14.2"
+                "qs": "6.14.2"
             }
         }
     },

package/worldmap/worldmap.js

@@ -94,7 +94,7 @@ var connect = function() {
             document.getElementById("footer").innerHTML = "<font color='#494'>"+pagefoot+"</font>";
         }
         ws.send(JSON.stringify({action:"connected",parameters:Object.fromEntries((new URL(location)).searchParams),clientTimezone:Intl.DateTimeFormat().resolvedOptions().timeZone || false}));
-        setTimeout(function() { onoffline(); }, 500);
+        setTimeout(function() { onoffline(); pickMapLayer();}, 500);
     };
     ws.onclose = function() {
         console.log("DISCONNECTED");
@@ -862,23 +862,7 @@ function showMapCurrentZoom() {
     },750);
 }
 
-map.on('zoomend', function() {
-    showMapCurrentZoom();
-    window.localStorage.setItem("lastzoom", map.getZoom());
-    var b = map.getBounds();
-    oldBounds = {sw:{lat:b._southWest.lat,lng:b._southWest.lng},ne:{lat:b._northEast.lat,lng:b._northEast.lng}};
-    ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
-    edgeAware();
-});
-map.on('moveend', function() {
-    window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter()));
-    var b = map.getBounds();
-    if (b._southWest.lat !== oldBounds.sw.lat && b._southWest.lng !== oldBounds.sw.lng && b._northEast.lat !== oldBounds.ne.lat && b._northEast.lng !== oldBounds.ne.lng) {
-        ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
-        oldBounds = {sw:{lat:b._southWest.lat,lng:b._southWest.lng},ne:{lat:b._northEast.lat,lng:b._northEast.lng}};
-    }
-    edgeAware();
-
+function pickMapLayer() {
     // if we have bounds meta data for the current baselayer (usually pmtiles)
     if (basemaps[baselayername] && basemaps[baselayername].hasOwnProperty("meta")) {
         const m = basemaps[baselayername].meta
@@ -931,6 +915,25 @@ map.on('moveend', function() {
             }
         }
     }
+}
+
+map.on('zoomend', function() {
+    showMapCurrentZoom();
+    window.localStorage.setItem("lastzoom", map.getZoom());
+    var b = map.getBounds();
+    oldBounds = {sw:{lat:b._southWest.lat,lng:b._southWest.lng},ne:{lat:b._northEast.lat,lng:b._northEast.lng}};
+    ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
+    edgeAware();
+});
+map.on('moveend', function() {
+    window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter()));
+    var b = map.getBounds();
+    if (b._southWest.lat !== oldBounds.sw.lat && b._southWest.lng !== oldBounds.sw.lng && b._northEast.lat !== oldBounds.ne.lat && b._northEast.lng !== oldBounds.ne.lng) {
+        ws.send(JSON.stringify({action:"bounds", south:b._southWest.lat, west:b._southWest.lng, north:b._northEast.lat, east:b._northEast.lng, zoom:map.getZoom() }));
+        oldBounds = {sw:{lat:b._southWest.lat,lng:b._southWest.lng},ne:{lat:b._northEast.lat,lng:b._northEast.lng}};
+    }
+    edgeAware();
+    pickMapLayer();
 });
 map.on('locationfound', onLocationFound);
 map.on('locationerror', onLocationError);

package/worldmap.js

@@ -270,7 +270,7 @@ module.exports = function(RED) {
         ui = RED.require("node-red-dashboard")(RED);
     }
     catch(e) {
-        RED.log.info("Node-RED Dashboard 1 not found - ui_worldmap node not installed.");
+        // RED.log.info("Node-RED Dashboard 1 not found - ui_worldmap node not installed.");
     }
     setTimeout( function() {
         if (ui) {