nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 08:02:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

removeLayer supports LayerGroup. Fixes #236

Browse Source
This commit is contained in:
danzel
2013-08-26 15:39:25 +12:00
parent 8ccd5a37ba
commit 4f40622dfe
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/suites/RemoveLayerSpec.js
+33
View File
@@ -125,4 +125,37 @@
expect(marker._icon).to.be(null);
expect(marker2._icon.parentNode).to.be(map._panes.markerPane);
});
it('removes the layers that are in the given LayerGroup', function () {
var group = new L.MarkerClusterGroup();
var marker = new L.Marker([1.5, 1.5]);
var marker2 = new L.Marker([1.5, 1.5]);
map.addLayer(group);
group.addLayers([marker, marker2]);
var layer = L.layerGroup();
layer.addLayer(marker2);
group.removeLayer(layer);
expect(marker._icon).to.not.be(undefined);
expect(marker2._icon).to.be(undefined);
});
it('removes the layers that are in the given LayerGroup when not on the map', function () {
var group = new L.MarkerClusterGroup();
var marker = new L.Marker([1.5, 1.5]);
var marker2 = new L.Marker([1.5, 1.5]);
group.addLayers([marker, marker2]);
var layer = L.layerGroup();
layer.addLayer(marker2);
group.removeLayer(layer);
expect(group.hasLayer(marker)).to.be(true);
expect(group.hasLayer(marker2)).to.be(false);
});
});
src/MarkerClusterGroup.js
+9
View File
@@ -105,6 +105,15 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
removeLayer: function (layer) {
if (layer instanceof L.LayerGroup)
{
var array = [];
for (var i in layer._layers) {
array.push(layer._layers[i]);
}
return this.removeLayers(array);
}
//Non point layers
if (!layer.getLatLng) {
this._nonPointGroup.removeLayer(layer);