chore(web): improve performance of flyTo (#746)

reearth · Oct 19, 2023 · 25359fa · 25359fa
1 parent dcf9f3f
commit 25359fa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/web/src/beta/lib/core/engines/Cesium/useEngineRef.ts b/web/src/beta/lib/core/engines/Cesium/useEngineRef.ts
@@ -137,7 +137,8 @@ export default function useEngineRef(
           if (!viewer || viewer.isDestroyed()) return;
 
           const layerOrFeatureId = target;
-          const entityFromFeatureId = findEntity(viewer, undefined, layerOrFeatureId);
+          const entityFromFeatureId = findEntity(viewer, undefined, layerOrFeatureId, true);
+          // `viewer.flyTo` doesn't support Cesium3DTileFeature.
           if (
             entityFromFeatureId &&
             !(

diff --git a/web/src/beta/lib/core/engines/Cesium/utils.ts b/web/src/beta/lib/core/engines/Cesium/utils.ts
@@ -139,6 +139,7 @@ export function findEntity(
   viewer: CesiumViewer,
   layerId?: string,
   featureId?: string,
+  withoutTileFeature?: boolean,
 ): Entity | Cesium3DTileset | InternalCesium3DTileFeature | undefined {
   const id = featureId ?? layerId;
   const keyName = featureId ? "featureId" : "layerId";
@@ -160,32 +161,31 @@ export function findEntity(
     }
   }
 
-  // Find Cesium3DTileFeature
+  // Find Cesium3DTileset
   for (let i = 0; i < viewer.scene.primitives.length; i++) {
     const prim = viewer.scene.primitives.get(i);
-    if (!(prim instanceof Cesium3DTileset) || !prim.ready) {
+    if (!(prim instanceof Cesium3DTileset)) {
       continue;
     }
 
-    const target = findFeatureFrom3DTile(prim.root, featureId);
-    if (target) {
-      return target;
-    }
-  }
-
-  // Find Cesium3DTileset
-  for (let i = 0; i < viewer.scene.primitives.length; i++) {
-    const prim = viewer.scene.primitives.get(i);
-    if (!(prim instanceof Cesium3DTileset)) {
+    if (layerId && !featureId) {
+      const tag = getTag(prim);
+      if (tag?.layerId && layerId && tag?.layerId === layerId) {
+        return prim;
+      }
       continue;
     }
 
-    const tag = getTag(prim);
-    if (tag?.layerId && layerId && tag?.layerId === layerId) {
-      return prim;
+    if (!prim.ready) continue;
+
+    // Skip to search 3dtiles features if `withoutTileFeature` is `true`.
+    if (!withoutTileFeature) {
+      const target = findFeatureFrom3DTile(prim.root, featureId);
+      if (target) {
+        return target;
+      }
     }
   }
-
   return;
 }