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

Merge pull request #3013 from gberaudo/performance_vector_source_clear

Browse Source 
Improve vector source clear() performance
This commit is contained in:
Éric Lemoine
2014-12-08 14:05:24 +01:00
parent b7d0e06f05 e3947fb09a
commit bcd983723f
3 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,16 @@ ol.source.VectorEventType = {
*/
CHANGEFEATURE: 'changefeature',
/**
* Triggered when the clear method is called on the source.
* @event ol.source.VectorEvent#clear
* @api
*/
CLEAR: 'clear',
/**
* Triggered when a feature is removed from the source.
* See {@link ol.source.Vector#clear source.clear()} for exceptions.
* @event ol.source.VectorEvent#removefeature
* @api stable
*/
@@ -227,15 +235,32 @@ ol.source.Vector.prototype.addFeaturesInternal = function(features) {
/**
* Remove all features from the source.
* @param {boolean=} opt_fast Skip dispatching of {@link removefeature} events.
* @api stable
*/
ol.source.Vector.prototype.clear = function() {
this.rBush_.forEach(this.removeFeatureInternal, this);
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);
}
this.featureChangeKeys_ = {};
this.idIndex_ = {};
this.undefIdIndex_ = {};
} else {
var rmFeatureInternal = this.removeFeatureInternal;
this.rBush_.forEach(rmFeatureInternal, this);
goog.object.forEach(this.nullGeometryFeatures_, rmFeatureInternal, this);
goog.asserts.assert(goog.object.isEmpty(this.featureChangeKeys_));
goog.asserts.assert(goog.object.isEmpty(this.idIndex_));
goog.asserts.assert(goog.object.isEmpty(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();
};

6
src/ol/structs/rbush.js
View File

@@ -74,7 +74,7 @@ ol.structs.RBush.prototype.load = function(extents, values) {
}
goog.asserts.assert(extents.length === values.length);
var items = [];
var items = new Array(values.length);
for (var i = 0, l = values.length; i < l; i++) {
var extent = extents[i];
var value = values[i];
@@ -86,7 +86,7 @@ ol.structs.RBush.prototype.load = function(extents, values) {
extent[3],
value
];
items.push(item);
items[i] = item;
goog.object.add(this.items_, goog.getUid(value).toString(), item);
}
this.rbush_.load(items);
@@ -228,7 +228,7 @@ ol.structs.RBush.prototype.isEmpty = function() {
*/
ol.structs.RBush.prototype.clear = function() {
this.rbush_.clear();
goog.object.clear(this.items_);
this.items_ = {};
};