Update Build

This commit is contained in:
danzel
2012-08-10 16:05:57 +12:00
parent aed2816986
commit eee1aba847
2 changed files with 23 additions and 8 deletions
+22 -7
View File
@@ -584,8 +584,9 @@ L.MarkerCluster = L.Marker.extend({
_baseInit: function () {
L.Marker.prototype.initialize.call(this, this._latlng, { icon: this._group.options.iconCreateFunction(this._childCount) });
},
_addChild: function (new1) {
this._expandBounds(new1);
if (new1 instanceof L.MarkerCluster) {
this._childClusters.push(new1);
this._childCount += new1._childCount;
@@ -598,18 +599,31 @@ L.MarkerCluster = L.Marker.extend({
this.setIcon(this._group.options.iconCreateFunction(this._childCount));
}
this._expandBounds(new1);
},
_expandBounds: function (marker) {
var addedCount,
addedLatLng;
if (marker instanceof L.MarkerCluster) {
this._bounds.extend(marker._bounds);
addedCount = marker._childCount;
addedLatLng = marker._latlng;
} else {
this._bounds.extend(marker.getLatLng());
addedLatLng = marker.getLatLng();
this._bounds.extend(addedLatLng);
addedCount = 1;
}
this._latlng = this._bounds.getCenter();
var totalCount = this._childCount + addedCount;
if (!this._latlng) {
this._latlng = new L.LatLng(addedLatLng.lat, addedLatLng.lng);
} else {
this._latlng.lat = (addedLatLng.lat * addedCount + this._latlng.lat * this._childCount) / totalCount;
this._latlng.lng = (addedLatLng.lng * addedCount + this._latlng.lng * this._childCount) / totalCount;
}
},
//Set our markers position as given and add it to the map
@@ -749,7 +763,7 @@ L.MarkerCluster = L.Marker.extend({
markers.splice(i, 1);
this._childCount--;
this._recalculateBounds();
if (!('_zoom' in this)) {
this.setIcon(group.options.iconCreateFunction(this._childCount));
}
@@ -775,7 +789,7 @@ L.MarkerCluster = L.Marker.extend({
L.FeatureGroup.prototype.removeLayer.call(group, child);
L.FeatureGroup.prototype.addLayer.call(group, child._markers[0]);
}
//Take ownership of its only marker and bin the cluster
markers.push(child._markers[0]);
childClusters.splice(i, 1);
@@ -907,7 +921,7 @@ L.MarkerCluster = L.Marker.extend({
delete this._backupLatlng;
}
},
//exceptBounds: If set, don't remove any markers/clusters in it
_recursivelyRemoveChildrenFromMap: function (previousBounds, depth, exceptBounds) {
var m, i;
@@ -1003,6 +1017,7 @@ L.MarkerCluster = L.Marker.extend({
});
L.DistanceGrid = function (cellSize) {
this._cellSize = cellSize;
this._sqCellSize = cellSize * cellSize;
+1 -1
View File
File diff suppressed because one or more lines are too long