[Pkg-javascript-commits] [leaflet-markercluster] 94/479: Remove dead code as we now always have all layers generated.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet-markercluster.

commit 4c9839b9668d9af03af1af3db4431e29a0a0d35f
Author: danzel <danzel at localhost.geek.nz>
Date:   Tue Jul 24 16:16:09 2012 +1200

    Remove dead code as we now always have all layers generated.
---
 src/MarkerCluster.js      | 71 +++++++++++++----------------------------------
 src/MarkerClusterGroup.js |  7 +----
 2 files changed, 20 insertions(+), 58 deletions(-)

diff --git a/src/MarkerCluster.js b/src/MarkerCluster.js
index c82ad55..ae801a7 100644
--- a/src/MarkerCluster.js
+++ b/src/MarkerCluster.js
@@ -6,8 +6,6 @@ L.MarkerCluster = L.Marker.extend({
 		this._childClusters = [];
 		this._childCount = 0;
 
-		this._haveGeneratedChildClusters = false;
-
 		this._bounds = new L.LatLngBounds();
 
 		this._addChild(a);
@@ -89,36 +87,30 @@ L.MarkerCluster = L.Marker.extend({
 	_recursivelyAddLayer: function (layer, zoom) {
 		var result = false;
 
-		if (!this._haveGeneratedChildClusters && this._canAcceptPosition(layer.getLatLng(), zoom)) {
-			//Don't need to cluster it in as we haven't clustered
-			this._addChild(layer);
-			result = true;
-		} else {
-			for (var i = this._childClusters.length - 1; i >= 0; i--) {
-				var c = this._childClusters[i];
-				//Recurse into children where their bounds fits the layer or they can just take it
-				if (c._bounds.contains(layer.getLatLng()) || c._canAcceptPosition(layer.getLatLng(), zoom + 1)) {
-					result = c._recursivelyAddLayer(layer, zoom + 1);
-					if (result) {
-						this._childCount++;
-						break;
-					}
+		for (var i = this._childClusters.length - 1; i >= 0; i--) {
+			var c = this._childClusters[i];
+			//Recurse into children where their bounds fits the layer or they can just take it
+			if (c._bounds.contains(layer.getLatLng()) || c._canAcceptPosition(layer.getLatLng(), zoom + 1)) {
+				result = c._recursivelyAddLayer(layer, zoom + 1);
+				if (result) {
+					this._childCount++;
+					break;
 				}
 			}
+		}
 
-			//Couldn't add it to a child, but it should be part of us (this._zoom -> we are the root node)
-			if (!result && (this._canAcceptPosition(layer.getLatLng(), zoom) || this._zoom)) {
+		//Couldn't add it to a child, but it should be part of us (this._zoom -> we are the root node)
+		if (!result && (this._canAcceptPosition(layer.getLatLng(), zoom) || this._zoom)) {
 
-				//Add to ourself instead
-				result = this._group._clusterOne(this._markers, layer, zoom);
+			//Add to ourself instead
+			result = this._group._clusterOne(this._markers, layer, zoom);
 
-				if (result) {
-					result._baseInit();
-					this._addChild(result);
-				} else {
-					this._addChild(layer);
-					result = true;
-				}
+			if (result) {
+				result._baseInit();
+				this._addChild(result);
+			} else {
+				this._addChild(layer);
+				result = true;
 			}
 		}
 
@@ -358,11 +350,6 @@ L.MarkerCluster = L.Marker.extend({
 		var childClusters = this._childClusters,
 			i, c;
 
-		//When zooming down we need to generate new clusters for levels that don't have them yet
-		if (!this._haveGeneratedChildClusters && (depthToStartAt > 0 || timesToRecurse > 0)) {
-			this._generateChildClusters();
-		}
-
 		if (depthToStartAt > 0) { //Still going down to required depth, just recurse to child clusters
 			for (i = childClusters.length - 1; i >= 0; i--) {
 				c = childClusters[i];
@@ -391,26 +378,6 @@ L.MarkerCluster = L.Marker.extend({
 		}
 	},
 
-	_generateChildClusters: function () {
-		var res = this._group._cluster(this._markers, this._zoomForCluster),
-			unclustered = res.unclustered,
-			clusters = res.clusters,
-			i;
-
-		this._markers = [];
-		this._childCount = 0;
-
-		for (i = unclustered.length - 1; i >= 0; i--) {
-			this._addChild(unclustered[i]);
-		}
-		for (i = clusters.length - 1; i >= 0; i--) {
-			this._addChild(clusters[i]);
-		}
-
-		delete this._zoomForCluster;
-		this._haveGeneratedChildClusters = true;
-	},
-
 	_recalculateBounds: function () {
 		var markers = this._markers,
 			childClusters = this._childClusters,
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
index 3c9a1ad..76d30ef 100644
--- a/src/MarkerClusterGroup.js
+++ b/src/MarkerClusterGroup.js
@@ -160,13 +160,12 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 
 	//Takes a list of objects that have a 'getLatLng()' function (Marker / MarkerCluster)
 	//Performs clustering on them (using a greedy algorithm) and returns those clusters.
-	//toCluster: List of Markers/MarkerClusters to cluster. MarkerClusters MUST be first in the list
+	//toCluster: List of Markers/MarkerClusters to cluster
 	//Returns { 'clusters': [new clusters], 'unclustered': [unclustered markers] }
 	_cluster: function (toCluster, zoom) {
 		var clusterRadiusSqrd = this.options.maxClusterRadius * this.options.maxClusterRadius,
 		    clusters = [],
 		    unclustered = [],
-		    hasChildClusters = (toCluster.length > 0 && toCluster[0] instanceof L.MarkerCluster),
 		    i, j, c;
 
 		//go through each point
@@ -192,10 +191,6 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 			if (!used) {
 				var newCluster = this._clusterOne(unclustered, point);
 				if (newCluster) {
-					newCluster._haveGeneratedChildClusters = hasChildClusters;
-					if (!hasChildClusters) {
-						newCluster._zoomForCluster = zoom + 1;
-					}
 					newCluster._projCenter = this._map.project(newCluster.getLatLng(), zoom);
 					clusters.push(newCluster);
 				} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git