[Pkg-javascript-commits] [leaflet-markercluster] 240/479: Add another edge test case and fix.
Jonas Smedegaard
dr at jones.dk
Thu Oct 16 16:00:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository leaflet-markercluster.
commit 4b12ba627491ea9dab3ee2f4c6e5409974c18238
Author: danzel <danzel at localhost.geek.nz>
Date: Fri Sep 14 10:41:37 2012 +1200
Add another edge test case and fix.
---
example/old-bugs/remove-add-clustering.html | 75 +++++++++++++++++++++++++++++
src/MarkerClusterGroup.js | 11 +++++
2 files changed, 86 insertions(+)
diff --git a/example/old-bugs/remove-add-clustering.html b/example/old-bugs/remove-add-clustering.html
new file mode 100644
index 0000000..7ee36fc
--- /dev/null
+++ b/example/old-bugs/remove-add-clustering.html
@@ -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 © 2011 OpenStreetMap contributors, Imagery © 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>
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
index 212c5ce..26aecea 100644
--- a/src/MarkerClusterGroup.js
+++ b/src/MarkerClusterGroup.js
@@ -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);
});
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git
More information about the Pkg-javascript-commits
mailing list