fix QuadtreePrimitive updateHeights callback

CHANGES.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.129 - 2025-05-01
+
+### @cesium/engine
+
+#### Fixes :wrench:
+
+- `QuadtreePrimitive.updateHeights` now converts position to Cartographic before invoking the callback, ensuring compatibility with change introduced by [commit 53889cb](https://github.com/CesiumGS/cesium/commit/53889cb) and preventing unnecessary computation. [#12555](https://github.com/CesiumGS/cesium/pull/12555)
+
 ## 1.128 - 2025-04-01
 
 ### @cesium/engine

packages/engine/Source/Scene/QuadtreePrimitive.js

@@ -1526,7 +1526,11 @@ function updateHeights(primitive, frameState) {
         }
         if (defined(position)) {
           if (defined(data.callback)) {
-            data.callback(position);
+            const positionCarto = ellipsoid.cartesianToCartographic(
+              position,
+              scratchCartographic,
+            );
+            data.callback(positionCarto);
           }
           data.level = tile.level;
         }

packages/engine/Specs/Scene/QuadtreePrimitiveSpec.js

@@ -7,6 +7,7 @@ import {
   GeographicProjection,
   GeographicTilingScheme,
   Intersect,
+  Math as CesiumMath,
   Rectangle,
   Visibility,
   Camera,
@@ -23,6 +24,18 @@ import TerrainTileProcessor from "../../../../Specs/TerrainTileProcessor.js";
 import createScene from "../../../../Specs/createScene.js";
 import pollToPromise from "../../../../Specs/pollToPromise.js";
 
+function expectCartographicToEqualEpsilon(actual, expected, epsilon) {
+  expect(
+    CesiumMath.equalsEpsilon(actual.longitude, expected.longitude, epsilon),
+  ).toBe(true);
+  expect(
+    CesiumMath.equalsEpsilon(actual.latitude, expected.latitude, epsilon),
+  ).toBe(true);
+  expect(
+    CesiumMath.equalsEpsilon(actual.height, expected.height, epsilon),
+  ).toBe(true);
+}
+
 describe("Scene/QuadtreePrimitive", function () {
   describe("selectTilesForRendering", function () {
     let scene;
@@ -920,9 +933,15 @@ describe("Scene/QuadtreePrimitive", function () {
           },
         };
 
-        const position = Cartesian3.clone(Cartesian3.ZERO);
-        const updatedPosition = Cartesian3.clone(Cartesian3.UNIT_X);
+        const positionCarto = Cartographic.fromDegrees(-72.0, 40.0, 0);
+        const updatedPositionCarto = Cartographic.fromDegrees(-72.0, 40.0, 100);
+        const position = Cartographic.toCartesian(positionCarto);
+        const updatedPosition = Cartographic.toCartesian(updatedPositionCarto);
+        // variables for results
+        const positionRes = new Cartographic();
+        const updatedPositionRes = new Cartographic();
         let currentPosition = position;
+        let currentPositionRes = positionRes;
 
         // Load the root tiles.
         tileProvider.loadTile.and.callFake(function (frameState, tile) {
@@ -943,7 +962,8 @@ describe("Scene/QuadtreePrimitive", function () {
         quadtree.updateHeight(
           Cartographic.fromDegrees(-72.0, 40.0),
           function (p) {
-            Cartesian3.clone(p, position);
+            // p is a Cartographic position
+            Cartographic.clone(p, currentPositionRes);
           },
         );
 
@@ -959,16 +979,25 @@ describe("Scene/QuadtreePrimitive", function () {
         quadtree.render(scene.frameState);
         quadtree.endFrame(scene.frameState);
 
-        expect(position).toEqual(Cartesian3.ZERO);
+        expectCartographicToEqualEpsilon(
+          positionRes,
+          positionCarto,
+          CesiumMath.EPSILON10,
+        );
 
         currentPosition = updatedPosition;
+        currentPositionRes = updatedPositionRes;
 
         quadtree.update(scene.frameState);
         quadtree.beginFrame(scene.frameState);
         quadtree.render(scene.frameState);
         quadtree.endFrame(scene.frameState);
 
-        expect(position).toEqual(updatedPosition);
+        expectCartographicToEqualEpsilon(
+          updatedPositionRes,
+          updatedPositionCarto,
+          CesiumMath.EPSILON10,
+        );
       });
 
       it("uses tiles position caching in update heights", function () {
@@ -1024,15 +1053,15 @@ describe("Scene/QuadtreePrimitive", function () {
         );
 
         // Variables to store results from the callbacks
-        const position1 = new Cartesian3();
-        const position2 = new Cartesian3();
+        const position1 = new Cartographic();
+        const position2 = new Cartographic();
 
         // Install two height update callbacks with near-identical positions.
         quadtree.updateHeight(carto1, function (p) {
-          Cartesian3.clone(p, position1);
+          Cartographic.clone(p, position1);
         });
         quadtree.updateHeight(carto2, function (p) {
-          Cartesian3.clone(p, position2);
+          Cartographic.clone(p, position2);
         });
 
         // Process a few render cycles to trigger height updates and cache usage.