From 4a73754b93ca43b66d1c7a2678eec829930b7cec Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Mon, 23 Oct 2017 11:38:53 +0200
Subject: [PATCH] Entertain the compiler

---
 src/ol/render/canvas/replay.js            | 11 +++++++++--
 src/ol/renderer/canvas/vectorlayer.js     |  2 +-
 src/ol/renderer/canvas/vectortilelayer.js |  2 +-
 src/ol/source/imagevector.js              |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js
index a063e33355..4550547397 100644
--- a/src/ol/render/canvas/replay.js
+++ b/src/ol/render/canvas/replay.js
@@ -389,8 +389,15 @@ ol.render.canvas.Replay.prototype.renderDeclutter_ = function(declutterGroup) {
   if (declutterGroup && declutterGroup.length > 5) {
     var groupCount = declutterGroup[4];
     if (groupCount == 1 || groupCount == declutterGroup.length - 5) {
-      if (!this.declutterTree.collides(this.declutterTree.toBBox(declutterGroup))) {
-        this.declutterTree.insert(declutterGroup.slice(0, 4));
+      /** @type {ol.RBushEntry} */
+      var box = {
+        minX: /** @type {number} */ (declutterGroup[0]),
+        minY: /** @type {number} */ (declutterGroup[1]),
+        maxX: /** @type {number} */ (declutterGroup[2]),
+        maxY: /** @type {number} */ (declutterGroup[3])
+      };
+      if (!this.declutterTree.collides(box)) {
+        this.declutterTree.insert(box);
         var drawImage = ol.render.canvas.drawImage;
         for (var j = 5, jj = declutterGroup.length; j < jj; ++j) {
           if (declutterGroup[j]) {
diff --git a/src/ol/renderer/canvas/vectorlayer.js b/src/ol/renderer/canvas/vectorlayer.js
index 574f2b98fa..dc25ba9dac 100644
--- a/src/ol/renderer/canvas/vectorlayer.js
+++ b/src/ol/renderer/canvas/vectorlayer.js
@@ -29,7 +29,7 @@ ol.renderer.canvas.VectorLayer = function(vectorLayer) {
    * @private
    */
   this.declutterTree_ = vectorLayer.getDeclutter() ?
-    ol.ext.rbush(9, ['[0]', '[1]', '[2]', '[3]']) : null;
+    ol.ext.rbush(9) : null;
 
   /**
    * @private
diff --git a/src/ol/renderer/canvas/vectortilelayer.js b/src/ol/renderer/canvas/vectortilelayer.js
index 1d2c5827a4..cdf2186d18 100644
--- a/src/ol/renderer/canvas/vectortilelayer.js
+++ b/src/ol/renderer/canvas/vectortilelayer.js
@@ -38,7 +38,7 @@ ol.renderer.canvas.VectorTileLayer = function(layer) {
    * Declutter tree.
    * @private
      */
-  this.declutterTree_ = layer.getDeclutter() ? ol.ext.rbush(9, ['[0]', '[1]', '[2]', '[3]']) : null;
+  this.declutterTree_ = layer.getDeclutter() ? ol.ext.rbush(9) : null;
 
   /**
    * @private
diff --git a/src/ol/source/imagevector.js b/src/ol/source/imagevector.js
index d310285a1f..66a15f2fe6 100644
--- a/src/ol/source/imagevector.js
+++ b/src/ol/source/imagevector.js
@@ -60,7 +60,7 @@ ol.source.ImageVector = function(options) {
    * Declutter tree.
    * @private
    */
-  this.declutterTree_ = ol.ext.rbush(9, ['[0]', '[1]', '[2]', '[3]']);
+  this.declutterTree_ = ol.ext.rbush(9);
 
   /**
    * @private