From 26c6538531d7a0958457320ba00e0c0e1f7cd600 Mon Sep 17 00:00:00 2001
From: giserpan <pan.xiaoming@datasw.com>
Date: Fri, 29 Oct 2021 16:17:08 +0800
Subject: [PATCH 1/2] fix bug when select interaction crashes with empty vector
 layer when declutter: true

---
 src/ol/renderer/canvas/VectorLayer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js
index ecfcc8c695..aae89b642f 100644
--- a/src/ol/renderer/canvas/VectorLayer.js
+++ b/src/ol/renderer/canvas/VectorLayer.js
@@ -485,7 +485,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
         hitTolerance,
         featureCallback,
         executorGroup === this.declutterExecutorGroup
-          ? frameState.declutterTree.all().map((item) => item.value)
+          ? frameState.declutterTree&&frameState.declutterTree.all().map((item) => item.value)
           : null
       ));
     });

From c2877d56cb0190a37f81a6db279c469a9e9ac1b5 Mon Sep 17 00:00:00 2001
From: Andreas Hocevar <andreas.hocevar@gmail.com>
Date: Sun, 31 Oct 2021 09:11:59 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

---
 src/ol/renderer/canvas/VectorLayer.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js
index aae89b642f..cc6e6b9221 100644
--- a/src/ol/renderer/canvas/VectorLayer.js
+++ b/src/ol/renderer/canvas/VectorLayer.js
@@ -484,8 +484,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
         rotation,
         hitTolerance,
         featureCallback,
-        executorGroup === this.declutterExecutorGroup
-          ? frameState.declutterTree&&frameState.declutterTree.all().map((item) => item.value)
+        executorGroup === this.declutterExecutorGroup &&
+          frameState.declutterTree
+          ? frameState.declutterTree.all().map((item) => item.value)
           : null
       ));
     });