From 1504cd942ab02d008ff8200eb132b13f4374a553 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Tue, 9 Jun 2020 09:43:55 +0200
Subject: [PATCH] Fix multigeometry decluttering

---
 src/ol/render/canvas/Executor.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ol/render/canvas/Executor.js b/src/ol/render/canvas/Executor.js
index 3051d577fd..d1c82d2625 100644
--- a/src/ol/render/canvas/Executor.js
+++ b/src/ol/render/canvas/Executor.js
@@ -854,10 +854,10 @@ class Executor {
             }
             if (declutterGroups) {
               const index = Math.floor(declutterGroupIndex);
-              if (declutterGroups.length < index + 1) {
-                declutterGroup = [declutterGroups[0][0], declutterGroups[0][1]];
-              }
-              declutterGroup = declutterGroups[index];
+              declutterGroup =
+                declutterGroups.length < index + 1
+                  ? [declutterGroups[0][0]]
+                  : declutterGroups[index];
             }
             const rendered = this.replayImageOrLabel_(
               context,
@@ -887,7 +887,7 @@ class Executor {
             if (
               rendered &&
               declutterGroup &&
-              declutterGroups[declutterGroups.length] !== declutterGroup
+              declutterGroups[declutterGroups.length - 1] !== declutterGroup
             ) {
               declutterGroups.push(declutterGroup);
             }