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

Unset layer.__parent in removeLayers as well as removeLayer. Refs #44

Browse Source
This commit is contained in:
danzel
2012-11-01 09:45:04 +13:00
parent bef1dbb33e
commit ef2a51235e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MarkerClusterGroup.js
+9 -4
View File
@@ -110,8 +110,6 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
layer.setOpacity(1); layer.setOpacity(1);
} }
delete layer.__parent;
return this; return this;
}, },
@@ -124,6 +122,11 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
for (var i = 0, l = layersArray.length; i < l; i++) { for (var i = 0, l = layersArray.length; i < l; i++) {
var m = layersArray[i]; var m = layersArray[i];
if (this.hasLayer(m)) {
continue;
}
this._addLayer(m, this._maxZoom); this._addLayer(m, this._maxZoom);
//If we just made a cluster of size 2 then we need to remove the other marker from the map (if it is) or we never will //If we just made a cluster of size 2 then we need to remove the other marker from the map (if it is) or we never will
@@ -389,6 +392,8 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
cluster = cluster.__parent; cluster = cluster.__parent;
} }
delete marker.__parent;
}, },
//Overrides FeatureGroup._propagateEvent //Overrides FeatureGroup._propagateEvent
@@ -547,10 +552,10 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
//Try find a marker close by to form a new cluster with //Try find a marker close by to form a new cluster with
closest = gridUnclustered[zoom].getNearObject(markerPoint); closest = gridUnclustered[zoom].getNearObject(markerPoint);
if (closest) { if (closest) {
if (closest.__parent) { var parent = closest.__parent;
if (parent) {
this._removeLayer(closest, false); this._removeLayer(closest, false);
} }
var parent = closest.__parent;
//Create new cluster with these 2 in it //Create new cluster with these 2 in it