Merge pull request #11190 from malaretv/czml-wgs84

Be consistent about using Ellipsoid.WGS84 in CzmlDataSource
CesiumGS · Jul 31, 2023 · fc42af7 · fc42af7
2 parents 0ed67aa + be62a8e
commit fc42af7
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,7 @@
 - Fixed issue where terrain with multiple layers was loading higher LOD tiles inconsistently. [#11312](https://github.com/CesiumGS/cesium/issues/11312)
 - Fixed `OpenStreetMapImageryProvider` usage in comments, change default url and add `tile.openstreetmap.org` to `RequestScheduler.requestsByServer`. [#11407](https://github.com/CesiumGS/cesium/pull/11407)
 - Fixed calculation of GroundPolyline bounding spheres in regions with negative terrain heights. [#11184](https://github.com/CesiumGS/cesium/pull/11184)
+- Fixed `CzmlDataSource` in cases of custom `Ellipsoid.WGS84` definitions. [#11190](https://github.com/CesiumGS/cesium/pull/11190)
 - Fixed mipmaps for textures using the `KHR_texture_transform` extension. [#11411](https://github.com/CesiumGS/cesium/pull/11411)
 
 #### @cesium/widgets

diff --git a/packages/engine/Source/DataSources/CzmlDataSource.js b/packages/engine/Source/DataSources/CzmlDataSource.js
@@ -1822,11 +1822,13 @@ function processPositionArrayPacketData(
       packetData.array = Cartesian3.unpackArray(packetData.cartesian);
     } else if (defined(packetData.cartographicRadians)) {
       packetData.array = Cartesian3.fromRadiansArrayHeights(
-        packetData.cartographicRadians
+        packetData.cartographicRadians,
+        Ellipsoid.WGS84
       );
     } else if (defined(packetData.cartographicDegrees)) {
       packetData.array = Cartesian3.fromDegreesArrayHeights(
-        packetData.cartographicDegrees
+        packetData.cartographicDegrees,
+        Ellipsoid.WGS84
       );
     }
 
@@ -1878,11 +1880,11 @@ function unpackCartesianArray(array) {
 }
 
 function unpackCartographicRadiansArray(array) {
-  return Cartesian3.fromRadiansArrayHeights(array);
+  return Cartesian3.fromRadiansArrayHeights(array, Ellipsoid.WGS84);
 }
 
 function unpackCartographicDegreesArray(array) {
-  return Cartesian3.fromDegreesArrayHeights(array);
+  return Cartesian3.fromDegreesArrayHeights(array, Ellipsoid.WGS84);
 }
 
 function processPositionArrayOfArraysPacketData(

diff --git a/packages/engine/Specs/DataSources/CzmlDataSourceSpec.js b/packages/engine/Specs/DataSources/CzmlDataSourceSpec.js
@@ -46,6 +46,7 @@ import {
   LabelStyle,
   ShadowMode,
   VerticalOrigin,
+  Ellipsoid,
 } from "../../index.js";
 
 describe("DataSources/CzmlDataSource", function () {
@@ -148,17 +149,17 @@ describe("DataSources/CzmlDataSource", function () {
     return array.slice(startIndex, startIndex + count);
   }
 
-  function cartesianFromArrayDegrees(array, startIndex) {
+  function cartesianFromArrayDegrees(array, startIndex, ellipsoid) {
     return Cartesian3.fromDegrees.apply(
       null,
-      arraySubset(array, startIndex, 3)
+      [].concat(arraySubset(array, startIndex, 3), ellipsoid)
     );
   }
 
-  function cartesianFromArrayRadians(array, startIndex) {
+  function cartesianFromArrayRadians(array, startIndex, ellipsoid) {
     return Cartesian3.fromRadians.apply(
       null,
-      arraySubset(array, startIndex, 3)
+      [].concat(arraySubset(array, startIndex, 3), ellipsoid)
     );
   }
 
@@ -1317,6 +1318,31 @@ describe("DataSources/CzmlDataSource", function () {
     });
   });
 
+  it("can handle position specified as constant cartographicsDegrees with non-standard ellipsoid", function () {
+    const WGS84 = Ellipsoid.WGS84.clone();
+    Ellipsoid.WGS84 = new Ellipsoid(1737400, 1737400, 1737400);
+    const packet = {
+      position: {
+        cartographicDegrees: [34, 117, 10000],
+      },
+    };
+
+    return CzmlDataSource.load(makeDocument(packet)).then(function (
+      dataSource
+    ) {
+      const entity = dataSource.entities.values[0];
+      const resultCartesian = entity.position.getValue(JulianDate.now());
+      expect(resultCartesian).toEqual(
+        cartesianFromArrayDegrees(
+          packet.position.cartographicDegrees,
+          0,
+          Ellipsoid.WGS84
+        )
+      );
+      Ellipsoid.WGS84 = WGS84;
+    });
+  });
+
   it("can handle position specified as sampled cartographicsDegrees", function () {
     const epoch = JulianDate.now();
 
@@ -1397,7 +1423,30 @@ describe("DataSources/CzmlDataSource", function () {
       );
     });
   });
+  it("can handle position specified as constant cartographicRadians with non-standard ellipsoid", function () {
+    const WGS84 = Ellipsoid.WGS84.clone();
+    Ellipsoid.WGS84 = new Ellipsoid(1737400, 1737400, 1737400);
+    const packet = {
+      position: {
+        cartographicRadians: [1, 2, 10000],
+      },
+    };
 
+    return CzmlDataSource.load(makeDocument(packet)).then(function (
+      dataSource
+    ) {
+      const entity = dataSource.entities.values[0];
+      const resultCartesian = entity.position.getValue(JulianDate.now());
+      expect(resultCartesian).toEqual(
+        cartesianFromArrayRadians(
+          packet.position.cartographicRadians,
+          0,
+          Ellipsoid.WGS84
+        )
+      );
+      Ellipsoid.WGS84 = WGS84;
+    });
+  });
   it("can handle position specified as sampled cartographicRadians", function () {
     const epoch = JulianDate.now();