From 65fc3ca2caabf75794046e772c7b5e57000680de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Mon, 28 Sep 2020 00:23:26 +0200
Subject: [PATCH] Improved performance when removing feature with only one
 Select

---
 src/ol/interaction/Select.js | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js
index 4d35046606..db5b12128a 100644
--- a/src/ol/interaction/Select.js
+++ b/src/ol/interaction/Select.js
@@ -391,25 +391,23 @@ class Select extends Interaction {
    * @private
    */
   restorePreviousStyle_(feature) {
-    const key = getUid(feature);
-    const selectInteractions = /** @type {Array<Select>} */ (this.getMap()
-      .getInteractions()
-      .getArray()
-      .filter(function (interaction) {
-        return (
-          interaction instanceof Select &&
-          interaction.getStyle() &&
-          interaction.getFeatures().getArray().indexOf(feature) !== -1
-        );
-      }));
-    if (selectInteractions.length > 0) {
-      feature.setStyle(
-        selectInteractions[selectInteractions.length - 1].getStyle()
-      );
-    } else {
-      feature.setStyle(originalFeatureStyles[key]);
-      delete originalFeatureStyles[key];
+    const interactions = this.getMap().getInteractions().getArray();
+    for (let i = interactions.length - 1; i >= 0; --i) {
+      const interaction = interactions[i];
+      if (
+        interaction !== this &&
+        interaction instanceof Select &&
+        interaction.getStyle() &&
+        interaction.getFeatures().getArray().lastIndexOf(feature) !== -1
+      ) {
+        feature.setStyle(interaction.getStyle());
+        return;
+      }
     }
+
+    const key = getUid(feature);
+    feature.setStyle(originalFeatureStyles[key]);
+    delete originalFeatureStyles[key];
   }
 
   /**