From 7f64a09e3c785384f995a42b21af980e7a35014f Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 6 Feb 2014 01:14:19 +0100
Subject: [PATCH] Return, and check, boolean value from ol.structs.RBush#remove
 indicating whether value was removed

---
 src/ol/structs/rbush.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/ol/structs/rbush.js b/src/ol/structs/rbush.js
index 9c4497e616..0c805e7327 100644
--- a/src/ol/structs/rbush.js
+++ b/src/ol/structs/rbush.js
@@ -597,6 +597,7 @@ ol.structs.RBush.prototype.isEmpty = function() {
 
 /**
  * @param {T} value Value.
+ * @return {boolean} Removed.
  */
 ol.structs.RBush.prototype.remove = function(value) {
   if (goog.DEBUG && this.readers_) {
@@ -606,7 +607,7 @@ ol.structs.RBush.prototype.remove = function(value) {
   goog.asserts.assert(this.valueExtent_.hasOwnProperty(key));
   var extent = this.valueExtent_[key];
   delete this.valueExtent_[key];
-  this.remove_(extent, value);
+  return this.remove_(extent, value);
 };
 
 
@@ -614,12 +615,18 @@ ol.structs.RBush.prototype.remove = function(value) {
  * @param {ol.Extent} extent Extent.
  * @param {T} value Value.
  * @private
+ * @return {boolean} Removed.
  */
 ol.structs.RBush.prototype.remove_ = function(extent, value) {
   var path = [this.root_];
   var removed = this.removeRecursive_(this.root_, extent, value, path);
-  goog.asserts.assert(removed);
-  this.condense_(path);
+  if (removed) {
+    this.condense_(path);
+  } else {
+    goog.asserts.assert(path.length == 1);
+    goog.asserts.assert(path[0] === this.root_);
+  }
+  return removed;
 };
 
 
@@ -710,7 +717,8 @@ ol.structs.RBush.prototype.update = function(extent, value) {
   var currentExtent = this.valueExtent_[key];
   goog.asserts.assert(goog.isDef(currentExtent));
   if (!ol.extent.equals(currentExtent, extent)) {
-    this.remove_(currentExtent, value);
+    var removed = this.remove_(currentExtent, value);
+    goog.asserts.assert(removed);
     this.insert_(extent, value, this.root_.height - 1);
     this.valueExtent_[key] = ol.extent.clone(extent, currentExtent);
   }