node-red-contrib-web-worldmap 5.5.1 → 5.5.3

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
+ - 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
  - v5.4.0 - Let msg.payload.command.zoomLevels set an array of acceptable zoom levels. Issue #312

package/README.md

@@ -1,18 +1,17 @@
 # node-red-contrib-web-worldmap
 
+A <a href="https://nodered.org" target="mapinfo">Node-RED</a> node to provide a world map web page for plotting "things" on. Please feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/dceejay) this project.
+
 [![platform](https://img.shields.io/badge/platform-Node--RED-red)](https://nodered.org)
 ![NPM version](https://badge.fury.io/js/node-red-contrib-web-worldmap.svg)
 [![GitHub license](https://img.shields.io/github/license/dceejay/redmap.svg)](https://github.com/dceejay/redmap/blob/master/LICENSE)
 
-A <a href="https://nodered.org" target="mapinfo">Node-RED</a> node to provide a world
-map web page for plotting "things" on.
-
-Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/dceejay) this project.
-
 ![Map Image](https://dceejay.github.io/pages/images/redmap.png)
 
 ### Updates
 
+- 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
 - v5.4.0 - Let msg.payload.command.zoomLevels set an array of acceptable zoom levels. Issue #312
@@ -24,15 +23,6 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 - 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.
-- v5.0.9 - Slight tidy on flags, bump turf dep.
-- v5.0.8 - Fix flag handling for SIDC 2525D, add example.
-- v5.0.7 - Allow Tooltip options (see new example). PR #295.
-- v5.0.6 - Tweak SIDC flag handling slightly to show direction if available and moving.
-- v5.0.4 - Tweak CoT handling slightly.
-- v5.0.3 - Add great context menu example flow. PR #290. Bump express lib. PR #291.
-- v5.0.2 - Fix sidcEdgeIcon docs PR #289.
-- v5.0.1 - Fix isArray error PR #288.
-- v5.0.0 - Feedback cleanup PR #281, edgeicons option PR #287, bump libs for vuln fixes.
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 
@@ -97,6 +87,8 @@ If you use the name without the fa- prefix (eg `male`) you will get the icon ins
 
 You can also specify an emoji as the icon by using the :emoji name: syntax - for example `:smile:`. Here is a **[list of emojis](https://github.com/dceejay/RedMap/blob/master/emojilist.md)**.
 
+Note: Not all browsers/OS support unicode emoji - if you can see the Swiss flag here (🇨🇭) then you may be OK.
+
 Or you can specify an image to load as an icon by setting the icon to `http(s)://...` By default it will be scaled to 32x32 pixels. You can change the size by setting **iconSize** to a number of pixels - eg 64. Example icon - `"https://img.icons8.com/windows/32/000000/bird.png"`  or you can use an inline image of the form `data:image/...`  which uses a base64 encoded image.
 
 There are also several special icons...
@@ -143,8 +135,6 @@ There are lots of extra options you can specify as `msg.payload.options` - see t
 
 Note: If the SIDC code is a 2525C 15 characters long, where chars 13 and 14 are a country code - then the country flag emoji is added to the staffComments field of the icon. If it's a 20 char 2525D code then the options:country property will be used to create the flag.
 
-Note: Not all browsers/OS support unicode emoji - if you can see the Swiss flag here (🇨🇭) then you may be OK.
-
 #### TAK Visualisation
 
 Users of [TAK](https://tak.gov) can use the [TAK ingest node](https://flows.nodered.org/node/node-red-contrib-tak-registration) to create a JSON formatted TAK event object, received from a TAK server. This can be fed directly into the worldmap node.
@@ -766,7 +756,7 @@ You can set some default options for the pmtiles by creating a file called **pmt
 
 theme can be light, dark, white, black, or grayscale. 
 
-The `maxDataZoom` should match the maximum zoom level in you pmtiles file(s) - whereas the `maxZoom` is the leaflet maximum zoom level you want to support. `shade` can be any valid html colour or #rrggbb string, and `dark` is a boolean (default false).
+The `maxNativeZoom` should match the maximum zoom level in you pmtiles file(s) - whereas the `maxZoom` is the leaflet maximum zoom level you want to support. `theme` can be 'light', 'dark', 'white', 'black', or 'grayscale'.
 
 You can also load them dynamically with a command like
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "5.5.1",
+    "version": "5.5.3",
     "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

@@ -181,10 +181,15 @@ var customTopoLayer = L.geoJson(null, {clickable:false, style: {color:"blue", we
 layers["_countries"] = omnivore.topojson('images/world-50m-flat.json',null,customTopoLayer);
 overlays["countries"] = layers["_countries"];
 
-var onoffline = function() { if (!navigator.onLine) {
-    if (pmtloaded !== "") { basemaps[pmtloaded].addTo(map); layercontrol._update(); }
-    else { map.addLayer(overlays["countries"]); }
-} }
+var onoffline = function() {
+    if (!navigator.onLine) {
+        if (pmtloaded !== "") { basemaps[pmtloaded].addTo(map); layercontrol._update(); }
+        else { map.addLayer(overlays["countries"]); }
+    }
+    else if (Object.keys(basemaps).length === 0 ) {
+        map.addLayer(overlays["countries"]);
+    }
+}
 
 document.addEventListener ("keydown", function (ev) {
     // Set Ctl-Alt-3 to switch to 3d view
@@ -1823,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;
@@ -1840,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") {
@@ -2244,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; }
@@ -2739,6 +2746,7 @@ function doCommand(cmd) {
                 }
                 if (h.tileType === 1) {
                     opt.url = cmd.map.pmtiles;
+                    if (!opt.maxDataZoom) { opt.maxDataZoom = h.maxZoom || 15; }
                     basemaps[cmd.map.name] = protomapsL.leafletLayer(opt);
                 }
                 else {
@@ -3134,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; }

package/worldmap.js

@@ -131,9 +131,7 @@ module.exports = function(RED) {
                     client.write(JSON.stringify({command:c}));
                     for (var p=0; p < pmtiles.length; p++) {
                         fs.symlink(RED.settings.userDir+'/'+pmtiles[p], __dirname+'/worldmap/'+pmtiles[p], 'file', (err) => {
-                            if (err) {
-                                if (err.code !== "EEXIST") { console.log(err); }
-                            }
+                            if (err && err.code !== "EEXIST") { console.log(err); }
                         })
                         client.write(JSON.stringify({command: {map: {name:pmtiles[p].split('.')[0], pmtiles:pmtiles[p], opt:pmtilesopts }}}));
                         node.log("Added pmtiles file: "+pmtiles[p]);