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

Jump to bottom

Fix bugs with feature layer setWhere #1211

Merged
merged 2 commits into from
Jul 9, 2020
Merged

Fix bugs with feature layer setWhere #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ab9e66
fix #875, fix #1196
patrickarlt Jul 8, 2020
99d6364
Update src/Layers/FeatureLayer/FeatureManager.js
patrickarlt Jul 9, 2020
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
2 changes: 1 addition & 1 deletion src/Layers/FeatureLayer/FeatureGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export var FeatureGrid = Layer.extend({
Util.setOptions(this, options);
},

onAdd: function () {
onAdd: function (map) {
this._cells = {};
this._activeCells = {};
this._resetView();
Expand Down
16 changes: 15 additions & 1 deletion src/Layers/FeatureLayer/FeatureManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ export var FeatureManager = FeatureGrid.extend({
_requestFeatures: function (bounds, coords, callback) {
this._activeRequests++;

var originalWhere = this.options.where;

// our first active request fires loading
if (this._activeRequests === 1) {
this.fire(
Expand All @@ -153,6 +155,11 @@ export var FeatureManager = FeatureGrid.extend({
this.fire('drawlimitexceeded');
}

// the where changed while this request was being run so don't it.
if (this.options.where !== originalWhere) {
return;
}

// no error, features
if (!error && featureCollection && featureCollection.features.length) {
// schedule adding features until the next animation frame
Expand Down Expand Up @@ -271,7 +278,11 @@ export var FeatureManager = FeatureGrid.extend({

pendingRequests--;

if (pendingRequests <= 0 && this._visibleZoom()) {
if (
pendingRequests <= 0 &&
this._visibleZoom() &&
where === this.options.where // the where is still the same so use this one
) {
this._currentSnapshot = newSnapshot;
// schedule adding features for the next animation frame
Util.requestAnimFrame(
Expand All @@ -289,6 +300,9 @@ export var FeatureManager = FeatureGrid.extend({
for (var i = this._currentSnapshot.length - 1; i >= 0; i--) {
oldSnapshot.push(this._currentSnapshot[i]);
}

this._cache = {};

for (var key in this._cells) {
pendingRequests++;
var coords = this._keyToCellCoords(key);
Expand Down