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

Add another edge test case and fix.

Browse Source
This commit is contained in:
danzel
2012-09-14 10:41:37 +12:00
parent 4ef14cb5f4
commit 4b12ba6274
2 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/old-bugs/remove-add-clustering.html
+75
View File
@@ -0,0 +1,75 @@
<!DOCTYPE html>
<html>
<head>
<title>Leaflet debug page</title>
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
<!--[if lte IE 8]><link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.ie.css" /><![endif]-->
<script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet-src.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../screen.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../../dist/MarkerCluster.Default.css" />
<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/MarkerCluster.Default.ie.css" /><![endif]-->
<script src="../../src/DistanceGrid.js"></script>
<script src="../../src/MarkerCluster.js"></script>
<script src="../../src/MarkerClusterGroup.js"></script>
<script src="../../src/MarkerCluster.QuickHull.js"></script>
<script src="../../src/MarkerCluster.Spiderfier.js"></script>
</head>
<body>
<div id="map"></div>
<p>Whenever a marker is clicked it is removed from the clusterer and added directly to the map instead.</p>
<p>Click Marker on Left, zoom out 1 layer, click marker on right.</p>
<p>Expected behaviour: Both markers are shown. Bugged behaviour: Both markers are on map with opacity 0.</p>
<pre id="log"></pre>
<script type="text/javascript">
var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
latlng = new L.LatLng(50.5, 30.51);
var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
var markers = new L.MarkerClusterGroup({ animateAddingMarkers: true });
var markersList = [];
var m;
m = new L.Marker([50.5, 30.51]);
markersList.push(m);
markers.addLayer(m);
m = new L.Marker([50.5, 30.515]);
markersList.push(m);
markers.addLayer(m);
map.addLayer(markers);
var lastClicked = null;
markers.on('click', function (m) {
console.log('clicked ' + m);
if (lastClicked) {
map.removeLayer(lastClicked);
markers.addLayer(lastClicked);
}
lastClicked = m.layer;
markers.removeLayer(lastClicked);
map.addLayer(lastClicked);
});
map.on('click', function () {
console.log('map clicked');
if (lastClicked) {
map.removeLayer(lastClicked);
markers.addLayer(lastClicked);
}
lastClicked = null;
});
</script>
</body>
</html>
src/MarkerClusterGroup.js
+11
View File
@@ -108,6 +108,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
if (layer._icon) {
L.FeatureGroup.prototype.removeLayer.call(this, layer);
layer.setOpacity(1);
}
return this;
},
@@ -646,6 +647,16 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
//When the animations are done, tidy up
setTimeout(function () {
//This cluster stopped being a cluster before the timeout fired
if (cluster._childCount == 1) {
var m = cluster._markers[0];
//If we were in a cluster animation at the time then the opacity and position of our child could be wrong now, so fix it
m.setLatLng(m.getLatLng());
m.setOpacity(1);
return;
}
cluster._recursively(bounds, newZoomLevel, 0, function (c) {
c._recursivelyRemoveChildrenFromMap(bounds, previousZoomLevel + 1);
});