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

get moveEnd working again!

Browse Source
This commit is contained in:
danzel
2012-07-20 17:17:31 +12:00
parent 48b444e628
commit c2609c7dfb
2 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MarkerCluster.js
+12 -6
View File
@@ -242,6 +242,7 @@ L.MarkerCluster = L.Marker.extend({
} else {
c.setOpacity(0);
}
c._addToMap();
}
);
@@ -313,24 +314,29 @@ L.MarkerCluster = L.Marker.extend({
delete this._backupLatlng;
}
},
_recursivelyRemoveChildrenFromMap: function (previousBounds, depth) {
//exceptBounds: If set, don't remove any markers/clusters in it
_recursivelyRemoveChildrenFromMap: function (previousBounds, depth, exceptBounds) {
var m, i;
this._recursively(previousBounds, 0, depth,
function (c) {
//Remove markers at every level
for (i = c._markers.length - 1; i >= 0; i--) {
m = c._markers[i];
L.FeatureGroup.prototype.removeLayer.call(c._group, m);
m.setOpacity(1);
if (!exceptBounds || !exceptBounds.contains(m._latlng)) {
L.FeatureGroup.prototype.removeLayer.call(c._group, m);
m.setOpacity(1);
}
}
},
function (c) {
//Remove child clusters at just the bottom level
for (i = c._childClusters.length - 1; i >= 0; i--) {
m = c._childClusters[i];
L.FeatureGroup.prototype.removeLayer.call(c._group, m);
m.setOpacity(1);
if (!exceptBounds || !exceptBounds.contains(m._latlng)) {
L.FeatureGroup.prototype.removeLayer.call(c._group, m);
m.setOpacity(1);
}
}
}
);
src/MarkerClusterGroup.js
+13 -34
View File
@@ -53,41 +53,15 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
if (this._inZoomAnimation > 0) {
return;
}
return; //TODO FIXME OBV
var l, i,
layers = this._layers,
bounds = this._getExpandedVisibleBounds(),
highestLevel = this._markersAndClustersAtZoom[this._highestZoom],
depth = this._zoom - this._highestZoom,
highestLevelClusters = highestLevel.clusters,
highestLevelUnclustered = highestLevel.unclustered;
//Remove visible layers that are no longer visible
for (i in layers) {
l = layers[i];
if (!bounds.contains(l.getLatLng())) {
L.FeatureGroup.prototype.removeLayer.call(this, l);
}
}
var newBounds = this._getExpandedVisibleBounds(),
depth = this._zoom - this._topClusterLevel._zoom;
//Re-Check everyone for being in the viewport
//Do the clusters (and their child unclustered ones) recursively for performance
for (i = 0; i < highestLevelClusters.length; i++) {
l = highestLevelClusters[i];
if (bounds.intersects(l._bounds)) {
l._recursivelyAddChildrenToMap(null, depth, bounds);
}
}
this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds, depth, newBounds);
this._topClusterLevel._recursivelyAddChildrenToMap(null, depth + 1, newBounds);
//Do the markers at this level too
for (i = 0; i < highestLevelUnclustered.length; i++) {
l = highestLevelUnclustered[i];
if (bounds.contains(l.getLatLng())) {
L.FeatureGroup.prototype.addLayer.call(this, l);
}
}
this._currentShownBounds = bounds;
this._currentShownBounds = newBounds;
return;
},
_generateInitialClusters: function () {
@@ -106,8 +80,10 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
_mergeSplitClusters: function () {
if (this._zoom < this._map._zoom) { //Zoom in, split
//Note: Clusters generate new children as needed on a zoom in
//Clusters generate new children as needed on a zoom in
//Remove clusters now off screen
this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds, this._zoom - this._topClusterLevel._zoom, this._getExpandedVisibleBounds());
this._animationZoomIn(this._zoom, this._map._zoom);
@@ -267,7 +243,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
_getExpandedVisibleBounds: function () {
var map = this._map,
bounds = map.getPixelBounds(),
width = Math.abs(bounds.max.x - bounds.min.x),
width = Math.abs(bounds.max.x - bounds.min.x),
height = Math.abs(bounds.max.y - bounds.min.y),
sw = map.unproject(new L.Point(bounds.min.x - width, bounds.min.y - height)),
ne = map.unproject(new L.Point(bounds.max.x + width, bounds.max.y + height));
@@ -376,6 +352,9 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
depthToAnimateIn = previousZoomLevel - newZoomLevel;
this._animationZoomOutSingle(this._topClusterLevel, depthToStartAt, depthToAnimateIn);
//Need to add markers for those that weren't on the map before but are now
this._topClusterLevel._recursivelyAddChildrenToMap(null, depthToStartAt, this._getExpandedVisibleBounds());
},
_animationZoomOutSingle: function (marker, depthToStartAt, depthToAnimateIn) {
var bounds = this._getExpandedVisibleBounds();