diff --git a/CHANGELOG.md b/CHANGELOG.md index eda4d3b..2231165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### Change Log for Node-RED Worldmap - - v2.15.2 - Fix panit command to work, try to use alt units, popup alignments. + - 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. diff --git a/README.md b/README.md index 3d8d420..a3b894b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ map web page for plotting "things" on. ### Updates -- v2.15.2 - Fix panit command to work, try to use alt units, popup alignments. +- 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. diff --git a/package.json b/package.json index e689ad1..4e58fd2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-web-worldmap", - "version": "2.15.2", + "version": "2.15.3", "description": "A Node-RED node to provide a web page of a world map for plotting things on.", "dependencies": { "cgi": "0.3.1", diff --git a/worldmap/worldmap.js b/worldmap/worldmap.js index e8ef3d0..f7f272d 100644 --- a/worldmap/worldmap.js +++ b/worldmap/worldmap.js @@ -318,10 +318,10 @@ else { rulerButton.addTo(map); // Create the clear heatmap button - var clrHeat = L.easyButton( 'Reset Heatmap', function() { + var clrHeat = L.easyButton( 'fa-eraser', function() { console.log("Reset heatmap"); heat.setLatLngs([]); - }, "Clears the current heatmap", "bottomright"); + }, "Clears the current heatmap", {position:"bottomright"}); } var helpMenu = '' @@ -1684,12 +1684,12 @@ function setMarker(data) { myMarker = new ms.Symbol( data.SIDC.toUpperCase(), { uniqueDesignation:data.name }); // Now that we have a symbol we can ask for the echelon and set the symbol size var opts = data.options || {}; - var sz = 30; + var sz = 25; if (myMarker.hasOwnProperty("getProperties") && myMarker.getProperties().hasOwnProperty("echelon")) { sz = iconSz[myMarker.getProperties().echelon]; } opts.size = opts.size || sz; - opts.size = opts.size * 0.8 * (opts.scale || 1); + opts.size = opts.size * (opts.scale || 1); myMarker = myMarker.setOptions(opts); var myicon = L.icon({ iconUrl: myMarker.toDataURL(), @@ -1855,6 +1855,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 (data.hasOwnProperty("clickable")) { delete data.clickable; } if (data.hasOwnProperty("fillColor")) { delete data.fillColor; } if (data.hasOwnProperty("radius")) { delete data.radius; }