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

Introduce clear event on vector source

Browse Source 
Three seconds speed up when clearing 100'000 features.
Clearing is now around 350ms.
This commit is contained in:
Guillaume Beraudo
2014-12-05 14:55:46 +01:00
parent 3e2cc3c246
commit 17e56d8357
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,14 @@ ol.source.VectorEventType = {
CHANGEFEATURE: 'changefeature',
/**
* Triggered when a feature is removed from the source.
* Triggered when a clear is called on the source.
* @event ol.source.VectorEvent#clear
* @api
*/
CLEAR: 'clear',
/**
* Triggered when a single feature is removed from the source.
* @event ol.source.VectorEvent#removefeature
* @api stable
*/
@@ -230,12 +237,18 @@ ol.source.Vector.prototype.addFeaturesInternal = function(features) {
* @api stable
*/
ol.source.Vector.prototype.clear = function() {
this.rBush_.forEach(this.removeFeatureInternal, this);
for (var featureId in this.featureChangeKeys_) {
var keys = this.featureChangeKeys_[featureId];
goog.array.forEach(keys, goog.events.unlistenByKey);
}
this.featureChangeKeys_ = {};
this.idIndex_ = {};
this.undefIdIndex_ = {};
this.rBush_.clear();
goog.object.forEach(
this.nullGeometryFeatures_, this.removeFeatureInternal, this);
goog.object.clear(this.nullGeometryFeatures_);
goog.asserts.assert(goog.object.isEmpty(this.featureChangeKeys_));
this.nullGeometryFeatures_ = {};
var clearEvent = new ol.source.VectorEvent(ol.source.VectorEventType.CLEAR);
this.dispatchEvent(clearEvent);
this.changed();
};

8
test/spec/ol/source/vectorsource.test.js
View File

@@ -90,13 +90,17 @@ describe('ol.source.Vector', function() {
goog.events.listen(vectorSource, 'change', changeSpy);
var removeFeatureSpy = sinon.spy();
goog.events.listen(vectorSource, 'removefeature', removeFeatureSpy);
var clearSourceSpy = sinon.spy();
goog.events.listen(vectorSource, 'clear', clearSourceSpy);
vectorSource.clear();
expect(vectorSource.getFeatures()).to.eql([]);
expect(vectorSource.isEmpty()).to.be(true);
expect(changeSpy).to.be.called();
expect(changeSpy.callCount).to.be(1);
expect(removeFeatureSpy).to.be.called();
expect(removeFeatureSpy.callCount).to.be(features.length);
expect(removeFeatureSpy).not.to.be.called();
expect(removeFeatureSpy.callCount).to.be(0);
expect(clearSourceSpy).to.be.called();
expect(clearSourceSpy.callCount).to.be(1);
});
});