No empty declutter instructions, but with individual box

src/ol/render/canvas/BuilderGroup.js

@@ -7,7 +7,6 @@ import ImageBuilder from './ImageBuilder.js';
 import LineStringBuilder from './LineStringBuilder.js';
 import PolygonBuilder from './PolygonBuilder.js';
 import TextBuilder from './TextBuilder.js';
-import {createEmpty} from '../../extent.js';
 
 /**
  * @type {Object<import("./BuilderType").default, typeof Builder>}
@@ -78,15 +77,15 @@ class BuilderGroup {
    * @return {import("../canvas").DeclutterGroups} The resulting instruction groups.
    */
   addDeclutter(group) {
+    /** @type {Array<*>} */
     let declutter = null;
     if (this.declutter_) {
       if (group) {
         declutter = this.declutterGroups_;
-        /** @type {number} */ (declutter[0][4])++;
+        /** @type {number} */ (declutter[0][0])++;
       } else {
-        declutter = [createEmpty()];
+        declutter = [[1]];
         this.declutterGroups_ = declutter;
-        declutter[0].push(1);
       }
     }
     return declutter;

src/ol/render/canvas/Executor.js

@@ -14,8 +14,8 @@ import {
 import {
   createEmpty,
   createOrUpdate,
-  createOrUpdateEmpty,
+  getHeight,
-  extend,
+  getWidth,
   intersects,
 } from '../../extent.js';
 import {
@@ -323,6 +323,7 @@ class Executor {
    * @param {Array<number>} padding Padding.
    * @param {Array<*>} fillInstruction Fill instruction.
    * @param {Array<*>} strokeInstruction Stroke instruction.
+   * @return {boolean} The image or label was rendered.
    */
   replayImageOrLabel_(
     context,
@@ -431,10 +432,9 @@ class Executor {
     }
 
     if (declutterGroup) {
-      if (!intersects && declutterGroup[4] == 1) {
+      if (!intersects && declutterGroup[0] == 1) {
-        return;
+        return false;
       }
-      extend(declutterGroup, tmpExtent);
       const declutterArgs = intersects
         ? [
             context,
@@ -448,6 +448,7 @@ class Executor {
             x,
             y,
             scale,
+            tmpExtent.slice(),
           ]
         : null;
       if (declutterArgs) {
@@ -490,6 +491,7 @@ class Executor {
         scale
       );
     }
+    return true;
   }
 
   /**
@@ -535,38 +537,47 @@ class Executor {
    * @return {?} Declutter tree.
    */
   renderDeclutter(declutterGroup, feature, opacity, declutterTree) {
-    if (declutterGroup && declutterGroup.length > 5) {
+    /** @type {Array<import("../../structs/RBush.js").Entry>} */
-      const groupCount = declutterGroup[4];
+    const boxes = [];
-      if (groupCount == 1 || groupCount == declutterGroup.length - 5) {
+    for (let i = 1, ii = declutterGroup.length; i < ii; ++i) {
-        /** @type {import("../../structs/RBush.js").Entry} */
+      const declutterData = declutterGroup[i];
-        const box = {
+      const box = declutterData[11];
-          minX: /** @type {number} */ (declutterGroup[0]),
+      boxes.push({
-          minY: /** @type {number} */ (declutterGroup[1]),
+        minX: box[0],
-          maxX: /** @type {number} */ (declutterGroup[2]),
+        minY: box[1],
-          maxY: /** @type {number} */ (declutterGroup[3]),
+        maxX: box[2],
+        maxY: box[3],
         value: feature,
-        };
+      });
+    }
     if (!declutterTree) {
       declutterTree = new RBush(9);
     }
-        if (!declutterTree.collides(box)) {
+    let collides = false;
-          declutterTree.insert(box);
+    for (let i = 0, ii = boxes.length; i < ii; ++i) {
-          for (let j = 5, jj = declutterGroup.length; j < jj; ++j) {
+      if (declutterTree.collides(boxes[i])) {
+        collides = true;
+        break;
+      }
+    }
+    if (!collides) {
+      declutterTree.load(boxes);
+      for (let j = 1, jj = declutterGroup.length; j < jj; ++j) {
         const declutterData = /** @type {Array} */ (declutterGroup[j]);
         const context = declutterData[0];
         const currentAlpha = context.globalAlpha;
         if (currentAlpha !== opacity) {
           context.globalAlpha = opacity;
         }
-            if (declutterData.length > 11) {
+        if (declutterData.length > 12) {
           this.replayTextBackground_(
             declutterData[0],
-                declutterData[13],
             declutterData[14],
             declutterData[15],
             declutterData[16],
-                declutterData[11],
+            declutterData[17],
             declutterData[12],
+            declutterData[13],
             true
           );
         }
@@ -576,10 +587,7 @@ class Executor {
         }
       }
     }
-        declutterGroup.length = 5;
+    declutterGroup.length = 1;
-        createOrUpdateEmpty(declutterGroup);
-      }
-    }
     return declutterTree;
   }
 
@@ -847,13 +855,11 @@ class Executor {
             if (declutterGroups) {
               const index = Math.floor(declutterGroupIndex);
               if (declutterGroups.length < index + 1) {
-                declutterGroup = createEmpty();
+                declutterGroup = [declutterGroups[0][0], declutterGroups[0][1]];
-                declutterGroup.push(declutterGroups[0][4]);
-                declutterGroups.push(declutterGroup);
               }
               declutterGroup = declutterGroups[index];
             }
-            this.replayImageOrLabel_(
+            const rendered = this.replayImageOrLabel_(
               context,
               contextScale,
               pixelCoordinates[d],
@@ -878,12 +884,17 @@ class Executor {
                 ? /** @type {Array<*>} */ (lastStrokeInstruction)
                 : null
             );
-            if (declutterGroup) {
+            if (
-              if (declutterGroupIndex === Math.floor(declutterGroupIndex)) {
+              rendered &&
+              declutterGroup &&
+              declutterGroups[declutterGroups.length] !== declutterGroup
+            ) {
+              declutterGroups.push(declutterGroup);
+            }
+            if (declutterGroup.length - 1 === declutterGroup[0]) {
               this.declutterItems.push(this, declutterGroup, feature);
             }
-              declutterGroupIndex += 1 / declutterGroup[4];
+            declutterGroupIndex += 1 / declutterGroup[0];
-            }
           }
           ++i;
           break;
@@ -935,6 +946,7 @@ class Executor {
               cachedWidths
             );
             if (parts) {
+              let rendered = false;
               let c, cc, chars, label, part;
               if (strokeKey) {
                 for (c = 0, cc = parts.length; c < cc; ++c) {
@@ -946,6 +958,7 @@ class Executor {
                     baseline * label.height +
                     (0.5 - baseline) * 2 * strokeWidth -
                     offsetY;
+                  rendered =
                     this.replayImageOrLabel_(
                       context,
                       contextScale,
@@ -966,7 +979,7 @@ class Executor {
                       defaultPadding,
                       null,
                       null
-                  );
+                    ) || rendered;
                 }
               }
               if (fillKey) {
@@ -976,6 +989,7 @@ class Executor {
                   label = this.createLabel(chars, textKey, fillKey, '');
                   anchorX = /** @type {number} */ (part[2]);
                   anchorY = baseline * label.height - offsetY;
+                  rendered =
                     this.replayImageOrLabel_(
                       context,
                       contextScale,
@@ -996,12 +1010,14 @@ class Executor {
                       defaultPadding,
                       null,
                       null
-                  );
+                    ) || rendered;
-                }
-              }
                 }
               }
+              if (rendered) {
                 this.declutterItems.push(this, declutterGroup, feature);
+              }
+            }
+          }
           ++i;
           break;
         case CanvasInstruction.END_GEOMETRY: