From aea1d9161fd8b5ae99e998c548951e7c0492c67a Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Thu, 14 Dec 2023 15:38:07 +0000 Subject: [PATCH] catch error reading pmtiles (and ignore any) --- CHANGELOG.md | 2 +- README.md | 2 +- package.json | 2 +- worldmap.js | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e3da92..9d2c3f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### Change Log for Node-RED Worldmap - - v4.6.0 - let default pmtiles be light/dark or monocolored. + - v4.6.1 - let default pmtiles be light/dark or monocolored. - 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. diff --git a/README.md b/README.md index 6c35705..84f5063 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D% ### Updates -- v4.6.0 - let default pmtiles be light/dark or monocolored. +- v4.6.1 - let default pmtiles be light/dark or monocolored. - 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. diff --git a/package.json b/package.json index 0be51c9..acd8b46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-web-worldmap", - "version": "4.6.0", + "version": "4.6.1", "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", diff --git a/worldmap.js b/worldmap.js index a38871a..935659b 100644 --- a/worldmap.js +++ b/worldmap.js @@ -13,11 +13,12 @@ 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')); - pmtiles.forEach(file => { fs.unlinkSync(__dirname + '/worldmap/'+file); }) - pmtiles = fs.readdirSync(RED.settings.userDir).filter(fn => fn.endsWith('.pmtiles')); + var pmtiles; var pmtilesopts; try { + 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')); pmtilesopts = fs.readFileSync(RED.settings.userDir+'/pmtiles.opts'); pmtilesopts = JSON.parse(pmtilesopts); }