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

Only activate ol.structs.RBush conflict checks when goog.DEBUG is true

Browse Source
This commit is contained in:
Tom Payne
2013-11-27 14:54:14 +01:00
parent 665781ee03
commit 978041b68c
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,11 +189,13 @@ ol.structs.RBush = function(opt_maxEntries) {
*/ */
this.valueExtent_ = {}; this.valueExtent_ = {};
/** if (goog.DEBUG) {
* @private /**
* @type {number} * @private
*/ * @type {number}
this.readers_ = 0; */
this.readers_ = 0;
}
}; };
@@ -393,11 +395,15 @@ ol.structs.RBush.prototype.condense_ = function(path) {
* @template S * @template S
*/ */
ol.structs.RBush.prototype.forEach = function(callback, opt_obj) { ol.structs.RBush.prototype.forEach = function(callback, opt_obj) {
++this.readers_; if (goog.DEBUG) {
try { ++this.readers_;
try {
return this.forEach_(this.root_, callback, opt_obj);
} finally {
--this.readers_;
}
} else {
return this.forEach_(this.root_, callback, opt_obj); return this.forEach_(this.root_, callback, opt_obj);
} finally {
--this.readers_;
} }
}; };
@@ -443,11 +449,15 @@ ol.structs.RBush.prototype.forEach_ = function(node, callback, opt_obj) {
*/ */
ol.structs.RBush.prototype.forEachInExtent = ol.structs.RBush.prototype.forEachInExtent =
function(extent, callback, opt_obj) { function(extent, callback, opt_obj) {
++this.readers_; if (goog.DEBUG) {
try { ++this.readers_;
try {
return this.forEachInExtent_(extent, callback, opt_obj);
} finally {
--this.readers_;
}
} else {
return this.forEachInExtent_(extent, callback, opt_obj); return this.forEachInExtent_(extent, callback, opt_obj);
} finally {
--this.readers_;
} }
}; };
@@ -526,7 +536,7 @@ ol.structs.RBush.prototype.getKey_ = function(value) {
* @param {T} value Value. * @param {T} value Value.
*/ */
ol.structs.RBush.prototype.insert = function(extent, value) { ol.structs.RBush.prototype.insert = function(extent, value) {
if (this.readers_) { if (goog.DEBUG && this.readers_) {
throw Error('cannot insert value while reading'); throw Error('cannot insert value while reading');
} }
var key = this.getKey_(value); var key = this.getKey_(value);
@@ -568,7 +578,7 @@ ol.structs.RBush.prototype.insert_ = function(extent, value, level) {
* @param {T} value Value. * @param {T} value Value.
*/ */
ol.structs.RBush.prototype.remove = function(value) { ol.structs.RBush.prototype.remove = function(value) {
if (this.readers_) { if (goog.DEBUG && this.readers_) {
throw Error('cannot remove value while reading'); throw Error('cannot remove value while reading');
} }
var key = this.getKey_(value); var key = this.getKey_(value);
@@ -665,7 +675,7 @@ ol.structs.RBush.prototype.splitRoot_ = function(node1, node2) {
* @param {T} value Value. * @param {T} value Value.
*/ */
ol.structs.RBush.prototype.update = function(extent, value) { ol.structs.RBush.prototype.update = function(extent, value) {
if (this.readers_) { if (goog.DEBUG && this.readers_) {
throw Error('cannot update value while reading'); throw Error('cannot update value while reading');
} }
var key = this.getKey_(value); var key = this.getKey_(value);