Merge branch 'main' into control-characters-in-labels-causes-the-rend…

…er-to-stop-CesiumGS#12278-PR
MNPCMW6444 · Nov 3, 2024 · 344a3b3 · 344a3b3
2 parents 3884d92 + 57857b0
commit 344a3b3
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 14 deletions.
diff --git a/Apps/Sandcastle/gallery/CZML Model - Node Transformations.html b/Apps/Sandcastle/gallery/CZML Model - Node Transformations.html
@@ -36,8 +36,8 @@
             name: "CZML Model",
             version: "1.0",
             clock: {
-              interval: "2015-01-01T00:00:00Z/2015-01-01T00:00:20Z",
-              currentTime: "2015-01-01T00:00:00Z",
+              interval: "2015-01-01T12:00:00Z/2015-01-01T12:00:20Z",
+              currentTime: "2015-01-01T12:00:00Z",
               multiplier: 20,
             },
           },
@@ -55,7 +55,7 @@
               nodeTransformations: {
                 Skeleton_arm_joint_L__3_: {
                   rotation: {
-                    epoch: "2015-01-01T00:00:00Z",
+                    epoch: "2015-01-01T12:00:00Z",
                     unitQuaternion: [
                       0, -0.23381920887303329, -0.6909886782144156, -0.0938384854833712,
                       0.6775378681547408, 10, -0.4924076887347565, -0.6304934596091216,

diff --git a/CHANGES.md b/CHANGES.md
@@ -31,7 +31,7 @@
   - New constructor options: `options.shouldAnimate`, `options.automaticallyTrackDataSourceClocks`, `options.dataSources`
   - New properties: `dataSourceDisplay`, `entities`, `dataSources`, `allowDataSourcesToSuspendAnimation`, `trackedEntity`, `trackedEntityChanged`, `clockTrackedDataSource`
   - New functions: `zoomTo()`, `flyTo()`
-- Update Bing Maps attribution link [#12229] (https://github.com/CesiumGS/cesium/pull/12265)
+- Update Bing Maps attribution link [#12265](https://github.com/CesiumGS/cesium/pull/12265)
 
 ##### Fixes :wrench:
 

diff --git a/ThirdParty.json b/ThirdParty.json
@@ -12,7 +12,7 @@
     "license": [
       "BSD-3-Clause"
     ],
-    "version": "2.7.52",
+    "version": "2.7.53",
     "url": "https://www.npmjs.com/package/@zip.js/zip.js"
   },
   {
@@ -133,7 +133,7 @@
     "license": [
       "MIT"
     ],
-    "version": "0.21.0",
+    "version": "0.22.0",
     "url": "https://www.npmjs.com/package/meshoptimizer"
   },
   {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cesium",
-  "version": "1.122.0",
+  "version": "1.123.0",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "homepage": "http://cesium.com/cesiumjs/",
   "license": "Apache-2.0",
@@ -51,8 +51,8 @@
     "./Specs/**/*"
   ],
   "dependencies": {
-    "@cesium/engine": "^11.1.0",
-    "@cesium/widgets": "^8.1.0"
+    "@cesium/engine": "^12.0.0",
+    "@cesium/widgets": "^9.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.41.1",

diff --git a/packages/engine/Source/Core/Ion.js b/packages/engine/Source/Core/Ion.js
@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1ZjJlYTllMy1kYWRiLTQwYjctOGZhOS02NGJkOTJhYTA1ODUiLCJpZCI6MjU5LCJpYXQiOjE3Mjc3OTI2NzB9.XbfI79d1v3T5OpMl4CznrcBuctSfW1lycPWlt8bq_1A";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiZjBmMDE4Ny05M2JlLTRlMzgtYjIxYi05YmJjM2QwMzJkYWMiLCJpZCI6MjU5LCJpYXQiOjE3MzA0NjY3MDl9.t-7gCGPUe-oGCyCoeXPtYmlMVdgqUQD9mn-Da23yUoI";
 /**
  * Default settings for accessing the Cesium ion API.
  *

diff --git a/packages/engine/Source/Scene/ArcGisMapService.js b/packages/engine/Source/Scene/ArcGisMapService.js
@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "AAPTxy8BH1VEsoebNVZXo8HurEOF051kAEKlhkOhBEc9BmRQoHkV6yy7n-w7RwBvqWZInYtbyiKcHHbPb4eH54WQnfJ6TQhd3sKcL6dutvEZajLojeHefo1qcBMplg4hb9OtcvtchKPzwRyH1-W_12nt2rhP3xbk8peiMvgIWZ__JYvZ8Wqw-8UWulEjXnpLRjclKf3NYHCTQgaw6Y6labxudMrnBgOODrJ1WdRxek-flc8.AT1_UW44TSnh";
+  "AAPTxy8BH1VEsoebNVZXo8HurEOF051kAEKlhkOhBEc9BmQpcUfxe1Yndhf82d5oKkQJ4_7VPaBQGYSISOMaRew7Sy-eTX1JQ4XwaC8v5aCvV72O6LCPs5Ss1pXXH-0uEw6bSRhTeQYHOmikutC2OMyZt6lu0VfT7FA-jVMO_UsunWNTf2cycP2O4IeDN_UV9G-VNmUu2jRvCHioi8o72ua4238s2219cYLEmcoGRJGVJTA.AT1_PjLvyih0";
 /**
  * Default options for accessing the ArcGIS image tile service.
  *

diff --git a/packages/engine/package.json b/packages/engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cesium/engine",
-  "version": "11.1.0",
+  "version": "12.0.0",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "keywords": [
     "3D",

diff --git a/packages/widgets/Source/Viewer/Viewer.js b/packages/widgets/Source/Viewer/Viewer.js
@@ -1926,6 +1926,14 @@ Viewer.prototype._onDataSourceAdded = function (
   dataSourceCollection,
   dataSource,
 ) {
+  if (
+    this._cesiumWidget._automaticallyTrackDataSourceClocks &&
+    dataSource === this.clockTrackedDataSource
+  ) {
+    // When data sources are added to the CesiumWidget they may be automatically
+    // tracked in that class but we also need to update the timeline in this class
+    linkTimelineToDataSourceClock(this._timeline, dataSource);
+  }
   const id = dataSource.entities.id;
   const removalFunc = this._eventHelper.add(
     dataSource.changedEvent,

diff --git a/packages/widgets/package.json b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cesium/widgets",
-  "version": "8.1.0",
+  "version": "9.0.0",
   "description": "A widgets library for use with CesiumJS. CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "keywords": [
     "3D",
@@ -28,7 +28,7 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@cesium/engine": "^11.1.0",
+    "@cesium/engine": "^12.0.0",
     "nosleep.js": "^0.12.0"
   },
   "type": "module",