npm - node-red-contrib-web-worldmap - Versions diffs - 2.22.0 → 2.23.0 - Mend

node-red-contrib-web-worldmap 2.22.0 → 2.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,8 @@
 ### Change Log for Node-RED Worldmap
+ - v2.23.0 - Give logo and id so it can be overridden by toplogo command. PR #188.
+ - v2.22.3 - Don't show empty popup for geojson object. Issue #186. Add wobble to null island.
+ - v2.22.2 - Be more tolerant of speed string types
  - v2.22.0 - Separate out layer events in worldmap in
  - v2.21.9 - Unbreak Drawing layer that I must have broken recently
  - v2.21.8 - Let SIDC/icon short code be only 4 chars long

package/README.md CHANGED Viewed

@@ -11,6 +11,9 @@ map web page for plotting "things" on.
 ### Updates
+- v2.23.0 - Give logo and id so it can be overridden by toplogo command. PR #188.
+- v2.22.3 - Don't show empty popup for geojson object. Issue #186. Add wobble to null island.
+- v2.22.2 - Be more tolerant of speed string types
 - v2.22.0 - Separate out layer events in worldmap in
 - v2.21.9 - Unbreak Drawing layer that I must have broken recently
 - v2.21.8 - Let SIDC/icon short code be only 4 chars long
@@ -411,6 +414,8 @@ Optional properties include
  - **button** - if supplied with a `name` and `icon` property - adds a button to provide user input - sends
  a msg `{"action":"button", "name":"the_button_name"}` to the worldmap in node. If supplied with a `name` property only, it will remove the button. Optional `position` property can be 'bottomright', 'bottomleft', 'topleft' or 'topright' (default).
  - **contextmenu** - html string to define the right click menu when not on a marker. Defaults to the simple add marker input. Empty string `""` disables this right click.
+ - **toptitle** - Words to replace title in title bar (if not in iframe)
+ - **toplogo** - URL to logo image for top tile bar (if not in iframe) - ideally 60px by 24px.
 #### To switch layer, move map and zoom

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.22.0",
+    "version": "2.23.0",
     "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/index.html CHANGED Viewed

@@ -80,7 +80,7 @@
 <body>
 <div id="topbar">
-    <a href="https://nodered.org"><img src="images/node-red.png" width="60" height="24" alt="NRed"/></a>
+    <a href="https://nodered.org" id="toplink"><img id="toplogo" src="images/node-red.png" style="max-width:60px; height:24px; margin-top:-3px" alt="NRed"/></a>
     <span class="topbar" id="topwords"> Node-RED - map all the things</span>
 </div>
 <div id="results">

package/worldmap/worldmap.js CHANGED Viewed

@@ -1340,7 +1340,7 @@ function setMarker(data) {
     }
     // console.log("DATA", typeof data, data);
-    if (data.deleted) { // remove markers we are told to
+    if (data.deleted == true) { // remove markers we are told to
         delMarker(data.name);
         return;
     }
@@ -1491,6 +1491,13 @@ function setMarker(data) {
         return;
     }
+    if (ll.lat === 0 && ll.lng === 0) {
+        // Add a little wobble so we can zoom into each if required.
+        console.log(data.name,"is at null island.");
+        ll.lat = Math.round(1000000 * ll.lat + Math.random() * 10000 - 5000) / 1000000;
+        ll.lng = Math.round(1000000 * ll.lng + Math.random() * 10000 - 5000) / 1000000;
+    }
     // Adding new L.LatLng object (lli) when optional intensity value is defined. Only for use in heatmap layer
     if (typeof data.coordinates == "object") { lli = new L.LatLng(data.coordinates[2],data.coordinates[1],data.coordinates[0]); }
     else if (data.hasOwnProperty("lat") && data.hasOwnProperty("lon") && data.hasOwnProperty("intensity")) { lli = new L.LatLng((data.lat*1), (data.lon*1), (data.intensity*1)); }
@@ -1954,7 +1961,7 @@ function setMarker(data) {
     if (data.dashArray) { delete data.dashArray; }
     if (data.fill) { delete data.fill; }
     if (data.draggable) { delete data.draggable; }
-    if (!isNaN(data.speed)) { data.speed = data.speed.toFixed(2); }
+    //if (!isNaN(data.speed)) { data.speed = data.speed.toFixed(2); }
     if (data.hasOwnProperty("clickable")) { delete data.clickable; }
     if (data.hasOwnProperty("fillColor")) { delete data.fillColor; }
     if (data.hasOwnProperty("radius")) { delete data.radius; }
@@ -2066,6 +2073,12 @@ function doCommand(cmd) {
             document.getElementById("topwords").innerText = cmd.toptitle;
         }
     }
+    if (cmd.hasOwnProperty("toplogo")) {
+        if (!inIframe ) {
+            document.getElementById("toplogo").src = cmd.toplogo;
+            document.getElementById("toplink").setAttribute("style", "pointer-events:none");
+        }
+    }
     if (cmd.hasOwnProperty("clear")) {
         doTidyUp(cmd.clear);
     }
@@ -2266,7 +2279,8 @@ function doCommand(cmd) {
             return st;
         }};
         opt.onEachFeature = function (f,l) {
-            l.bindPopup('<pre>'+JSON.stringify(f.properties,null,' ').replace(/[\{\}"]/g,'')+'</pre>');
+            var pw = '<pre>'+JSON.stringify(f.properties,null,' ').replace(/[\{\}"]/g,'')+'</pre>';
+            if (pw.length > 11) { l.bindPopup(pw); }
             if (cmd.map.hasOwnProperty("clickable") && cmd.map.clickable === true) {
                 l.on('click', function (e) {
                     ws.send(JSON.stringify({action:"clickgeo",name:cmd.map.overlay,type:f.type,properties:f.properties,geometry:f.geometry}));

package/worldmap.js CHANGED Viewed

@@ -252,7 +252,7 @@ module.exports = function(RED) {
                     if ((node.events.indexOf("point")!==-1) && ((message.action === "point")||(message.action === "move")||(message.action === "delete") ))  {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
-                    if ((node.events.indexOf("layer")!==-1) && ((message.action === "layer") ))  {
+                    if ((node.events.indexOf("layer")!==-1) && (message.action.indexOf("layer") !== -1) )  {
                         setImmediate(function() {node.send({payload:message, topic:node.path.substr(1), _sessionid:client.id, _sessionip:sessionip})});
                     }
                     if ((node.events.indexOf("files")!==-1) && (message.action === "file"))  {