node-red-contrib-web-worldmap 4.5.0 → 4.5.2

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 ### Change Log for Node-RED Worldmap
 
- - v4.5.0 - Fix pmtiles to look for maps in userdir rather than modules
+ - v4.5.2 - Tidy up when pmtiles removed.
+ - v4.5.0 - Fix pmtiles to look for maps in userdir rather than modules.
  - v4.4.0 - Add quad(copter) drone icon.
  - v4.3.3 - Fix for objects changing layers.
  - v4.3.2 - Fix geojson popup missing label name.

package/README.md

@@ -13,6 +13,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%
 
 ### Updates
 
+- v4.5.2  - Tidy up when pmtiles removed.
 - v4.5.0  - Fix pmtiles to look for maps in userdir rather than modules
 - v4.4.0  - Add quad(copter) drone icon.
 - v4.3.3  - Fix for objects changing layers.
@@ -723,6 +724,10 @@ You can use a PMtiles format map archive file from [Protomaps](https://docs.prot
 
 Copy your .pmtiles file(s) into your `~/.node-red` user directory. On re-starting Node-RED the node will detect the file(s) and add them to the base map layer menu, using the file name as the layer name.
 
+You can also load them dynamically with a command like
+
+    msg.payload = {"command":{"map":{"name":"MyMap","pmtiles":"/path/to/mymap.pmtiles"}}}
+
 ### Using a Docker Map Server
 
 I have found the easiest to use mapserver for decent generic map to be Tileserver-gl. It uses mbtiles format maps - for example from [MapTiler Data](https://data.maptiler.com/downloads/planet/). You can download your mbtiles file into a directory and then from that directory run

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "4.5.0",
+    "version": "4.5.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.js

@@ -13,8 +13,9 @@ module.exports = function(RED) {
     if (fs.existsSync((__dirname + '/mapserv'))) {
         RED.httpNode.use("/cgi-bin/mapserv", require('cgi')(__dirname + '/mapserv'));
     }
-    //var pmtiles = fs.readdirSync(__dirname + '/worldmap').filter(fn => fn.endsWith('.pmtiles'));
-    var pmtiles = fs.readdirSync(RED.settings.userDir).filter(fn => fn.endsWith('.pmtiles'));
+    var pmtiles = fs.readdirSync(__dirname + '/worldmap').filter(fn => fn.endsWith('.pmtiles'));
+    pmtiles.forEach(file => { fs.unlinkSync(__dirname + '/worldmap/'+file); })
+    pmtiles = fs.readdirSync(RED.settings.userDir).filter(fn => fn.endsWith('.pmtiles'));
 
     function worldMap(node, n) {
         var allPoints = {};
@@ -126,10 +127,8 @@ module.exports = function(RED) {
                             if (err) {
                                 if (err.code !== "EEXIST") { console.log(err); }
                             }
-                            else {
-                                client.write(JSON.stringify({command: {map: {name:pmtiles[p].split('.')[0], pmtiles:pmtiles[p] }}}));
-                            }
                         })
+                        client.write(JSON.stringify({command: {map: {name:pmtiles[p].split('.')[0], pmtiles:pmtiles[p] }}}));
                     }
                     var o = Object.values(allPoints);
                     o.map(v => delete v.tout);
@@ -165,6 +164,17 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
             if (!msg.hasOwnProperty("payload")) { node.warn("Missing payload"); return; }
+
+            if (msg.payload.hasOwnProperty("command") && msg.payload.command.hasOwnProperty("map") && msg.payload.command.map.hasOwnProperty("pmtiles")) {
+                if (msg.payload.command.map.pmtiles.indexOf("http") !== 0) {
+                    fs.symlink(msg.payload.command.map.pmtiles, __dirname+'/worldmap/'+msg.payload.command.map.name+'.pmtiles', 'file', (err) => {
+                        if (err) {
+                            if (err.code !== "EEXIST") { console.log(err); }
+                        }
+                    });
+                    msg.payload.command.map.pmtiles = msg.payload.command.map.name+'.pmtiles';
+                }
+            }
             if (msg.hasOwnProperty("_sessionid")) {
                 if (clients.hasOwnProperty(msg._sessionid)) {
                     clients[msg._sessionid].write(JSON.stringify(msg.payload));