Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatically aborts adding additional markers for an ongoing addLayers call when the clearLayers function is called. #816

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Automatically aborts adding additional markers for an ongoing addLayers call when the clearLayers function is called. #816

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89093d9
Automatically aborts adding additional markers for an ongoing addLaye…
Aug 11, 2017
b4f2a3d
Automatically aborts adding additional markers for an ongoing addLaye…
frenomus Aug 11, 2017
a9d372f
Merge branch 'master' of https://github.com/frenomus/Leaflet.markercl…
frenomus Aug 11, 2017
33efa25
Adding back formatting to match the original file
frenomus Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/MarkerClusterGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
L.extend(this, animate ? this._withAnimation : this._noAnimation);
// Remember which MarkerCluster class to instantiate (animated or not).
this._markerCluster = animate ? L.MarkerCluster : L.MarkerClusterNonAnimated;
//Set the initial clear layers count to 0
this._clearLayersCallCount = 0;
},

addLayer: function (layer) {
Expand Down Expand Up @@ -199,13 +201,17 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
l = layersArray.length,
offset = 0,
originalArray = true,
m;
m,
clearLayerIndexWhenStarted = this._clearLayersCallCount;

if (this._map) {
var started = (new Date()).getTime();
var process = L.bind(function () {
var start = (new Date()).getTime();
for (; offset < l; offset++) {
if (clearLayerIndexWhenStarted !== this._clearLayersCallCount) {
break;
}
if (chunked && offset % 200 === 0) {
// every couple hundred markers, instrument the time elapsed since processing started:
var elapsed = (new Date()).getTime() - start;
Expand Down Expand Up @@ -260,6 +266,10 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
}
}

if (clearLayerIndexWhenStarted !== this._clearLayersCallCount) {
return;
}

if (chunkProgress) {
// report progress and time elapsed:
chunkProgress(offset, l, (new Date()).getTime() - started);
Expand Down Expand Up @@ -419,6 +429,8 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
delete this._gridUnclustered;
}

++this._clearLayersCallCount;

if (this._noanimationUnspiderfy) {
this._noanimationUnspiderfy();
}
Expand Down