Merge pull request #11392 from hongfaqiu/main

fix: rectanglePromise.then is not a function
CesiumGS · Jul 5, 2023 · ddfc7eb · ddfc7eb
2 parents 2412404 + d3d717a
commit ddfc7eb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,13 @@
 # Change Log
 
+### 1.108 - 2023-08-01
+
+#### @cesium/widgets
+
+##### Fixes :wrench:
+
+- Fixed the error report "rectanglePromise.then is not a function" that occurred when using `viewer.flyTo` to navigate to an ImageryLayer. [#11392](https://github.com/CesiumGS/cesium/pull/11392)
+
 ### 1.107 - 2023-07-03
 
 #### Major Announcements :loudspeaker:

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -361,3 +361,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [IKangXu](https://github.com/IKangXu)
 - [e3dio](https://github.com/e3dio)
 - [Dphalos](https://github.com/Dphalos)
+- [hongfaqiu](https://github.com/hongfaqiu)
diff --git a/packages/widgets/Source/Viewer/Viewer.js b/packages/widgets/Source/Viewer/Viewer.js
@@ -2137,7 +2137,7 @@ function zoomToOrFly(that, zoomTarget, options, isFlight) {
       let rectanglePromise;
 
       if (defined(zoomTarget.imageryProvider)) {
-        rectanglePromise = zoomTarget.getImageryRectangle();
+        rectanglePromise = Promise.resolve(zoomTarget.getImageryRectangle());
       } else {
         rectanglePromise = new Promise((resolve) => {
           const removeListener = zoomTarget.readyEvent.addEventListener(() => {

diff --git a/packages/widgets/Specs/Viewer/ViewerSpec.js b/packages/widgets/Specs/Viewer/ViewerSpec.js
@@ -62,6 +62,7 @@ describe(
           return new Rectangle();
         },
       },
+      rectangle: Rectangle.MAX_VALUE,
     };
 
     const testProviderViewModel = new ProviderViewModel({
@@ -1869,6 +1870,20 @@ describe(
       });
     });
 
+    it("flyTo flies to imagery layer with default offset when options are not defined", async function () {
+      viewer = createViewer(container);
+
+      const imageryLayer = new ImageryLayer(testProvider);
+
+      const promise = viewer.flyTo(imageryLayer, {
+        duration: 0,
+      });
+
+      viewer._postRender();
+
+      await expectAsync(promise).toBeResolved();
+    });
+
     it("flyTo flies to VoxelPrimitive with default offset when options not defined", function () {
       viewer = createViewer(container);