ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure that #clear() keeps the collection in sync

Browse Source
This commit is contained in:
Andreas Hocevar
2015-06-09 13:26:12 +02:00
parent 53d5d8c1d9
commit 57e1dda5f1
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ol/source/vectorsource.js
View File

@@ -372,26 +372,30 @@ ol.source.Vector.prototype.bindFeaturesCollection_ = function(collection) {
*/
ol.source.Vector.prototype.clear = function(opt_fast) {
if (opt_fast) {
for (var featureId in this.featureChangeKeys_) {
var keys = this.featureChangeKeys_[featureId];
goog.array.forEach(keys, goog.events.unlistenByKey);
if (goog.isNull(this.featuresCollection_)) {
for (var featureId in this.featureChangeKeys_) {
var keys = this.featureChangeKeys_[featureId];
goog.array.forEach(keys, goog.events.unlistenByKey);
}
this.featureChangeKeys_ = {};
this.idIndex_ = {};
this.undefIdIndex_ = {};
} else {
this.featuresCollection_.clear();
}
this.featureChangeKeys_ = {};
this.idIndex_ = {};
this.undefIdIndex_ = {};
} else {
var rmFeatureInternal = this.removeFeatureInternal;
if (!goog.isNull(this.featuresRtree_)) {
this.featuresRtree_.forEach(rmFeatureInternal, this);
goog.object.forEach(this.nullGeometryFeatures_, rmFeatureInternal, this);
}
goog.asserts.assert(goog.object.isEmpty(this.featureChangeKeys_),
'featureChangeKeys is an empty object now');
goog.asserts.assert(goog.object.isEmpty(this.idIndex_),
'idIndex is an empty object now');
goog.asserts.assert(goog.object.isEmpty(this.undefIdIndex_),
'undefIdIndex is an empty object now');
}
goog.asserts.assert(goog.object.isEmpty(this.featureChangeKeys_),
'featureChangeKeys is an empty object now');
goog.asserts.assert(goog.object.isEmpty(this.idIndex_),
'idIndex is an empty object now');
goog.asserts.assert(goog.object.isEmpty(this.undefIdIndex_),
'undefIdIndex is an empty object now');
if (!goog.isNull(this.featuresRtree_)) {
this.featuresRtree_.clear();