diff --git a/CHANGELOG.md b/CHANGELOG.md index ac59962..dfb69dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### Change Log for Node-RED Worldmap + - v2.5.7 - Let fillColor set color of hulls - v2.5.6 - Let node accept plain text payload kml or nvg input - v2.5.5 - Fix NVG import to handle symbols for points - v2.5.4 - Fix delete of hulls diff --git a/README.md b/README.md index 394901e..053a3d8 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ map web page for plotting "things" on. ### Updates +- v2.5.7 - Let fillColor set color of hulls - v2.5.6 - Let node accept plain text payload kml or nvg input - v2.5.5 - Fix NVG import to handle symbols for points - v2.5.4 - Fix delete of hulls @@ -25,16 +26,6 @@ map web page for plotting "things" on. - v2.3.11 - Better editing of drawing layer, add OpenTopoMap, and better Esri satellite - v2.3.10 - Improve geojson layer and name handling. - v2.3.8 - Fix fa-marker offset to improve accuracy. -- v2.3.7 - Show icon within circle if icon present. Issue #128 -- v2.3.6 - Show ruler if grid is turned on. -- v2.3.5 - Let tracks node handle array of points. Let http icons be rotated to hdg or bearing. -- v2.3.4 - Add aligning bus icon -- v2.3.3 - Fix satellite view max zoom -- 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 - see [CHANGELOG](https://github.com/dceejay/RedMap/blob/master/CHANGELOG.md) for full list. diff --git a/package.json b/package.json index 768b44a..d0ce00f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-web-worldmap", - "version": "2.5.6", + "version": "2.5.7", "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.html b/worldmap.html index 823982c..46ee197 100644 --- a/worldmap.html +++ b/worldmap.html @@ -305,8 +305,8 @@ then by default ⌘⇧m - ctrl-shift-m will load the m RED.keyboard.add("*",/* m */ 77,{ctrl:true, shift:true},function() { window.open(document.location.protocol+"//"+lnk) }); } else { - RED.keyboard.add("*","ctrl-shift-m","Show Map"); RED.actions.add("Show Map",function() { window.open(document.location.protocol+"//"+lnk) }); + RED.keyboard.add("*","ctrl-shift-m","Show Map"); } RED.nodes.registerType('worldmap',{ category: 'location', @@ -521,7 +521,7 @@ then by default ⌘⇧m - ctrl-shift-m will load the m - + - + - + - + - \ No newline at end of file diff --git a/worldmap.js b/worldmap.js index 7526ffb..68f1f60 100644 --- a/worldmap.js +++ b/worldmap.js @@ -427,6 +427,11 @@ module.exports = function(RED) { newmsg.payload.name = newmsg.payload[node.prop]; newmsg.payload.clickable = true; + if (msg.payload.fillColor) { + newmsg.payload.color = msg.payload.fillColor; + newmsg.payload.fillColor = msg.payload.fillColor; + } + if (leafletHull.length === 1 && oldl === 2) { newmsg.payload.deleted = true; node.send(newmsg);