dmxm/node-red-contrib-jwht-map
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added capability to remove polygons (#18)

Browse Source 
* Added capability to remove polygons

Remove them in the same way as the markers get removed. I think this was a bug before in line 704. Because there was no way something is in the polygons and also the markers object.
Added the lay property to all polygon creations.

* unnecesarry line
This commit is contained in:
andreasIBM 2017-06-25 11:04:47 +01:00 committed by Dave Conway-Jones
parent fb3efc020f
commit 431f011f32
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worldmap/index.html
View File

@ -711,11 +711,11 @@ if (!inIframe) {
var delMarker = function(dname) { var delMarker = function(dname) {
//console.log("Deleting",dname); //console.log("Deleting",dname);
if (typeof polygons[dname] != "undefined") { if (typeof polygons[dname] != "undefined") {
layers[markers[dname].lay].removeLayer(polygons[dname]); layers[polygons[dname].lay].removeLayer(polygons[dname]);
ws.emit("worldmap",{action:"delete", name:dname});
delete polygons[dname]; delete polygons[dname];
} }
if (typeof markers[dname] != "undefined") { if (typeof markers[dname] != "undefined") {
var d = {name:dname,type:"DELETE",lat:markers[dname]._latlng.lat,lon:markers[dname]._latlng.lng};
ws.emit("worldmap",{action:"delete", name:dname}); ws.emit("worldmap",{action:"delete", name:dname});
layers[markers[dname].lay].removeLayer(markers[dname]); layers[markers[dname].lay].removeLayer(markers[dname]);
delete markers[dname]; delete markers[dname];
@ -755,12 +755,14 @@ function setMarker(data) {
var col = data.iconColor || "#910000"; var col = data.iconColor || "#910000";
var polyln = L.polyline(data.line, {stroke:true, weight:3, color:col, opacity:0.8, clickable:false}); var polyln = L.polyline(data.line, {stroke:true, weight:3, color:col, opacity:0.8, clickable:false});
polygons[data.name] = polyln; polygons[data.name] = polyln;
polygons[data.name].lay = lay;
layers[lay].addLayer(polyln); layers[lay].addLayer(polyln);
} }
else if (data.hasOwnProperty("area") && Array.isArray(data.area)) { else if (data.hasOwnProperty("area") && Array.isArray(data.area)) {
var cola = data.iconColor || "#910000"; var cola = data.iconColor || "#910000";
var polyarea = L.polygon(data.area, {stroke:true, weight:2, color:cola, fillColor:cola, fillOpacity:0.2, clickable:false}); var polyarea = L.polygon(data.area, {stroke:true, weight:2, color:cola, fillColor:cola, fillOpacity:0.2, clickable:false});
polygons[data.name] = polyarea; polygons[data.name] = polyarea;
polygons[data.name].lay = lay;
layers[lay].addLayer(polyarea); layers[lay].addLayer(polyarea);
} }
else if (data.hasOwnProperty("sdlat") && data.hasOwnProperty("sdlon")) { else if (data.hasOwnProperty("sdlat") && data.hasOwnProperty("sdlon")) {
@ -772,6 +774,7 @@ function setMarker(data) {
.openOn(map); .openOn(map);
}); });
polygons[data.name] = ellipse; polygons[data.name] = ellipse;
polygons[data.name].lay = lay;
layers[lay].addLayer(ellipse); layers[lay].addLayer(ellipse);
} }
else { else {
@ -780,6 +783,7 @@ function setMarker(data) {
var colac = data.iconColor || "#910000"; var colac = data.iconColor || "#910000";
var polycirc = L.circle(new L.LatLng((data.lat*1), (data.lon*1)), data.radius*1, {stroke:true, weight:2, color:colac, fillColor:colac, fillOpacity:0.2, clickable:false}); var polycirc = L.circle(new L.LatLng((data.lat*1), (data.lon*1)), data.radius*1, {stroke:true, weight:2, color:colac, fillColor:colac, fillOpacity:0.2, clickable:false});
polygons[data.name] = polycirc; polygons[data.name] = polycirc;
polygons[data.name].lay = lay;
layers[lay].addLayer(polycirc); layers[lay].addLayer(polycirc);
} }
} }
@ -991,6 +995,7 @@ function setMarker(data) {
polygon.setStyle({opacity:0}); polygon.setStyle({opacity:0});
} }
polygons[data.name] = polygon; polygons[data.name] = polygon;
polygons[data.name].lay = lay;
layers[lay].addLayer(polygon); layers[lay].addLayer(polygon);
} }
} }