From c740dfa78369bfca3054df15092994936ea1ac8d Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Tue, 3 Oct 2023 13:28:09 +0100 Subject: [PATCH] bump to Leaflet 1.94, replace draw with geoman, and add rotation (#249) * Handle drawing double click better * bump to 1.9.4, add geoman and rotation remove Draw (use geoman instead) --- CHANGELOG.md | 6 + README.md | 6 + package.json | 6 +- worldmap.html | 4 +- worldmap.js | 4 +- worldmap/index.html | 7 +- worldmap/leaflet/images/marker-icon-2x.png | Bin 2586 -> 2464 bytes worldmap/leaflet/leaflet-geoman.css | 283 +++++++++++++++++++++ worldmap/leaflet/leaflet-geoman.min.js | 1 + worldmap/leaflet/leaflet-rotate.js | 2 + worldmap/leaflet/leaflet.css | 114 +++++---- worldmap/leaflet/leaflet.draw.css | 10 - worldmap/leaflet/leaflet.draw.js | 10 - worldmap/leaflet/leaflet.js | 6 +- worldmap/worldmap.js | 117 +++++---- 15 files changed, 441 insertions(+), 135 deletions(-) create mode 100644 worldmap/leaflet/leaflet-geoman.css create mode 100644 worldmap/leaflet/leaflet-geoman.min.js create mode 100644 worldmap/leaflet/leaflet-rotate.js delete mode 100644 worldmap/leaflet/leaflet.draw.css delete mode 100644 worldmap/leaflet/leaflet.draw.js diff --git a/CHANGELOG.md b/CHANGELOG.md index b86e702..6afd2ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ### Change Log for Node-RED Worldmap + - v3.0.0 - Bump to Leaflet 1.9.4 + Move to geoman for drawing shapes. + Allow command.rotation to set rotation of map. + Allow editing of multipoint geojson tracks. + + - v2.43.1 - Tweak drawing layer double click - v2.43.0 - Revert leaflet update as it broke Draw - v2.42.3 - More KML and GEOJson drag drop fixes - v2.42.1 - Remove extraneous debug logging, fix KMZ icons diff --git a/README.md b/README.md index 1829a46..e309b6b 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,11 @@ Feel free to [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D% ### Updates +- v3.0.0 - Bump to Leaflet 1.9.4 + Move to geoman for drawing shapes. + Allow command.rotation to set rotation of map. + Allow editing of multipoint geojson tracks. +- v2.43.1 - Tweak drawing layer double click - v2.43.0 - Revert leaflet update as it broke Draw - v2.42.3 - More KML and GEOJson drag drop fixes - v2.42.1 - Remove extraneous debug logging, fix KMZ icons @@ -413,6 +418,7 @@ Optional properties include - **lat** - move map to specified latitude. - **lon** - move map to specified longitude. + - **rotation** - rotate the base map to the specified compass angle. - **zoom** - move map to specified zoom level (1 - world, 13 to 20 max zoom depending on map). - **bounds** - if set to an array `[ [ lat(S), lon(W) ], [lat(N), lon(E)] ]` - sets the overall map bounds. - **layer** - set map to specified base layer name - `{"command":{"layer":"Esri"}}` diff --git a/package.json b/package.json index 2ad1a19..3444bb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-web-worldmap", - "version": "2.43.0", + "version": "3.0.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", @@ -28,7 +28,7 @@ "tak" ], "node-red": { - "version": ">=1.0.0", + "version": ">=2.0.0", "nodes": { "worldmap": "worldmap.js" } @@ -42,6 +42,6 @@ "@HiroyasuNishiyama" ], "engines": { - "node": ">=10" + "node": ">=16" } } diff --git a/worldmap.html b/worldmap.html index 6b69db6..ac710af 100644 --- a/worldmap.html +++ b/worldmap.html @@ -380,8 +380,8 @@ If Web Path is left empty, then by default ⌘⇧m - c showruler: {value:"false"}, allowFileDrop: {value:"false"}, path: {value:"/worldmap"}, - overlist: {value:"DR,CO,RA,DN,HM"}, - maplist: {value:"OSMG,OSMC,EsriC,EsriS,EsriT,EsriDG,UKOS"}, + overlist: {value:"DR,CO,RA,DN"}, + maplist: {value:"OSMG,OSMC,EsriC,EsriS,UKOS"}, mapname: {value:""}, mapurl: {value:""}, mapopt: {value:"", validate:function(v) {try{ v.length===0 || JSON.parse(v); return true;} catch(e) {return false;}}}, diff --git a/worldmap.js b/worldmap.js index 8e7c9e5..ee97f60 100644 --- a/worldmap.js +++ b/worldmap.js @@ -40,8 +40,8 @@ module.exports = function(RED) { node.mapurl = n.mapurl || ""; node.mapopt = n.mapopt || ""; node.mapwms = n.mapwms || false; - if (n.maplist === undefined) { node.maplist = "OSMG,OSMC,EsriC,EsriS,EsriT,EsriDG,UKOS,SW"; } - if (n.overlist === undefined) { node.overlist = "DR,CO,RA,DN,HM"; } + if (n.maplist === undefined) { node.maplist = "OSMG,OSMC,EsriC,EsriS,UKOS"; } + if (n.overlist === undefined) { node.overlist = "DR,CO,RA,DN"; } try { node.mapopt2 = JSON.parse(node.mapopt); } catch(e) { node.mapopt2 = null; } diff --git a/worldmap/index.html b/worldmap/index.html index a4c98f7..75a327f 100644 --- a/worldmap/index.html +++ b/worldmap/index.html @@ -1,5 +1,6 @@