node-red-contrib-web-worldmap 2.23.1 → 2.23.5

package/CHANGELOG.md

@@ -1,10 +1,16 @@
 ### Change Log for Node-RED Worldmap
 
+ - v2.23.5 - Fix addtoheatmap. Issue #192
+ - v2.23.4 - Fix opacity of area borders
+ - v2.23.3 - Fix initial load of maps
+ - v2.23.2 - Add convex-hull example
  - v2.23.1 - Fix saving of custom map layer
  - 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
  - v2.21.5 - Fix handling of "old" ship nav to ship navigation
@@ -13,34 +19,47 @@
  - v2.21.2 - Expand ship nav to ship navigation.
  - v2.21.1 - Fix ui check callback to not use .
  - v2.21.0 - Let config panel select maps to show, default map and choice of overlays.
+
  - v2.20.0 - Add support of .pbf map layers. Issue #123.
+
  - v2.19.0 - Bump leaflet to latest. v1.7
+
  - v2.18.1 - Let fillOpacity be 0.
  - v2.18.0 - Add bounds event onzoom or drag.
+
  - v2.17.3 - Yet more better feedback on clicks, moves.
  - v2.17.2 - Add smallplane icon.
  - v2.17.1 - More complete feedback on click, better popup image sizing.
+
  - v2.16.3 - Ensure polygons can be deleted.
  - v2.16.2 - Better handling of unpacked kmz objects.
  - v2.16.0 - Allow specifying custom base map server.
+
  - v2.15.8 - Adjust ui check timing for UI worldmap.
  - v2.15.7 - Tidy up geoJson handling a bit more.
  - v2.15.5 - Fix SIDC icons to accept unicoded icons as labels.
  - v2.15.4 - Let clear heatmap command do what it says.
  - v2.15.3 - Fix panit command to work, try to use alt units, popup alignments.
  - v2.15.0 - Let speed be text and specify units if required (kt,kn,knots,mph,kmh,kph) default m/s.
+
  - v2.14.0 - Let geojson features be clickable if added as overlay.
+
  - v2.13.4 - Fix list of map choices to be in sync. Fix popup auto sizing.
  - v2.13.3 - Fix unchanged layer propagation.
  - v2.13.2 - Add mayflower icon.
  - v2.13.0 - Tidy velocity layer. Feedback any url parameters.
+
  - v2.12.1 - Only show online layer options if we are online.
  - v2.12.0 - Add live rainfall radar data layer. Remove some non-loading overlays.
+
  - v2.11.2 - Allow thicknesss of arc to be specified by weight
  - v2.11.1 - Better handle KML point info - add popup.
  - v2.11.0 - Add option to smooth tracks using bezier curves.
+
  - v2.10.0 - Save latest position to browser for refresh if in iframe/dashboard. Allow fractional Zoom levels.
+
  - v2.9.0 - Let weblinks be an array of links. Add more info to readme about Mapservers.
+
  - v2.8.9 - Only load cgi module if we have a local mapserv file
  - v2.8.8 - Change length of speed leader to show where you will be in 1 min if speed in m/s
  - v2.8.7 - Delay start of ui widget.
@@ -50,10 +69,13 @@
  - v2.8.2 - Improve direction handling of 3d objects.
  - v2.8.1 - Fix old tracks re-appearing afer hide/show. Issue #135
  - v2.8.0 - Align vector with `track`, prioritise hdg and heading over bearing. Add old location to move action.
+
  - v2.7.1 - Also allow geojson files to be dropped, and better png handling
  - v2.7.0 - Allow track and image files to be dragged onto the map, if enabled
+
  - v2.6.1 - Better fit for worldmap when in ui_template
  - v2.6.0 - Add route capability to draw line when online
+
  - v2.5.9 - Fix handling of multiple hulls, tidy contextmenu handling
  - v2.5.8 - Let node name be the full page map title
  - v2.5.7 - Let fillColor set color of hulls
@@ -64,8 +86,10 @@
  - v2.5.2 - Add boolean parameter to feedback call to allow auto close of popup on click. Set Esc key to close all open popups. Issue #146
  - v2.5.1 - Add lat, lng and layer to feedback function.
  - v2.5.0 - Add minimap capability.
+
  - v2.4.2 - Fix editing injected shapes.
  - v2.4.1 - Add convex-hull node for grouping objects.
+
  - v2.3.16 - Add heading to default addMarker, allow custom http icon size.
  - v2.3.13 - Fix geoson feature properties fill color, and better marker handling
  - v2.3.11 - Better editing of drawing layer, add OpenTopoMap, and better Esri satellite
@@ -79,8 +103,10 @@
  - v2.3.2 - Add better geojson support - name plus geojson properties
  - v2.3.1 - Stop adding point when you add a circle
  - v2.3.0 - Add colour options for drawing layer
+
  - v2.2.1 - Better implementation of legend create/show/hide
  - v2.2.0 - Add range rings and arcs function
+
  - v2.1.6 - Add legend command to allow inserting an html legend
  - v2.1.5 - Fix squawk icon color handling
  - v2.1.4 - Fix alt and speed as strings
@@ -88,6 +114,7 @@
  - v2.1.2 - Fix layercontrol remove bug. Issue #116
  - v2.1.1 - Fix bug in repeated add with polygon
  - v2.1.0 - Add ui-worldmap node to make embedding in Dashboard easier. Let -in node specify connection actions only.
+
  - v2.0.22 - fix SIDC missing property
  - v2.0.21 - allow adding overlays without making them visible (visible:false). Issue #108
  - v2.0.20 - ensure `fit` option is boolean, Issue #109. Fix track layers, Issue #110.
@@ -106,6 +133,7 @@
  - v2.0.2-beta - Let lines and areas also have popups
  - v2.0.1-beta - Add optional graticule.
  - v2.0.0-beta - Move to leaflet 1.4.x plus all plugins updated
+
  - v1.5.40 - Only enable on.location function when not in an iframe. Issue #89. Tidy html.
  - v1.5.39 - Add weather-lite icons
  - v1.5.38 - Add Esri dark grey and ocean, re-add hikebike, layers

package/README.md

@@ -11,30 +11,15 @@ map web page for plotting "things" on.
 
 ### Updates
 
+- v2.23.5 - Fix addtoheatmap. Issue #192
+- v2.23.4 - Fix opacity of area borders
+- v2.23.3 - Fix initial load of maps
+- v2.23.2 - Add convex-hull example
 - v2.23.1 - Fix saving of custom map layer
 - 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
-- v2.21.5 - Fix handling of "old" ship nav to ship navigation
-- v2.21.4 - Fix speed leader length. Add transparentPixels option..
-- v2.21.3 - Add zoom to bounds action. Adjust map layers max zoom levels.
-- v2.21.2 - Expand ship nav to ship navigation.
-- v2.21.1 - Fix ui check callback to not use .
-- v2.21.0 - Let config panel select maps to show, default map and choice of overlays.
-- v2.20.0 - Add support of .pbf map layers. Issue 123.
-- v2.19.1 - Add filter for bounds events only.
-- v2.19.0 - Bump leaflet to latest. v1.7
-- v2.18.1 - Let fillOpacity be 0.
-- v2.18.0 - Add bounds event onzoom or drag.
-- v2.17.3 - Yet more better feedback on clicks, moves.
-- v2.17.2 - Add smallplane icon.
-- v2.17.1 - More complete feedback on click, better popup image sizing.
-- v2.16.3 - Ensure polygons can be deleted.
-- v2.16.2 - Better handling of unpacked kmz objects.
-- v2.16.0 - Allow specifying custom base map server.
 
 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list of changes.
 
@@ -143,6 +128,7 @@ then rather than draw a point and icon it draws the polygon. If the "area" array
 elements, then it assumes this is a bounding box for a rectangle and draws a rectangle.
 
 Likewise if it contains a **line** property it will draw the polyline.
+If the payload also includes a property `fit:true` the map will zoom to fit the line or area.
 
 There are extra optional properties you can specify - see Options below.
 
@@ -246,14 +232,15 @@ Areas, Rectangles, Lines, Circles and Ellipses can also specify more optional pr
 
  - **layer** : declares which layer you put it on.
  - **color** : can set the colour of the polygon or line.
+ - **opacity** : the opacity of the line or outline.
  - **fillColor** : can set the fill colour of the polygon.
  - **fillOpacity** : can set the opacity of the polygon fill colour.
  - **dashArray** : optional dash array for polyline.
  - **clickable** : boolean - set to true to allow click to show popup.
  - **popup** : html string to display in popup (as well as name).
- - **editable** : boolean - set to true to allow simple edit/delete right click contextmenu
- - **contextmenu** : html string to display a more complex right click contextmenu
- - **weight** : the width of the line (or outline)
+ - **editable** : boolean - set to true to allow simple edit/delete right click contextmenu.
+ - **contextmenu** : html string to display a more complex right click contextmenu.
+ - **weight** : the width of the line or outline.
 
 Other properties can be found in the leaflet documentation.
 

package/examples/Convex Hull around points.json

@@ -0,0 +1 @@
+[{"id":"a0cdb588.2ba408","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":90,"wires":[["d7a5c615.1e6578"]],"l":false},{"id":"d7a5c615.1e6578","type":"function","z":"fc2b85b48b73e276","name":"Add Dave","func":"msg.payload = {\n    name:\"Dave\",\n    lat:51,\n    lon:-1,\n    layer:\"foo\"\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":90,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"7dcb7d4e.f5faa4","type":"function","z":"fc2b85b48b73e276","name":"Add Bob","func":"msg.payload = {\n    name:\"Bob\",\n    lat:52,\n    lon:-1,\n    layer:\"foo\"\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":135,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"a498ec44.fde27","type":"function","z":"fc2b85b48b73e276","name":"Add Fred","func":"msg.payload = {\n    name:\"Fred\",\n    lat:51,\n    lon:-2,\n    layer:\"foo\"\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":180,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"5c92395d.d709f8","type":"function","z":"fc2b85b48b73e276","name":"Add Joe","func":"msg.payload = {\n    name:\"Joe\",\n    lat:52,\n    lon:-2,\n    layer:\"foo\",\n    iconColor:\"blue\"\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":225,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"1836dc1e.3ec894","type":"function","z":"fc2b85b48b73e276","name":"Add Mark","func":"msg.payload = {\n    name:\"Mark\",\n    lat:51.5,\n    lon:-1.5,\n    layer:\"foo\",\n    iconColor:\"green\"\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":270,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"d439a183.9d7ca","type":"function","z":"fc2b85b48b73e276","name":"Add John","func":"msg.payload = {\n    name:\"John\",\n    lat:50.5,\n    lon:-2.5,\n    layer:\"foo\",\n    iconColor:\"blue\"\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":300,"y":315,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"43bc41e8.0385a","type":"function","z":"fc2b85b48b73e276","name":"Remove Mark","func":"msg.payload = {\n    name:\"Mark\",\n    layer:\"foo\",\n    deleted:true\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":320,"y":570,"wires":[["fd654fbf.7e7db","4b5f6be5.96c1f4"]]},{"id":"4b5f6be5.96c1f4","type":"worldmap-hull","z":"fc2b85b48b73e276","name":"","prop":"layer","x":595,"y":255,"wires":[["fd654fbf.7e7db"]]},{"id":"fd654fbf.7e7db","type":"worldmap","z":"fc2b85b48b73e276","name":"","lat":"","lon":"","zoom":"8","layer":"OSMG","cluster":"","maxage":"","usermenu":"show","layers":"show","panit":"false","panlock":"false","zoomlock":"false","hiderightclick":"false","coords":"none","showgrid":"false","path":"/worldmap","overlist":"CO","maplist":"OSMG,OSMC,OSMH,EsriC,EsriS,EsriT","mapname":"","mapurl":"","mapopt":"","mapwms":false,"x":600,"y":360,"wires":[]},{"id":"38179d31.94a972","type":"function","z":"fc2b85b48b73e276","name":"Remove Dave","func":"msg.payload = {\n    name:\"Dave\",\n    layer:\"foo\",\n    deleted:true\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":320,"y":390,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"b4ebdd.d201a42","type":"function","z":"fc2b85b48b73e276","name":"Remove Bob","func":"msg.payload = {\n    name:\"Bob\",\n    layer:\"foo\",\n    deleted:true\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":310,"y":435,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"4ab765d5.d63b7c","type":"function","z":"fc2b85b48b73e276","name":"Remove Fred","func":"msg.payload = {\n    name:\"Fred\",\n    layer:\"foo\",\n    deleted:true\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":320,"y":480,"wires":[["fd654fbf.7e7db","4b5f6be5.96c1f4"]]},{"id":"41fbcbe1.602224","type":"function","z":"fc2b85b48b73e276","name":"Remove Joe","func":"msg.payload = {\n    name:\"Joe\",\n    layer:\"foo\",\n    deleted:true\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":310,"y":525,"wires":[["4b5f6be5.96c1f4","fd654fbf.7e7db"]]},{"id":"0f4e6585f9afbcd7","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":135,"wires":[["7dcb7d4e.f5faa4"]],"l":false},{"id":"6c436bd05eaaa4e3","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":180,"wires":[["a498ec44.fde27"]],"l":false},{"id":"e97b916faeca80c5","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":225,"wires":[["5c92395d.d709f8"]],"l":false},{"id":"611d3c4798865b0c","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":270,"wires":[["1836dc1e.3ec894"]],"l":false},{"id":"3c835edcbc03e15f","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":315,"wires":[["d439a183.9d7ca"]],"l":false},{"id":"029fdb18b1447049","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":390,"wires":[["38179d31.94a972"]],"l":false},{"id":"9d473630bf56f60d","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":435,"wires":[["b4ebdd.d201a42"]],"l":false},{"id":"0efe0d29dc967c6b","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":480,"wires":[["4ab765d5.d63b7c"]],"l":false},{"id":"c059eda796d691f4","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":525,"wires":[["41fbcbe1.602224"]],"l":false},{"id":"78fe9cfb7d147384","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":570,"wires":[["43bc41e8.0385a"]],"l":false},{"id":"26d08e189f6137c0","type":"function","z":"fc2b85b48b73e276","name":"Remove John","func":"msg.payload = {\n    name:\"John\",\n    layer:\"foo\",\n    deleted:true\n}\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":320,"y":615,"wires":[["fd654fbf.7e7db","4b5f6be5.96c1f4"]]},{"id":"ba88e8b9f69dc254","type":"inject","z":"fc2b85b48b73e276","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payloadType":"date","x":180,"y":615,"wires":[["26d08e189f6137c0"]],"l":false}]

package/examples/Split Map With Swipe.json

@@ -1,112 +1 @@
-[
-    {
-        "id": "2e9ce367.acdb9c",
-        "type": "worldmap",
-        "z": "82738787.0e0338",
-        "name": "",
-        "lat": "",
-        "lon": "",
-        "zoom": "8",
-        "layer": "OSM",
-        "cluster": "0",
-        "maxage": "",
-        "usermenu": "show",
-        "layers": "show",
-        "panit": "false",
-        "path": "/worldmap",
-        "x": 580,
-        "y": 920,
-        "wires": []
-    },
-    {
-        "id": "8d0f8d4c.3cd21",
-        "type": "function",
-        "z": "82738787.0e0338",
-        "name": "remove split",
-        "func": "msg.payload = {command:{side:\"none\"}};\nreturn msg;",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 390,
-        "y": 980,
-        "wires": [
-            [
-                "2e9ce367.acdb9c"
-            ]
-        ]
-    },
-    {
-        "id": "311acf75.93ff8",
-        "type": "function",
-        "z": "82738787.0e0338",
-        "name": "Satellite",
-        "func": "msg.payload = {\n    command:{\n        side: \"Esri Satellite\", \n        split: 66,\n        showlayer: \"roads\"\n    }\n};\nreturn msg;",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 400,
-        "y": 920,
-        "wires": [
-            [
-                "2e9ce367.acdb9c"
-            ]
-        ]
-    },
-    {
-        "id": "eaea1a90.f27b98",
-        "type": "worldmap in",
-        "z": "82738787.0e0338",
-        "name": "",
-        "path": "/worldmap",
-        "x": 100,
-        "y": 920,
-        "wires": [
-            [
-                "4540d879.244f88"
-            ]
-        ]
-    },
-    {
-        "id": "4540d879.244f88",
-        "type": "switch",
-        "z": "82738787.0e0338",
-        "name": "",
-        "property": "payload.action",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "eq",
-                "v": "connected",
-                "vt": "str"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 1,
-        "x": 250,
-        "y": 920,
-        "wires": [
-            [
-                "311acf75.93ff8"
-            ]
-        ]
-    },
-    {
-        "id": "f77366dc.818138",
-        "type": "inject",
-        "z": "82738787.0e0338",
-        "name": "",
-        "topic": "",
-        "payload": "",
-        "payloadType": "str",
-        "repeat": "",
-        "crontab": "",
-        "once": false,
-        "onceDelay": 0.1,
-        "x": 110,
-        "y": 980,
-        "wires": [
-            [
-                "8d0f8d4c.3cd21"
-            ]
-        ]
-    }
-]
+[{"id":"2e9ce367.acdb9c","type":"worldmap","z":"e956b3364e3ffca6","name":"","lat":"","lon":"","zoom":"8","layer":"OSMG","cluster":"0","maxage":"","usermenu":"show","layers":"show","panit":"false","hiderightclick":"false","coords":"none","path":"/worldmap","overlist":"CO","maplist":"OSMG,OSMC,OSMH,EsriC,EsriS,EsriT,EsriO","mapname":"","mapurl":"","mapopt":"","mapwms":false,"x":570,"y":600,"wires":[]},{"id":"8d0f8d4c.3cd21","type":"function","z":"e956b3364e3ffca6","name":"remove split","func":"msg.payload = {command:{side:\"none\"}};\nreturn msg;","outputs":1,"noerr":0,"x":380,"y":660,"wires":[["2e9ce367.acdb9c"]]},{"id":"311acf75.93ff8","type":"function","z":"e956b3364e3ffca6","name":"Satellite","func":"msg.payload = {\n    command:{\n        side: \"Esri Satellite\", \n        split: 66,\n        showlayer: \"roads\"\n    }\n};\nreturn msg;","outputs":1,"noerr":0,"x":390,"y":600,"wires":[["2e9ce367.acdb9c"]]},{"id":"eaea1a90.f27b98","type":"worldmap in","z":"e956b3364e3ffca6","name":"","path":"/worldmap","events":"connect","x":90,"y":600,"wires":[["4540d879.244f88"]]},{"id":"4540d879.244f88","type":"switch","z":"e956b3364e3ffca6","name":"","property":"payload.action","propertyType":"msg","rules":[{"t":"eq","v":"connected","vt":"str"}],"checkall":"true","repair":false,"outputs":1,"x":240,"y":600,"wires":[["311acf75.93ff8"]]},{"id":"f77366dc.818138","type":"inject","z":"e956b3364e3ffca6","name":"","repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"str","x":100,"y":660,"wires":[["8d0f8d4c.3cd21"]]}]

package/examples/Trigger reload of data.json

@@ -1 +1 @@
-[{"id":"62ae3b3c.8de704","type":"worldmap in","z":"f86be7c2.1183b8","name":"","path":"/worldmap","x":140,"y":660,"wires":[["2eadb3d5.d063ec","c47cdeab.f4911","259809c4.43edf6"]]},{"id":"2eadb3d5.d063ec","type":"debug","z":"f86be7c2.1183b8","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":310,"y":620,"wires":[]},{"id":"259809c4.43edf6","type":"switch","z":"f86be7c2.1183b8","name":"","property":"payload.action","propertyType":"msg","rules":[{"t":"eq","v":"connected","vt":"str"}],"checkall":"true","repair":false,"outputs":1,"x":310,"y":660,"wires":[[]]},{"id":"13a00ba8.dcc8e4","type":"comment","z":"f86be7c2.1183b8","name":"Reload trigger","info":"The output from the switch will fire whenever a browser connects (or reconnects).\n\nThis can be used to retrieve stored datapoints and resend them to the map, as by default the main does not retain any sata between refreshes.\n\nThe debug node will show other properties that may be useful to trigger other actions.\n","x":150,"y":620,"wires":[]}]
+[{"id":"62ae3b3c.8de704","type":"worldmap in","z":"e956b3364e3ffca6","name":"","path":"/worldmap","events":"connect","x":165,"y":630,"wires":[["2eadb3d5.d063ec","259809c4.43edf6"]]},{"id":"2eadb3d5.d063ec","type":"debug","z":"e956b3364e3ffca6","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"true","targetType":"full","x":335,"y":590,"wires":[]},{"id":"259809c4.43edf6","type":"switch","z":"e956b3364e3ffca6","name":"","property":"payload.action","propertyType":"msg","rules":[{"t":"eq","v":"connected","vt":"str"}],"checkall":"true","repair":false,"outputs":1,"x":335,"y":630,"wires":[[]]},{"id":"13a00ba8.dcc8e4","type":"comment","z":"e956b3364e3ffca6","name":"Reload trigger","info":"The output from the switch will fire whenever a browser connects (or reconnects).\n\nThis can be used to retrieve stored datapoints and resend them to the map, as by default the main does not retain any sata between refreshes.\n\nThe debug node will show other properties that may be useful to trigger other actions.\n","x":175,"y":590,"wires":[]}]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-web-worldmap",
-    "version": "2.23.1",
+    "version": "2.23.5",
     "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",
@@ -27,6 +27,7 @@
         "world"
     ],
     "node-red": {
+        "version": ">=1.0.0",
         "nodes": {
             "worldmap": "worldmap.js"
         }
@@ -38,5 +39,8 @@
     },
     "contributors": [
         "@HiroyasuNishiyama"
-    ]
+    ],
+    "engines": {
+        "node": ">=10"
+    }
 }

package/worldmap/worldmap.js

@@ -1351,13 +1351,15 @@ function setMarker(data) {
     opt.color = data.color || data.lineColor || "#910000";
     opt.fillColor = data.fillColor || "#910000";
     opt.stroke = (data.hasOwnProperty("stroke")) ? data.stroke : true;
-    opt.weight = data.weight || 2;
-    opt.opacity = data.opacity || 1;
+    opt.weight = data.weight;
+    opt.opacity = data.opacity;
     opt.fillOpacity = data.fillOpacity;
     opt.clickable = (data.hasOwnProperty("clickable")) ? data.clickable : false;
     opt.fill = (data.hasOwnProperty("fill")) ? data.fill : true;
     if (data.hasOwnProperty("dashArray")) { opt.dashArray = data.dashArray; }
     if (opt.fillOpacity === undefined) { opt.fillOpacity = 0.2; }
+    if (opt.opacity === undefined) { opt.opacity = 1; }
+    if (opt.weight === undefined) { opt.weight = 2; }
 
     // Replace building
     if (data.hasOwnProperty("building")) {
@@ -1426,12 +1428,18 @@ function setMarker(data) {
         if (!data.hasOwnProperty("opacity")) { opt.opacity = 0.8; }
         var polyln = L.polyline(data.line, opt);
         polygons[data.name] = rightmenu(polyln);
+        if (data.hasOwnProperty("fit") && data.fit === true) {
+            map.fitBounds(polygons[data.name].getBounds(),{padding:[50,50]})
+        }
     }
     else if (data.hasOwnProperty("area") && Array.isArray(data.area)) {
         var polyarea;
         if (data.area.length === 2) { polyarea = L.rectangle(data.area, opt); }
         else { polyarea = L.polygon(data.area, opt); }
         polygons[data.name] = rightmenu(polyarea);
+        if (data.hasOwnProperty("fit") && data.fit === true) {
+            map.fitBounds(polygons[data.name].getBounds(),{padding:[50,50]})
+        }
     }
     else if (data.hasOwnProperty("sdlat") && data.hasOwnProperty("sdlon")) {
         if (!data.hasOwnProperty("iconColor")) { opt.color = "blue"; }     //different standard Color Settings
@@ -1989,7 +1997,7 @@ function setMarker(data) {
         fb.action = "click";
         ws.send(JSON.stringify(fb));
     });
-    if (heat && ((data.addtoheatmap !== "false") || (!data.hasOwnProperty("addtoheatmap")))) { // Added to give ability to control if points from active layer contribute to heatmap
+    if (heat && ((data.addtoheatmap != false) || (!data.hasOwnProperty("addtoheatmap")))) { // Added to give ability to control if points from active layer contribute to heatmap
         if (heatAll || map.hasLayer(layers[lay])) { heat.addLatLng(lli); }
     }
     markers[data.name] = marker;
@@ -2062,9 +2070,11 @@ function setMarker(data) {
 function doCommand(cmd) {
     // console.log("COMMAND",cmd);
     if (cmd.init && cmd.hasOwnProperty("maplist")) {
+        basemaps = [];
         addBaseMaps(cmd.maplist,cmd.layer);
     }
     if (cmd.init && cmd.hasOwnProperty("overlist")) {
+        overlays = [];
         addOverlays(cmd.overlist);
     }
     if (cmd.hasOwnProperty("toptitle")) {

package/worldmap.js

@@ -486,16 +486,16 @@ module.exports = function(RED) {
                     node.send(newmsg);
                 }
                 if (leafletHull.length === 2 && (oldl === 1 || oldl === 3)) {
-                    newmsg.payload.deleted = true;
-                    node.send(newmsg);
-                    delete newmsg.payload.deleted;
+                    var newmsg2 = RED.util.cloneMessage(newmsg);
+                    newmsg2.payload.deleted = true;
+                    node.send(newmsg2);
                     newmsg.payload.line = leafletHull;
                     node.send(newmsg);
                 }
                 if (leafletHull.length === 3 && oldl === 2) {
-                    newmsg.payload.deleted = true;
-                    node.send(newmsg);
-                    delete newmsg.payload.deleted;
+                    var newmsg3 = RED.util.cloneMessage(newmsg);
+                    newmsg3.payload.deleted = true;
+                    node.send(newmsg3);
                 }
                 if (leafletHull.length >= 3) {
                     newmsg.payload.area = leafletHull;