perf: optimize entity clustering by avoiding spread on large sets and skipping unused declustering computations

Author: rema

packages/engine/Source/DataSources/EntityCluster.js

@@ -905,35 +905,6 @@ function updateEnable(entityCluster) {
     return;
   }
 
-  const allVisibleEntities = [];
-
-  if (defined(entityCluster._labelCollection)) {
-    for (let i = 0; i < entityCluster._labelCollection.length; i++) {
-      const label = entityCluster._labelCollection.get(i);
-      if (defined(label.id) && label.show) {
-        allVisibleEntities.push(label.id);
-      }
-    }
-  }
-
-  if (defined(entityCluster._billboardCollection)) {
-    for (let i = 0; i < entityCluster._billboardCollection.length; i++) {
-      const billboard = entityCluster._billboardCollection.get(i);
-      if (defined(billboard.id) && billboard.show) {
-        allVisibleEntities.push(billboard.id);
-      }
-    }
-  }
-
-  if (defined(entityCluster._pointCollection)) {
-    for (let i = 0; i < entityCluster._pointCollection.length; i++) {
-      const point = entityCluster._pointCollection.get(i);
-      if (defined(point.id) && point.show) {
-        allVisibleEntities.push(point.id);
-      }
-    }
-  }
-
   if (defined(entityCluster._clusterLabelCollection)) {
     entityCluster._clusterLabelCollection.destroy();
   }
@@ -952,27 +923,62 @@ function updateEnable(entityCluster) {
   disableCollectionClustering(entityCluster._billboardCollection);
   disableCollectionClustering(entityCluster._pointCollection);
 
-  if (allVisibleEntities.length > 0) {
-    const uniqueEntities = [...new Set(allVisibleEntities)];
+  if (entityCluster._declusteredEvent.numberOfListeners !== 0) {
+    const allVisibleEntities = [];
 
-    entityCluster._declusteredEvent.raiseEvent({
-      clustered: [],
-      declustered: uniqueEntities,
-      cluster: null,
-      allProcessed: uniqueEntities,
-    });
+    if (defined(entityCluster._labelCollection)) {
+      for (let i = 0; i < entityCluster._labelCollection.length; i++) {
+        const label = entityCluster._labelCollection.get(i);
+        if (defined(label.id) && label.show) {
+          allVisibleEntities.push(label.id);
+        }
+      }
+    }
 
-    entityCluster._lastClusteredEntities = [];
-    entityCluster._lastDeclusteredEntities = uniqueEntities.slice();
-    entityCluster._allProcessedEntities = uniqueEntities.slice();
-  } else {
-    entityCluster._declusteredEvent.raiseEvent({
-      clustered: [],
-      declustered: [],
-      cluster: null,
-      allProcessed: [],
-    });
+    if (defined(entityCluster._billboardCollection)) {
+      for (let i = 0; i < entityCluster._billboardCollection.length; i++) {
+        const billboard = entityCluster._billboardCollection.get(i);
+        if (defined(billboard.id) && billboard.show) {
+          allVisibleEntities.push(billboard.id);
+        }
+      }
+    }
+
+    if (defined(entityCluster._pointCollection)) {
+      for (let i = 0; i < entityCluster._pointCollection.length; i++) {
+        const point = entityCluster._pointCollection.get(i);
+        if (defined(point.id) && point.show) {
+          allVisibleEntities.push(point.id);
+        }
+      }
+    }
 
+    if (allVisibleEntities.length > 0) {
+      const uniqueEntities = Array.from(new Set(allVisibleEntities));
+
+      entityCluster._declusteredEvent.raiseEvent({
+        clustered: [],
+        declustered: uniqueEntities,
+        cluster: null,
+        allProcessed: uniqueEntities,
+      });
+
+      entityCluster._lastClusteredEntities = [];
+      entityCluster._lastDeclusteredEntities = uniqueEntities.slice();
+      entityCluster._allProcessedEntities = uniqueEntities.slice();
+    } else {
+      entityCluster._declusteredEvent.raiseEvent({
+        clustered: [],
+        declustered: [],
+        cluster: null,
+        allProcessed: [],
+      });
+
+      entityCluster._lastClusteredEntities = [];
+      entityCluster._lastDeclusteredEntities = [];
+      entityCluster._allProcessedEntities = [];
+    }
+  } else {
     entityCluster._lastClusteredEntities = [];
     entityCluster._lastDeclusteredEntities = [];
     entityCluster._allProcessedEntities = [];