let fill Opacity be 0

to close #179
This commit is contained in:
Dave Conway-Jones 2021-10-24 16:04:44 +01:00
parent cdcccb296b
commit 8d7e735a25
No known key found for this signature in database
GPG Key ID: 88BA2B8A411BE9FF
4 changed files with 5 additions and 30 deletions

View File

@ -1,5 +1,6 @@
### Change Log for Node-RED Worldmap ### Change Log for Node-RED Worldmap
- v2.18.§ - Let fillOpacity be 0.
- v2.18.0 - Add bounds event onzoom or drag. - v2.18.0 - Add bounds event onzoom or drag.
- v2.17.3 - Yet more better feedback on clicks, moves. - v2.17.3 - Yet more better feedback on clicks, moves.
- v2.17.2 - Add smallplane icon. - v2.17.2 - Add smallplane icon.

View File

@ -11,6 +11,7 @@ map web page for plotting "things" on.
### Updates ### Updates
- v2.18.§ - Let fillOpacity be 0.
- v2.18.0 - Add bounds event onzoom or drag. - v2.18.0 - Add bounds event onzoom or drag.
- v2.17.3 - Yet more better feedback on clicks, moves. - v2.17.3 - Yet more better feedback on clicks, moves.
- v2.17.2 - Add smallplane icon. - v2.17.2 - Add smallplane icon.

View File

@ -1,6 +1,6 @@
{ {
"name": "node-red-contrib-web-worldmap", "name": "node-red-contrib-web-worldmap",
"version": "2.18.0", "version": "2.18.1",
"description": "A Node-RED node to provide a web page of a world map for plotting things on.", "description": "A Node-RED node to provide a web page of a world map for plotting things on.",
"dependencies": { "dependencies": {
"cgi": "0.3.1", "cgi": "0.3.1",

View File

@ -46,34 +46,6 @@ var iconSz = {
"Command": 44 "Command": 44
}; };
// Polyfill assign for IE11 for now
if (typeof Object.assign !== 'function') {
// Must be writable: true, enumerable: false, configurable: true
Object.defineProperty(Object, "assign", {
value: function assign(target, varArgs) { // .length of function is 2
'use strict';
if (target === null || target === undefined) {
throw new TypeError('Cannot convert undefined or null to object');
}
var to = Object(target);
for (var index = 1; index < arguments.length; index++) {
var nextSource = arguments[index];
if (nextSource !== null && nextSource !== undefined) {
for (var nextKey in nextSource) {
// Avoid bugs when hasOwnProperty is shadowed
if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
to[nextKey] = nextSource[nextKey];
}
}
}
}
return to;
},
writable: true,
configurable: true
});
}
// Create the socket // Create the socket
var connect = function() { var connect = function() {
// var transports = ["websocket", "xhr-streaming", "xhr-polling"], // var transports = ["websocket", "xhr-streaming", "xhr-polling"],
@ -1287,10 +1259,11 @@ function setMarker(data) {
opt.stroke = (data.hasOwnProperty("stroke")) ? data.stroke : true; opt.stroke = (data.hasOwnProperty("stroke")) ? data.stroke : true;
opt.weight = data.weight || 2; opt.weight = data.weight || 2;
opt.opacity = data.opacity || 1; opt.opacity = data.opacity || 1;
opt.fillOpacity = data.fillOpacity || 0.2; opt.fillOpacity = data.fillOpacity;
opt.clickable = (data.hasOwnProperty("clickable")) ? data.clickable : false; opt.clickable = (data.hasOwnProperty("clickable")) ? data.clickable : false;
opt.fill = (data.hasOwnProperty("fill")) ? data.fill : true; opt.fill = (data.hasOwnProperty("fill")) ? data.fill : true;
if (data.hasOwnProperty("dashArray")) { opt.dashArray = data.dashArray; } if (data.hasOwnProperty("dashArray")) { opt.dashArray = data.dashArray; }
if (opt.fillOpacity === undefined) { opt.fillOpacity = 0.2; }
// Replace building // Replace building
if (data.hasOwnProperty("building")) { if (data.hasOwnProperty("building")) {