Fix some cases where zoomToShowLayer wouldn't work. Fixes #286 #228 #203

Leaflet · Dec 19, 2013 · f0b1618 · f0b1618
1 parent 7e31b27
commit f0b1618
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
@@ -378,14 +378,12 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 			}
 		};
 
-		if (layer._icon) {
+		if (layer._icon && this._map.getBounds().contains(layer.getLatLng())) {
 			callback();
 		} else if (layer.__parent._zoom < this._map.getZoom()) {
 			//Layer should be visible now but isn't on screen, just pan over to it
 			this._map.on('moveend', showMarker, this);
-			if (!layer._icon) {
-				this._map.panTo(layer.getLatLng());
-			}
+			this._map.panTo(layer.getLatLng());
 		} else {
 			this._map.on('moveend', showMarker, this);
 			this.on('animationend', showMarker, this);