From e3c2142cab82382b72e22cf2b7072637a037876a Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 9 Jun 2020 10:18:59 +0200
Subject: [PATCH] Do not add empty arrays to the frameState's declutterItems

---
 src/ol/render/canvas/ExecutorGroup.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ol/render/canvas/ExecutorGroup.js b/src/ol/render/canvas/ExecutorGroup.js
index 511ea789ae..a14d6bc8a7 100644
--- a/src/ol/render/canvas/ExecutorGroup.js
+++ b/src/ol/render/canvas/ExecutorGroup.js
@@ -478,15 +478,15 @@ export function replayDeclutter(
     let currentExecutor;
     for (let i = 0, ii = executorData.length; i < ii; ) {
       const executor = executorData[i++];
-      if (executor !== currentExecutor) {
+      const transform = executorData[i++];
+      executor.execute(context, 1, transform, rotation, snapToPixel);
+      if (executor !== currentExecutor && executor.declutterItems.length > 0) {
         currentExecutor = executor;
         declutterItems.push({
           items: executor.declutterItems,
           opacity: opacity,
         });
       }
-      const transform = executorData[i++];
-      executor.execute(context, 1, transform, rotation, snapToPixel);
     }
   }
 }