@cesium/engine 5.0.0 → 6.1.0

package/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhYjVkZWE2Yi05ZjlmLTQyOTAtYjFkOC0xMmFmZTYyMjhmZGIiLCJpZCI6MjU5LCJpYXQiOjE2OTYyNjgyMzN9.iKIgzd7PueqxXsUNSIhk5C6n8uiugH-Dxy9uhOdJ5Zg";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMzVjZDg3Yi0wMjVkLTQ0MzctOTZjOC1jZjMwNjkzZmI5MWUiLCJpZCI6MjU5LCJpYXQiOjE2OTg4NTM0MDl9.L_g01CjNKNVijEJ_8kOxiO02OADnuSjRFLkZWvhupcc";
 /**
  * Default settings for accessing the Cesium ion API.
  *

package/Source/Core/PolygonGeometry.js

@@ -636,7 +636,7 @@ function createGeometryFromPositionsExtruded(
   }
 
   let outerRing = hierarchy.outerRing;
-  let tangentPlane = EllipsoidTangentPlane.fromPoints(outerRing, ellipsoid);
+  const tangentPlane = EllipsoidTangentPlane.fromPoints(outerRing, ellipsoid);
   let positions2D = tangentPlane.projectPointsOntoPlane(
     outerRing,
     createGeometryFromPositionsExtrudedPositions
@@ -664,8 +664,6 @@ function createGeometryFromPositionsExtruded(
   const holes = hierarchy.holes;
   for (i = 0; i < holes.length; i++) {
     let hole = holes[i];
-
-    tangentPlane = EllipsoidTangentPlane.fromPoints(hole, ellipsoid);
     positions2D = tangentPlane.projectPointsOntoPlane(
       hole,
       createGeometryFromPositionsExtrudedPositions
@@ -1331,7 +1329,7 @@ function getTangentPlane(rectangle, positions, ellipsoid) {
 }
 
 const scratchCartographicCyllindrical = new Cartographic();
-function createProjectTo2d(rectangle, ellipsoid) {
+function createProjectTo2d(rectangle, outerPositions, ellipsoid) {
   return (positions, results) => {
     // If the polygon positions span a large enough extent, use a specialized projection
     if (rectangle.height >= CesiumMath.PI || rectangle.width >= CesiumMath.PI) {
@@ -1360,7 +1358,10 @@ function createProjectTo2d(rectangle, ellipsoid) {
     }
 
     // Use a local tangent plane for smaller extents
-    const tangentPlane = EllipsoidTangentPlane.fromPoints(positions, ellipsoid);
+    const tangentPlane = EllipsoidTangentPlane.fromPoints(
+      outerPositions,
+      ellipsoid
+    );
     return tangentPlane.projectPointsOntoPlane(positions, results);
   };
 }
@@ -1466,7 +1467,7 @@ PolygonGeometry.createGeometry = function (polygonGeometry) {
   const results = PolygonGeometryLibrary.polygonsFromHierarchy(
     polygonHierarchy,
     hasTextureCoordinates,
-    createProjectTo2d(rectangle, ellipsoid),
+    createProjectTo2d(rectangle, outerPositions, ellipsoid),
     !perPositionHeight,
     ellipsoid,
     createSplitPolygons(rectangle, ellipsoid, arcType, perPositionHeight)

package/Source/DataSources/EntityCluster.js

@@ -648,7 +648,7 @@ function createGetEntity(
 
     const unusedIndices = this[unusedIndicesProperty];
     if (unusedIndices.length > 0) {
-      index = unusedIndices.pop();
+      index = unusedIndices.shift();
       entityItem = collection.get(index);
     } else {
       entityItem = collection.add();

package/Source/Renderer/UniformState.js

@@ -1513,7 +1513,6 @@ function cleanNormal(uniformState) {
 
     const m = uniformState._normal;
     Matrix4.getMatrix3(uniformState.inverseModelView, m);
-    Matrix3.getRotation(m, m);
     Matrix3.transpose(m, m);
   }
 }
@@ -1524,7 +1523,6 @@ function cleanNormal3D(uniformState) {
 
     const m = uniformState._normal3D;
     Matrix4.getMatrix3(uniformState.inverseModelView3D, m);
-    Matrix3.getRotation(m, m);
     Matrix3.transpose(m, m);
   }
 }
@@ -1532,28 +1530,20 @@ function cleanNormal3D(uniformState) {
 function cleanInverseNormal(uniformState) {
   if (uniformState._inverseNormalDirty) {
     uniformState._inverseNormalDirty = false;
-    Matrix4.getMatrix3(
-      uniformState.inverseModelView,
-      uniformState._inverseNormal
-    );
-    Matrix3.getRotation(
-      uniformState._inverseNormal,
-      uniformState._inverseNormal
-    );
+
+    const m = uniformState._inverseNormal;
+    Matrix4.getMatrix3(uniformState.modelView, m);
+    Matrix3.transpose(m, m);
   }
 }
 
 function cleanInverseNormal3D(uniformState) {
   if (uniformState._inverseNormal3DDirty) {
     uniformState._inverseNormal3DDirty = false;
-    Matrix4.getMatrix3(
-      uniformState.inverseModelView3D,
-      uniformState._inverseNormal3D
-    );
-    Matrix3.getRotation(
-      uniformState._inverseNormal3D,
-      uniformState._inverseNormal3D
-    );
+
+    const m = uniformState._inverseNormal3D;
+    Matrix4.getMatrix3(uniformState.modelView3D, m);
+    Matrix3.transpose(m, m);
   }
 }
 

package/Source/Scene/ArcGisMapService.js

@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "AAPK4db83df15a06415e9b7d45d826eec992u0REAmuLmykhOFOk_4e61HgsO_e3C_qGUgiWNGElpjpiMfO9_Qg5ZRyy8POvB5EF";
+  "AAPK72121c3f05244af285ad75999db084bfDGkWA0QECX6QWOdaQmarXC21i1ogkvj8XCctaZExrW8Hw1AT58yG7twH3VFzZl13";
 /**
  * Default options for accessing the ArcGIS image tile service.
  *

package/Source/Scene/BingMapsImageryProvider.js

@@ -24,6 +24,7 @@ import ImageryProvider from "./ImageryProvider.js";
  * @property {string} [tileProtocol] The protocol to use when loading tiles, e.g. 'http' or 'https'.
  *        By default, tiles are loaded using the same protocol as the page.
  * @property {BingMapsStyle} [mapStyle=BingMapsStyle.AERIAL] The type of Bing Maps imagery to load.
+ * @property {string} [mapLayer] Additional display layer options as defined on {@link https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata#template-parameters}
  * @property {string} [culture=''] The culture to use when requesting Bing Maps imagery. Not
  *        all cultures are supported. See {@link http://msdn.microsoft.com/en-us/library/hh441729.aspx}
  *        for information on the supported cultures.
@@ -209,6 +210,7 @@ function BingMapsImageryProvider(options) {
   this._defaultMagnificationFilter = undefined;
 
   this._mapStyle = defaultValue(options.mapStyle, BingMapsStyle.AERIAL);
+  this._mapLayer = options.mapLayer;
   this._culture = defaultValue(options.culture, "");
   this._key = options.key;
 
@@ -287,6 +289,18 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
     },
   },
 
+  /**
+   * Gets the additional map layer options as defined in {@link https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata#template-parameters}/
+   * @memberof BingMapsImageryProvider.prototype
+   * @type {string}
+   * @readonly
+   */
+  mapLayer: {
+    get: function () {
+      return this._mapLayer;
+    },
+  },
+
   /**
    * The culture to use when requesting Bing Maps imagery. Not
    * all cultures are supported. See {@link http://msdn.microsoft.com/en-us/library/hh441729.aspx}
@@ -426,7 +440,7 @@ Object.defineProperties(BingMapsImageryProvider.prototype, {
    */
   hasAlphaChannel: {
     get: function () {
-      return false;
+      return defined(this.mapLayer);
     },
   },
 });
@@ -475,13 +489,20 @@ BingMapsImageryProvider.fromUrl = async function (url, options) {
   const mapStyle = defaultValue(options.mapStyle, BingMapsStyle.AERIAL);
   const resource = Resource.createIfNeeded(url);
   resource.appendForwardSlash();
+
+  const queryParameters = {
+    incl: "ImageryProviders",
+    key: options.key,
+    uriScheme: tileProtocol,
+  };
+
+  if (defined(options.mapLayer)) {
+    queryParameters.mapLayer = options.mapLayer;
+  }
+
   const metadataResource = resource.getDerivedResource({
     url: `REST/v1/Imagery/Metadata/${mapStyle}`,
-    queryParameters: {
-      incl: "ImageryProviders",
-      key: options.key,
-      uriScheme: tileProtocol,
-    },
+    queryParameters: queryParameters,
   });
 
   const provider = new BingMapsImageryProvider(options);

package/Source/Scene/LabelCollection.js

@@ -143,7 +143,7 @@ function rebindAllGlyphs(labelCollection, label) {
   glyphs.length = textLength;
 
   const showBackground =
-    label._showBackground && text.split("\n").join("").length > 0;
+    label.show && label._showBackground && text.split("\n").join("").length > 0;
   let backgroundBillboard = label._backgroundBillboard;
   const backgroundBillboardCollection =
     labelCollection._backgroundBillboardCollection;
@@ -181,6 +181,7 @@ function rebindAllGlyphs(labelCollection, label) {
       label._distanceDisplayCondition;
     backgroundBillboard.disableDepthTestDistance =
       label._disableDepthTestDistance;
+    backgroundBillboard.clusterShow = label.clusterShow;
   }
 
   const glyphTextureCache = labelCollection._glyphTextureCache;

package/Source/Scene/createGooglePhotorealistic3DTileset.js

@@ -1,6 +1,7 @@
 import Cesium3DTileset from "./Cesium3DTileset.js";
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
+import IonResource from "../Core/IonResource.js";
 import GoogleMaps from "../Core/GoogleMaps.js";
 import Resource from "../Core/Resource.js";
 
@@ -16,6 +17,17 @@ import Resource from "../Core/Resource.js";
  * @see GoogleMaps
  *
  * @example
+ * const viewer = new Cesium.Viewer("cesiumContainer");
+ *
+ * try {
+ *   const tileset = await Cesium.createGooglePhotorealistic3DTileset();
+ *   viewer.scene.primitives.add(tileset));
+ * } catch (error) {
+ *   console.log(`Error creating tileset: ${error}`);
+ * }
+ *
+ * @example
+ * // Use your own Google Maps API key
  * Cesium.GoogleMaps.defaultApiKey = "your-api-key";
  *
  * const viewer = new Cesium.Viewer("cesiumContainer");
@@ -28,22 +40,24 @@ import Resource from "../Core/Resource.js";
  * }
  */
 async function createGooglePhotorealistic3DTileset(key, options) {
-  key = defaultValue(key, GoogleMaps.defaultApiKey);
-
-  let credits;
-  const credit = GoogleMaps.getDefaultApiKeyCredit(key);
-  if (defined(credit)) {
-    credits = [credit];
-  }
-
   options = defaultValue(options, {});
-  options.showCreditsOnScreen = true;
   options.cacheBytes = defaultValue(options.cacheBytes, 1536 * 1024 * 1024);
   options.maximumCacheOverflowBytes = defaultValue(
     options.maximumCacheOverflowBytes,
     1024 * 1024 * 1024
   );
 
+  key = defaultValue(key, GoogleMaps.defaultApiKey);
+  if (!defined(key)) {
+    return requestCachedIonTileset(options);
+  }
+
+  let credits;
+  const credit = GoogleMaps.getDefaultCredit();
+  if (defined(credit)) {
+    credits = [credit];
+  }
+
   const resource = new Resource({
     url: `${GoogleMaps.mapTilesApiEndpoint}3dtiles/root.json`,
     queryParameters: {
@@ -55,4 +69,19 @@ async function createGooglePhotorealistic3DTileset(key, options) {
   return Cesium3DTileset.fromUrl(resource, options);
 }
 
+const metadataCache = {};
+async function requestCachedIonTileset(options) {
+  const ionAssetId = 2275207;
+  const cacheKey = ionAssetId;
+
+  let promise = metadataCache[cacheKey];
+  if (!defined(promise)) {
+    promise = IonResource.fromAssetId(ionAssetId);
+    metadataCache[cacheKey] = promise;
+  }
+
+  const resource = await promise;
+  return Cesium3DTileset.fromUrl(resource, options);
+}
+
 export default createGooglePhotorealistic3DTileset;

package/index.d.ts

@@ -7568,15 +7568,14 @@ export class GoogleEarthEnterpriseTerrainProvider {
 /**
  * Default settings for accessing the Google Maps API.
  * <br/>
- * An API key is only required if you are using any Google Maps APIs, such as {@link createGooglePhotorealistic3DTileset}.
- * A default key is provided for evaluation purposes only.
+ * An API key is only required if you are directly using any Google Maps APIs, such as through {@link createGooglePhotorealistic3DTileset}.
  * Follow instructions for managing API keys for the Google Maps Platform at {@link https://developers.google.com/maps/documentation/embed/get-api-key}
  */
 export namespace GoogleMaps {
     /**
      * Gets or sets the default Google Maps API key.
      */
-    var defaultApiKey: string;
+    var defaultApiKey: undefined | string;
     /**
      * Gets or sets the default Google Map Tiles API endpoint.
      */
@@ -26115,6 +26114,7 @@ export namespace BingMapsImageryProvider {
      * @property [tileProtocol] - The protocol to use when loading tiles, e.g. 'http' or 'https'.
      *        By default, tiles are loaded using the same protocol as the page.
      * @property [mapStyle = BingMapsStyle.AERIAL] - The type of Bing Maps imagery to load.
+     * @property [mapLayer] - Additional display layer options as defined on {@link https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata#template-parameters}
      * @property [culture = ''] - The culture to use when requesting Bing Maps imagery. Not
      *        all cultures are supported. See {@link http://msdn.microsoft.com/en-us/library/hh441729.aspx}
      *        for information on the supported cultures.
@@ -26128,6 +26128,7 @@ export namespace BingMapsImageryProvider {
         key?: string;
         tileProtocol?: string;
         mapStyle?: BingMapsStyle;
+        mapLayer?: string;
         culture?: string;
         ellipsoid?: Ellipsoid;
         tileDiscardPolicy?: TileDiscardPolicy;
@@ -26166,6 +26167,10 @@ export class BingMapsImageryProvider {
      * Gets the type of Bing Maps imagery to load.
      */
     readonly mapStyle: BingMapsStyle;
+    /**
+     * Gets the additional map layer options as defined in {@link https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata#template-parameters}/
+     */
+    readonly mapLayer: string;
     /**
      * The culture to use when requesting Bing Maps imagery. Not
      * all cultures are supported. See {@link http://msdn.microsoft.com/en-us/library/hh441729.aspx}
@@ -42241,6 +42246,16 @@ export function createElevationBandMaterial(options: {
 /**
  * Creates a {@link Cesium3DTileset} instance for the Google Photorealistic 3D Tiles tileset.
  * @example
+ * const viewer = new Cesium.Viewer("cesiumContainer");
+ *
+ * try {
+ *   const tileset = await Cesium.createGooglePhotorealistic3DTileset();
+ *   viewer.scene.primitives.add(tileset));
+ * } catch (error) {
+ *   console.log(`Error creating tileset: ${error}`);
+ * }
+ * @example
+ * // Use your own Google Maps API key
  * Cesium.GoogleMaps.defaultApiKey = "your-api-key";
  *
  * const viewer = new Cesium.Viewer("cesiumContainer");