@cesium/engine 20.0.2-ion.0 → 21.0.1-ion.0

package/Build/Workers/decodeGoogleEarthEnterprisePacket.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,18 +25,18 @@
 
 import {
   createTaskProcessorWorker_default
-} from "./chunk-YUHWFX5H.js";
+} from "./chunk-H3G7OYZY.js";
 import {
   RuntimeError_default
-} from "./chunk-FYYP46TF.js";
+} from "./chunk-NWJRIJQG.js";
 import {
   Check_default
-} from "./chunk-66MGJQFZ.js";
+} from "./chunk-PQW63B2T.js";
 import {
   __commonJS,
   __toESM,
   defined_default
-} from "./chunk-USK6ZAY2.js";
+} from "./chunk-L73TRTIG.js";
 
 // node_modules/pako/lib/zlib/adler32.js
 var require_adler32 = __commonJS({

package/Build/Workers/decodeI3S.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,32 +25,32 @@
 
 import {
   require_draco_decoder_nodejs
-} from "./chunk-XWRUYDF6.js";
+} from "./chunk-SDFGZML6.js";
 import {
   Color_default
-} from "./chunk-YSDOO7AG.js";
+} from "./chunk-ZOVMWDPW.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-YUHWFX5H.js";
+} from "./chunk-H3G7OYZY.js";
 import {
   WebMercatorProjection_default
-} from "./chunk-BHAATGZA.js";
+} from "./chunk-75UG66GR.js";
 import {
   Cartesian3_default,
   Cartographic_default,
   Ellipsoid_default,
   Matrix3_default
-} from "./chunk-LS63ERFB.js";
+} from "./chunk-EZJXK2UP.js";
 import {
   Math_default
-} from "./chunk-NKKNQMEH.js";
+} from "./chunk-2PX2ULSM.js";
 import {
   Check_default
-} from "./chunk-66MGJQFZ.js";
+} from "./chunk-PQW63B2T.js";
 import {
   __toESM,
   defined_default
-} from "./chunk-USK6ZAY2.js";
+} from "./chunk-L73TRTIG.js";
 
 // packages/engine/Source/Workers/decodeI3S.js
 var import_draco_decoder_nodejs = __toESM(require_draco_decoder_nodejs(), 1);

package/Build/Workers/gaussianSplatSorter.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -26,13 +26,13 @@
 import {
   initSync,
   radix_sort_gaussians_indexes
-} from "./chunk-X6GXYB3M.js";
+} from "./chunk-MIFUV36K.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-YUHWFX5H.js";
+} from "./chunk-H3G7OYZY.js";
 import {
   defined_default
-} from "./chunk-USK6ZAY2.js";
+} from "./chunk-L73TRTIG.js";
 
 // packages/engine/Source/Workers/gaussianSplatSorter.js
 async function initWorker(parameters, transferableObjects) {

package/Build/Workers/gaussianSplatTextureGenerator.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -26,13 +26,13 @@
 import {
   generate_splat_texture,
   initSync
-} from "./chunk-X6GXYB3M.js";
+} from "./chunk-MIFUV36K.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-YUHWFX5H.js";
+} from "./chunk-H3G7OYZY.js";
 import {
   defined_default
-} from "./chunk-USK6ZAY2.js";
+} from "./chunk-L73TRTIG.js";
 
 // packages/engine/Source/Workers/gaussianSplatTextureGenerator.js
 async function initWorker(parameters, transferableObjects) {

package/Build/Workers/transcodeKTX2.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,22 +25,22 @@
 
 import {
   createTaskProcessorWorker_default
-} from "./chunk-YUHWFX5H.js";
+} from "./chunk-H3G7OYZY.js";
 import {
   WebGLConstants_default
-} from "./chunk-6LULWCX3.js";
+} from "./chunk-HDBIC7IL.js";
 import {
   RuntimeError_default
-} from "./chunk-FYYP46TF.js";
+} from "./chunk-NWJRIJQG.js";
 import {
   Check_default
-} from "./chunk-66MGJQFZ.js";
+} from "./chunk-PQW63B2T.js";
 import {
   __commonJS,
   __require,
   __toESM,
   defined_default
-} from "./chunk-USK6ZAY2.js";
+} from "./chunk-L73TRTIG.js";
 
 // packages/engine/Source/ThirdParty/Workers/basis_transcoder.js
 var require_basis_transcoder = __commonJS({

package/Build/Workers/transferTypedArrayTest.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *

package/Build/Workers/upsampleQuantizedTerrainMesh.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.133.2-ion
+ * Version 1.134.1-ion.0
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -26,48 +26,48 @@
 import {
   EllipsoidalOccluder_default,
   TerrainEncoding_default
-} from "./chunk-WORBFT5H.js";
+} from "./chunk-JESBYOH5.js";
 import {
   createTaskProcessorWorker_default
-} from "./chunk-YUHWFX5H.js";
+} from "./chunk-H3G7OYZY.js";
 import {
   OrientedBoundingBox_default
-} from "./chunk-OIMV4OE5.js";
+} from "./chunk-3K4DRV7Y.js";
 import {
   AttributeCompression_default
-} from "./chunk-V6ZGOX4I.js";
-import "./chunk-P2V7PVDH.js";
-import "./chunk-FAQ2XNFV.js";
-import "./chunk-WZKTQZUW.js";
-import "./chunk-YNPZU55A.js";
+} from "./chunk-UTTKH2UG.js";
+import "./chunk-KGL66RWW.js";
+import "./chunk-G74UMFQ4.js";
+import "./chunk-EEDSGIH7.js";
+import "./chunk-YFZMB6FZ.js";
 import {
   IndexDatatype_default
-} from "./chunk-IS5FETN7.js";
+} from "./chunk-3XTJC4CV.js";
 import {
   BoundingSphere_default
-} from "./chunk-QZGZIAK2.js";
+} from "./chunk-SGEAS4NZ.js";
 import {
   Rectangle_default
-} from "./chunk-H5IQLAJP.js";
-import "./chunk-YXTWHLJA.js";
+} from "./chunk-OLH67Z2S.js";
+import "./chunk-ADADBRLI.js";
 import {
   Cartesian2_default,
   Cartesian3_default,
   Cartographic_default,
   Ellipsoid_default
-} from "./chunk-LS63ERFB.js";
+} from "./chunk-EZJXK2UP.js";
 import {
   Math_default
-} from "./chunk-NKKNQMEH.js";
-import "./chunk-6LULWCX3.js";
-import "./chunk-FYYP46TF.js";
+} from "./chunk-2PX2ULSM.js";
+import "./chunk-HDBIC7IL.js";
+import "./chunk-NWJRIJQG.js";
 import {
   Check_default,
   DeveloperError_default
-} from "./chunk-66MGJQFZ.js";
+} from "./chunk-PQW63B2T.js";
 import {
   defined_default
-} from "./chunk-USK6ZAY2.js";
+} from "./chunk-L73TRTIG.js";
 
 // packages/engine/Source/Core/Intersections2D.js
 var Intersections2D = {};

package/Source/Core/Event.js

@@ -22,10 +22,23 @@ import defined from "./defined.js";
  * evt.removeEventListener(MyObject.prototype.myListener);
  */
 function Event() {
-  this._listeners = [];
-  this._scopes = [];
-  this._toRemove = [];
-  this._insideRaiseEvent = false;
+  /**
+   * @type {Map<Listener,Set<object>>}
+   * @private
+   */
+  this._listeners = new Map();
+  /**
+   * @type {Map<Listener,Set<object>>}
+   * @private
+   */
+  this._toRemove = new Map();
+  /**
+   * @type {Map<Listener,Set<object>>}
+   * @private
+   */
+  this._toAdd = new Map();
+  this._invokingListeners = false;
+  this._listenerCount = 0; // Tracks number of listener + scope pairs
 }
 
 Object.defineProperties(Event.prototype, {
@@ -37,7 +50,7 @@ Object.defineProperties(Event.prototype, {
    */
   numberOfListeners: {
     get: function () {
-      return this._listeners.length - this._toRemove.length;
+      return this._listenerCount;
     },
   },
 });
@@ -59,16 +72,34 @@ Event.prototype.addEventListener = function (listener, scope) {
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.func("listener", listener);
   //>>includeEnd('debug');
+  const event = this;
 
-  this._listeners.push(listener);
-  this._scopes.push(scope);
+  const listenerMap = event._invokingListeners
+    ? event._toAdd
+    : event._listeners;
+  const added = addEventListener(this, listenerMap, listener, scope);
+  if (added) {
+    event._listenerCount++;
+  }
 
-  const event = this;
   return function () {
     event.removeEventListener(listener, scope);
   };
 };
 
+function addEventListener(event, listenerMap, listener, scope) {
+  if (!listenerMap.has(listener)) {
+    listenerMap.set(listener, new Set());
+  }
+  const scopes = listenerMap.get(listener);
+  if (!scopes.has(scope)) {
+    scopes.add(scope);
+    return true;
+  }
+
+  return false;
+}
+
 /**
  * Unregisters a previously registered callback.
  *
@@ -84,37 +115,46 @@ Event.prototype.removeEventListener = function (listener, scope) {
   Check.typeOf.func("listener", listener);
   //>>includeEnd('debug');
 
-  const listeners = this._listeners;
-  const scopes = this._scopes;
+  const removedFromListeners = removeEventListener(
+    this,
+    this._listeners,
+    listener,
+    scope,
+  );
+  const removedFromToAdd = removeEventListener(
+    this,
+    this._toAdd,
+    listener,
+    scope,
+  );
+
+  const removed = removedFromListeners || removedFromToAdd;
+  if (removed) {
+    this._listenerCount--;
+  }
 
-  let index = -1;
-  for (let i = 0; i < listeners.length; i++) {
-    if (listeners[i] === listener && scopes[i] === scope) {
-      index = i;
-      break;
-    }
+  return removed;
+};
+
+function removeEventListener(event, listenerMap, listener, scope) {
+  const scopes = listenerMap.get(listener);
+  if (!scopes || !scopes.has(scope)) {
+    return false;
   }
 
-  if (index !== -1) {
-    if (this._insideRaiseEvent) {
-      //In order to allow removing an event subscription from within
-      //a callback, we don't actually remove the items here.  Instead
-      //remember the index they are at and undefined their value.
-      this._toRemove.push(index);
-      listeners[index] = undefined;
-      scopes[index] = undefined;
-    } else {
-      listeners.splice(index, 1);
-      scopes.splice(index, 1);
+  if (event._invokingListeners) {
+    if (!addEventListener(event, event._toRemove, listener, scope)) {
+      // Already marked for removal
+      return false;
+    }
+  } else {
+    scopes.delete(scope);
+    if (scopes.size === 0) {
+      listenerMap.delete(listener);
     }
-    return true;
   }
 
-  return false;
-};
-
-function compareNumber(a, b) {
-  return b - a;
+  return true;
 }
 
 /**
@@ -126,34 +166,35 @@ function compareNumber(a, b) {
  * @see Event#removeEventListener
  */
 Event.prototype.raiseEvent = function () {
-  this._insideRaiseEvent = true;
+  this._invokingListeners = true;
 
-  let i;
-  const listeners = this._listeners;
-  const scopes = this._scopes;
-  let length = listeners.length;
+  for (const [listener, scopes] of this._listeners.entries()) {
+    if (!defined(listener)) {
+      continue;
+    }
 
-  for (i = 0; i < length; i++) {
-    const listener = listeners[i];
-    if (defined(listener)) {
-      listeners[i].apply(scopes[i], arguments);
+    for (const scope of scopes) {
+      listener.apply(scope, arguments);
     }
   }
 
-  //Actually remove items removed in removeEventListener.
-  const toRemove = this._toRemove;
-  length = toRemove.length;
-  if (length > 0) {
-    toRemove.sort(compareNumber);
-    for (i = 0; i < length; i++) {
-      const index = toRemove[i];
-      listeners.splice(index, 1);
-      scopes.splice(index, 1);
+  this._invokingListeners = false;
+
+  // Actually add items marked for addition
+  for (const [listener, scopes] of this._toAdd.entries()) {
+    for (const scope of scopes) {
+      addEventListener(this, this._listeners, listener, scope);
     }
-    toRemove.length = 0;
   }
+  this._toAdd.clear();
 
-  this._insideRaiseEvent = false;
+  // Actually remove items marked for removal
+  for (const [listener, scopes] of this._toRemove.entries()) {
+    for (const scope of scopes) {
+      removeEventListener(this, this._listeners, listener, scope);
+    }
+  }
+  this._toRemove.clear();
 };
 
 /**

package/Source/Core/GoogleMaps.js

@@ -25,10 +25,10 @@ GoogleMaps.defaultApiKey = undefined;
  * Gets or sets the default Google Map Tiles API endpoint.
  *
  * @type {string|Resource}
- * @default https://tile.googleapis.com/v1/
+ * @default https://tile.googleapis.com/
  */
 GoogleMaps.mapTilesApiEndpoint = new Resource({
-  url: "https://tile.googleapis.com/v1/",
+  url: "https://tile.googleapis.com/",
 });
 
 GoogleMaps.getDefaultCredit = function () {

package/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2NTEwZTU2Yi0wOGEyLTQyZjgtOTJjNi04Mzc2NGRlNzA4NTkiLCJpZCI6MjU5LCJpYXQiOjE3NTY4NDExOTJ9._Y3MIsYgGKTVTpkEpKPNT0cQSa_hUocY0DdH7h0U-xM";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJjNjI5ZTViNy0wY2FhLTQ0ZDUtYTIzMi0wMWEyMzZkYWYwYWYiLCJpZCI6MjU5LCJpYXQiOjE3NTkzNDcyNDZ9.xyOPig1igKFQvOTaXfTE0KQ7dU7jyn_c3OQPaQ1hEiI";
 /**
  * Default settings for accessing the Cesium ion API.
  *

package/Source/Core/IonResource.js

@@ -39,6 +39,12 @@ function IonResource(endpoint, endpointResource) {
       retryAttempts: 1,
       retryCallback: retryCallback,
     };
+  } else if (["GOOGLE_2D_MAPS", "AZURE_MAPS"].includes(externalType)) {
+    options = {
+      url: endpoint.options.url,
+      retryAttempts: 1,
+      retryCallback: retryCallback,
+    };
   } else if (
     externalType === "3DTILES" ||
     externalType === "STK_TERRAIN_SERVER"
@@ -84,7 +90,7 @@ if (defined(Object.create)) {
  * @param {object} [options] An object with the following properties:
  * @param {string} [options.accessToken=Ion.defaultAccessToken] The access token to use.
  * @param {string|Resource} [options.server=Ion.defaultServer] The resource to the Cesium ion API server.
- * @returns {Promise<IonResource>} A Promise to am instance representing the Cesium ion Asset.
+ * @returns {Promise<IonResource>} A Promise to an instance representing the Cesium ion Asset.
  *
  * @example
  * // Load a Cesium3DTileset with asset ID of 124624234
@@ -207,7 +213,7 @@ IonResource.prototype._makeRequest = function (options) {
 
 /**
  * @private
- */
+ **/
 IonResource._createEndpointResource = function (assetId, options) {
   //>>includeStart('debug', pragmas.debug);
   Check.defined("assetId", assetId);
@@ -226,6 +232,13 @@ IonResource._createEndpointResource = function (assetId, options) {
     resourceOptions.queryParameters = { access_token: accessToken };
   }
 
+  if (defined(options.queryParameters)) {
+    resourceOptions.queryParameters = {
+      ...resourceOptions.queryParameters,
+      ...options.queryParameters,
+    };
+  }
+
   addClientHeaders(resourceOptions);
 
   return server.getDerivedResource(resourceOptions);
@@ -267,9 +280,21 @@ function retryCallback(that, error) {
     ionRoot._pendingPromise = endpointResource
       .fetchJson()
       .then(function (newEndpoint) {
-        //Set the token for root resource so new derived resources automatically pick it up
+        // Set the token for root resource so new derived resources automatically pick it up
         ionRoot._ionEndpoint = newEndpoint;
-        return newEndpoint;
+        // Reset the session token for Google 2D imagery
+        if (newEndpoint.externalType === "GOOGLE_2D_MAPS") {
+          ionRoot.setQueryParameters({
+            session: newEndpoint.options.session,
+            key: newEndpoint.options.key,
+          });
+        }
+        if (newEndpoint.externalType === "AZURE_MAPS") {
+          ionRoot.setQueryParameters({
+            "subscription-key": newEndpoint.options["subscription-key"],
+          });
+        }
+        return ionRoot._ionEndpoint;
       })
       .finally(function (newEndpoint) {
         // Pass or fail, we're done with this promise, the next failure should use a new one.
@@ -284,4 +309,5 @@ function retryCallback(that, error) {
     return true;
   });
 }
+
 export default IonResource;

package/Source/Core/Resource.js

@@ -231,6 +231,8 @@ Resource.supportsImageBitmapOptions = function () {
   })
     .then(function (blob) {
       const imageBitmapOptions = {
+        // 'from-image' is deprecated, new option is 'none'. However, we still need to support older browsers,
+        // and there's no good way to detect support for these options. For now, continue to use 'from-image'. See: https://github.com/CesiumGS/cesium/issues/12846
         imageOrientation: "flipY", // default is "from-image"
         premultiplyAlpha: "none", // default is "default"
         colorSpaceConversion: "none", // default is "default"
@@ -2036,7 +2038,9 @@ Resource.createImageBitmapFromBlob = function (blob, options) {
   );
 
   return createImageBitmap(blob, {
-    imageOrientation: options.flipY ? "flipY" : "from-image",
+    // 'from-image' is deprecated, new option is 'none'. However, we still need to support older browsers,
+    // and there's no good way to detect support for these options. For now, continue to use 'from-image'. See: https://github.com/CesiumGS/cesium/issues/12846
+    imageOrientation: options.flipY ? "flipY" : "none",
     premultiplyAlpha: options.premultiplyAlpha ? "premultiply" : "none",
     colorSpaceConversion: options.skipColorSpaceConversion ? "none" : "default",
   });