@cesium/engine 2.1.0 → 2.2.0

package/Source/Core/CustomHeightmapTerrainProvider.js

@@ -2,6 +2,7 @@ import Check from "./Check.js";
 import Credit from "./Credit.js";
 import defaultValue from "./defaultValue.js";
 import defined from "./defined.js";
+import deprecationWarning from "./deprecationWarning.js";
 import Ellipsoid from "./Ellipsoid.js";
 import Event from "./Event.js";
 import GeographicTilingScheme from "./GeographicTilingScheme.js";
@@ -89,6 +90,7 @@ function CustomHeightmapTerrainProvider(options) {
   }
   this._credit = credit;
 
+  this._ready = true;
   this._readyPromise = Promise.resolve(true);
 }
 
@@ -137,9 +139,14 @@ Object.defineProperties(CustomHeightmapTerrainProvider.prototype, {
    * @memberof CustomHeightmapTerrainProvider.prototype
    * @type {boolean}
    * @readonly
+   * @deprecated
    */
   ready: {
     get: function () {
+      deprecationWarning(
+        "CustomHeightmapTerrainProvider.ready",
+        "CustomHeightmapTerrainProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
+      );
       return true;
     },
   },
@@ -149,9 +156,14 @@ Object.defineProperties(CustomHeightmapTerrainProvider.prototype, {
    * @memberof CustomHeightmapTerrainProvider.prototype
    * @type {Promise<boolean>}
    * @readonly
+   * @deprecated
    */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "CustomHeightmapTerrainProvider.readyPromise",
+        "CustomHeightmapTerrainProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
+      );
       return this._readyPromise;
     },
   },

package/Source/Core/EllipsoidTerrainProvider.js

@@ -1,5 +1,6 @@
 import defaultValue from "./defaultValue.js";
 import defined from "./defined.js";
+import deprecationWarning from "./deprecationWarning.js";
 import Ellipsoid from "./Ellipsoid.js";
 import Event from "./Event.js";
 import GeographicTilingScheme from "./GeographicTilingScheme.js";
@@ -42,6 +43,7 @@ function EllipsoidTerrainProvider(options) {
   );
 
   this._errorEvent = new Event();
+  this._ready = true;
   this._readyPromise = Promise.resolve(true);
 }
 
@@ -62,7 +64,7 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
 
   /**
    * Gets the credit to display when this terrain provider is active.  Typically this is used to credit
-   * the source of the terrain.  This function should not be called before {@link EllipsoidTerrainProvider#ready} returns true.
+   * the source of the terrain.
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {Credit}
    * @readonly
@@ -74,8 +76,7 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
   },
 
   /**
-   * Gets the tiling scheme used by this provider.  This function should
-   * not be called before {@link EllipsoidTerrainProvider#ready} returns true.
+   * Gets the tiling scheme used by this provider.
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {GeographicTilingScheme}
    * @readonly
@@ -91,9 +92,14 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {boolean}
    * @readonly
+   * @deprecated
    */
   ready: {
     get: function () {
+      deprecationWarning(
+        "EllipsoidTerrainProvider.ready",
+        "EllipsoidTerrainProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
+      );
       return true;
     },
   },
@@ -103,9 +109,14 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {Promise<boolean>}
    * @readonly
+   * @deprecated
    */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "EllipsoidTerrainProvider.readyPromise",
+        "EllipsoidTerrainProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
+      );
       return this._readyPromise;
     },
   },
@@ -113,8 +124,7 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
   /**
    * Gets a value indicating whether or not the provider includes a water mask.  The water mask
    * indicates which areas of the globe are water rather than land, so they can be rendered
-   * as a reflective surface with animated waves.  This function should not be
-   * called before {@link EllipsoidTerrainProvider#ready} returns true.
+   * as a reflective surface with animated waves.
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {boolean}
    * @readonly
@@ -127,7 +137,6 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
 
   /**
    * Gets a value indicating whether or not the requested tiles include vertex normals.
-   * This function should not be called before {@link EllipsoidTerrainProvider#ready} returns true.
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {boolean}
    * @readonly
@@ -139,8 +148,7 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
   },
   /**
    * Gets an object that can be used to determine availability of terrain from this provider, such as
-   * at points and in rectangles.  This function should not be called before
-   * {@link TerrainProvider#ready} returns true.  This property may be undefined if availability
+   * at points and in rectangles. This property may be undefined if availability
    * information is not available.
    * @memberof EllipsoidTerrainProvider.prototype
    * @type {TileAvailability}
@@ -154,8 +162,7 @@ Object.defineProperties(EllipsoidTerrainProvider.prototype, {
 });
 
 /**
- * Requests the geometry for a given tile.  This function should not be called before
- * {@link TerrainProvider#ready} returns true.  The result includes terrain
+ * Requests the geometry for a given tile. The result includes terrain
  * data and indicates that all child tiles are available.
  *
  * @param {number} x The X coordinate of the tile for which to request geometry.

package/Source/Core/FrustumGeometry.js

@@ -295,8 +295,8 @@ FrustumGeometry._computeNearFarPlanes = function (
 
   let inverseView;
   let inverseViewProjection;
+  const projection = frustum.projectionMatrix;
   if (frustumType === PERSPECTIVE) {
-    const projection = frustum.projectionMatrix;
     const viewProjection = Matrix4.multiply(
       projection,
       view,

package/Source/Core/GoogleEarthEnterpriseMetadata.js

@@ -4,6 +4,7 @@ import Check from "./Check.js";
 import Credit from "./Credit.js";
 import defaultValue from "./defaultValue.js";
 import defined from "./defined.js";
+import deprecationWarning from "./deprecationWarning.js";
 import GoogleEarthEnterpriseTileInformation from "./GoogleEarthEnterpriseTileInformation.js";
 import isBitSet from "./isBitSet.js";
 import loadAndExecuteScript from "./loadAndExecuteScript.js";
@@ -30,37 +31,23 @@ const defaultKey = stringToBuffer(
 );
 
 /**
+ * <div class="notice">
+ * To construct GoogleEarthEnterpriseMetadata, call {@link GoogleEarthEnterpriseMetadata.fromUrl}. Do not call the constructor directly.
+ * </div>
+ *
  * Provides metadata using the Google Earth Enterprise REST API. This is used by the GoogleEarthEnterpriseImageryProvider
  *  and GoogleEarthEnterpriseTerrainProvider to share metadata requests.
  *
  * @alias GoogleEarthEnterpriseMetadata
  * @constructor
  *
- * @param {Resource|string} resourceOrUrl The url of the Google Earth Enterprise server hosting the imagery
+ * @param {Resource|string} [resourceOrUrl] The url of the Google Earth Enterprise server hosting the imagery. Deprecated.
  *
  * @see GoogleEarthEnterpriseImageryProvider
  * @see GoogleEarthEnterpriseTerrainProvider
  *
  */
 function GoogleEarthEnterpriseMetadata(resourceOrUrl) {
-  //>>includeStart('debug', pragmas.debug);
-  Check.defined("resourceOrUrl", resourceOrUrl);
-  //>>includeEnd('debug');
-
-  let url = resourceOrUrl;
-
-  if (typeof url !== "string" && !(url instanceof Resource)) {
-    //>>includeStart('debug', pragmas.debug);
-    Check.typeOf.string("resourceOrUrl.url", resourceOrUrl.url);
-    //>>includeEnd('debug');
-
-    url = resourceOrUrl.url;
-  }
-
-  const resource = Resource.createIfNeeded(url);
-  resource.appendForwardSlash();
-  this._resource = resource;
-
   /**
    * True if imagery is available.
    * @type {boolean}
@@ -109,25 +96,43 @@ function GoogleEarthEnterpriseMetadata(resourceOrUrl) {
    */
   this.key = undefined;
 
+  this._resource = undefined;
   this._quadPacketVersion = 1;
-
   this._tileInfo = {};
   this._subtreePromises = {};
 
-  const that = this;
-  this._readyPromise = requestDbRoot(this)
-    .then(function () {
-      return that.getQuadTreePacket("", that._quadPacketVersion);
-    })
-    .then(function () {
-      return true;
-    })
-    .catch(function (e) {
-      const message = `An error occurred while accessing ${
-        getMetadataResource(that, "", 1).url
-      }.`;
-      return Promise.reject(new RuntimeError(message));
-    });
+  this._readyPromise = Promise.resolve(true);
+  if (defined(resourceOrUrl)) {
+    deprecationWarning(
+      "GoogleEarthEnterpriseMetadata options.url",
+      "GoogleEarthEnterpriseMetadata constructor parmeter resourceOrUrl was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use GoogleEarthEnterpriseMetadata.fromUrl instead."
+    );
+
+    let url = resourceOrUrl;
+
+    if (typeof url !== "string" && !(url instanceof Resource)) {
+      url = resourceOrUrl.url;
+    }
+
+    const resource = Resource.createIfNeeded(url);
+    resource.appendForwardSlash();
+    this._resource = resource;
+
+    const that = this;
+    this._readyPromise = requestDbRoot(this)
+      .then(function () {
+        return that.getQuadTreePacket("", that._quadPacketVersion);
+      })
+      .then(function () {
+        return true;
+      })
+      .catch(function (e) {
+        const message = `An error occurred while accessing ${
+          getMetadataResource(that, "", 1).url
+        }.`;
+        return Promise.reject(new RuntimeError(message));
+      });
+  }
 }
 
 Object.defineProperties(GoogleEarthEnterpriseMetadata.prototype, {
@@ -172,14 +177,61 @@ Object.defineProperties(GoogleEarthEnterpriseMetadata.prototype, {
    * @memberof GoogleEarthEnterpriseMetadata.prototype
    * @type {Promise<boolean>}
    * @readonly
+   * @deprecated
    */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "GoogleEarthEnterpriseMetadata.readyPromise",
+        "GoogleEarthEnterpriseMetadata.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use GoogleEarthEnterpriseMetadata.fromUrl instead."
+      );
       return this._readyPromise;
     },
   },
 });
 
+/**
+ * Creates a metadata object using the Google Earth Enterprise REST API. This is used by the GoogleEarthEnterpriseImageryProvider
+ * and GoogleEarthEnterpriseTerrainProvider to share metadata requests.
+ *
+ * @param {Resource|String} resourceOrUrl The url of the Google Earth Enterprise server hosting the imagery.
+ *
+ * @returns {Promise<GoogleEarthEnterpriseMetadata>} A promise which resolves to the created GoogleEarthEnterpriseMetadata instance/
+ */
+GoogleEarthEnterpriseMetadata.fromUrl = async function (resourceOrUrl) {
+  //>>includeStart('debug', pragmas.debug);
+  Check.defined("resourceOrUrl", resourceOrUrl);
+  //>>includeEnd('debug');
+  let url = resourceOrUrl;
+
+  if (typeof url !== "string" && !(url instanceof Resource)) {
+    //>>includeStart('debug', pragmas.debug);
+    Check.typeOf.string("resourceOrUrl.url", resourceOrUrl.url);
+    //>>includeEnd('debug');
+
+    url = resourceOrUrl.url;
+  }
+
+  const resource = Resource.createIfNeeded(url);
+  resource.appendForwardSlash();
+
+  const metadata = new GoogleEarthEnterpriseMetadata();
+  metadata._resource = resource;
+
+  try {
+    await requestDbRoot(metadata);
+    await metadata.getQuadTreePacket("", metadata._quadPacketVersion);
+  } catch (error) {
+    const message = `An error occurred while accessing ${
+      getMetadataResource(metadata, "", 1).url
+    }: ${error}`;
+
+    throw new RuntimeError(message);
+  }
+
+  return metadata;
+};
+
 /**
  * Converts a tiles (x, y, level) position into a quadkey used to request an image
  * from a Google Earth Enterprise server.

package/Source/Core/GoogleEarthEnterpriseTerrainProvider.js

@@ -1,7 +1,8 @@
+import Check from "./Check.js";
 import Credit from "./Credit.js";
 import defaultValue from "./defaultValue.js";
 import defined from "./defined.js";
-import DeveloperError from "./DeveloperError.js";
+import deprecationWarning from "./deprecationWarning.js";
 import Event from "./Event.js";
 import GeographicTilingScheme from "./GeographicTilingScheme.js";
 import GoogleEarthEnterpriseMetadata from "./GoogleEarthEnterpriseMetadata.js";
@@ -67,46 +68,42 @@ TerrainCache.prototype.tidy = function () {
 };
 
 /**
+ * @typedef {Object} GoogleEarthEnterpriseTerrainProvider.ConstructorOptions
+ *
+ * Initialization options for GoogleEarthEnterpriseTerrainProvider constructor
+ *
+ * @property {Ellipsoid} [ellipsoid] The ellipsoid.  If not specified, the WGS84 ellipsoid is used.
+ * @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
+ * @property {Resource|string} [url] The url of the Google Earth Enterprise server hosting the imagery. Deprecated.
+ * @property {GoogleEarthEnterpriseMetadata} [metadata] A metadata object that can be used to share metadata requests with a GoogleEarthEnterpriseImageryProvider. Deprecated.
+ */
+
+/**
+ * <div class="notice">
+ * To construct a GoogleEarthEnterpriseTerrainProvider, call {@link  GoogleEarthEnterpriseTerrainProvider.fromMetadata}. Do not call the constructor directly.
+ * </div>
+ *
  * Provides tiled terrain using the Google Earth Enterprise REST API.
  *
  * @alias GoogleEarthEnterpriseTerrainProvider
  * @constructor
  *
- * @param {object} options Object with the following properties:
- * @param {Resource|string} options.url The url of the Google Earth Enterprise server hosting the imagery.
- * @param {GoogleEarthEnterpriseMetadata} options.metadata A metadata object that can be used to share metadata requests with a GoogleEarthEnterpriseImageryProvider.
- * @param {Ellipsoid} [options.ellipsoid] The ellipsoid.  If not specified, the WGS84 ellipsoid is used.
- * @param {Credit|string} [options.credit] A credit for the data source, which is displayed on the canvas.
+ * @param {GoogleEarthEnterpriseTerrainProvider.ConstructorOptions} options An object describing initialization options
  *
+ * @see GoogleEarthEnterpriseTerrainProvider.fromMetadata
+ * @see GoogleEarthEnterpriseMetadata.fromUrl
  * @see GoogleEarthEnterpriseImageryProvider
  * @see CesiumTerrainProvider
  *
  * @example
- * const geeMetadata = new GoogleEarthEnterpriseMetadata('http://www.example.com');
- * const gee = new Cesium.GoogleEarthEnterpriseTerrainProvider({
- *     metadata : geeMetadata
- * });
+ * const geeMetadata = await GoogleEarthEnterpriseMetadata.fromUrl("http://www.example.com");
+ * const gee = Cesium.GoogleEarthEnterpriseTerrainProvider.fromMetadata(geeMetadata);
  *
  * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing}
  */
 function GoogleEarthEnterpriseTerrainProvider(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
-  //>>includeStart('debug', pragmas.debug);
-  if (!(defined(options.url) || defined(options.metadata))) {
-    throw new DeveloperError("options.url or options.metadata is required.");
-  }
-  //>>includeEnd('debug');
-
-  let metadata;
-  if (defined(options.metadata)) {
-    metadata = options.metadata;
-  } else {
-    const resource = Resource.createIfNeeded(options.url);
-    metadata = new GoogleEarthEnterpriseMetadata(resource);
-  }
-
-  this._metadata = metadata;
   this._tilingScheme = new GeographicTilingScheme({
     numberOfLevelZeroTilesX: 2,
     numberOfLevelZeroTilesY: 2,
@@ -133,16 +130,32 @@ function GoogleEarthEnterpriseTerrainProvider(options) {
   this._terrainRequests = {};
 
   this._errorEvent = new Event();
-
   this._ready = false;
-  const that = this;
-  let metadataError;
-  this._readyPromise = metadata.readyPromise
-    .then(function (result) {
-      if (!metadata.terrainPresent) {
-        const e = new RuntimeError(
-          `The server ${metadata.url} doesn't have terrain`
-        );
+
+  if (defined(options.url)) {
+    deprecationWarning(
+      "GoogleEarthEnterpriseTerrainProvider options.url",
+      "options.url was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use GoogleEarthEnterpriseTerrainProvider.fromMetadata instead."
+    );
+    const resource = Resource.createIfNeeded(options.url);
+    const that = this;
+    let metadataError;
+    this._readyPromise = GoogleEarthEnterpriseMetadata.fromUrl(resource)
+      .then((metadata) => {
+        if (!metadata.terrainPresent) {
+          const e = new RuntimeError(
+            `The server ${metadata.url} doesn't have terrain`
+          );
+
+          return Promise.reject(e);
+        }
+
+        TileProviderError.reportSuccess(metadataError);
+        that._metadata = metadata;
+        that._ready = true;
+        return true;
+      })
+      .catch((e) => {
         metadataError = TileProviderError.reportError(
           metadataError,
           that,
@@ -153,26 +166,29 @@ function GoogleEarthEnterpriseTerrainProvider(options) {
           undefined,
           e
         );
-        return Promise.reject(e);
-      }
 
-      TileProviderError.reportSuccess(metadataError);
-      that._ready = result;
-      return result;
-    })
-    .catch(function (e) {
-      metadataError = TileProviderError.reportError(
-        metadataError,
-        that,
-        that._errorEvent,
-        e.message,
-        undefined,
-        undefined,
-        undefined,
-        e
-      );
-      return Promise.reject(e);
-    });
+        throw e;
+      });
+  } else if (defined(options.metadata)) {
+    deprecationWarning(
+      "GoogleEarthEnterpriseTerrainProvider options.metadata",
+      "options.metadata was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107.  Use GoogleEarthEnterpriseTerrainProvider.fromMetadata instead."
+    );
+    const metadata = options.metadata;
+    this._metadata = metadata;
+    const that = this;
+    this._readyPromise = Promise.resolve(this._metadata._readyPromise).then(
+      () => {
+        if (!metadata.terrainPresent) {
+          throw new RuntimeError(
+            `The server ${metadata.url} doesn't have terrain`
+          );
+        }
+
+        that._ready = true;
+      }
+    );
+  }
 }
 
 Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
@@ -201,22 +217,13 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
   },
 
   /**
-   * Gets the tiling scheme used by this provider.  This function should
-   * not be called before {@link GoogleEarthEnterpriseTerrainProvider#ready} returns true.
+   * Gets the tiling scheme used by this provider.
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {TilingScheme}
    * @readonly
    */
   tilingScheme: {
     get: function () {
-      //>>includeStart('debug', pragmas.debug);
-      if (!this._ready) {
-        throw new DeveloperError(
-          "tilingScheme must not be called before the imagery provider is ready."
-        );
-      }
-      //>>includeEnd('debug');
-
       return this._tilingScheme;
     },
   },
@@ -240,9 +247,14 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {boolean}
    * @readonly
+   * @deprecated
    */
   ready: {
     get: function () {
+      deprecationWarning(
+        "GoogleEarthEnterpriseTerrainProvider.ready",
+        "GoogleEarthEnterpriseTerrainProvider.ready was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
+      );
       return this._ready;
     },
   },
@@ -252,16 +264,21 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {Promise<boolean>}
    * @readonly
+   * @deprecated
    */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "GoogleEarthEnterpriseTerrainProvider.readyPromise",
+        "GoogleEarthEnterpriseTerrainProvider.readyPromise was deprecated in CesiumJS 1.104.  It will be in CesiumJS 1.107."
+      );
       return this._readyPromise;
     },
   },
 
   /**
    * Gets the credit to display when this terrain provider is active.  Typically this is used to credit
-   * the source of the terrain.  This function should not be called before {@link GoogleEarthEnterpriseTerrainProvider#ready} returns true.
+   * the source of the terrain.
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {Credit}
    * @readonly
@@ -275,8 +292,7 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
   /**
    * Gets a value indicating whether or not the provider includes a water mask.  The water mask
    * indicates which areas of the globe are water rather than land, so they can be rendered
-   * as a reflective surface with animated waves.  This function should not be
-   * called before {@link GoogleEarthEnterpriseTerrainProvider#ready} returns true.
+   * as a reflective surface with animated waves.
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {boolean}
    * @readonly
@@ -289,7 +305,6 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
 
   /**
    * Gets a value indicating whether or not the requested tiles include vertex normals.
-   * This function should not be called before {@link GoogleEarthEnterpriseTerrainProvider#ready} returns true.
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {boolean}
    * @readonly
@@ -302,8 +317,7 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
 
   /**
    * Gets an object that can be used to determine availability of terrain from this provider, such as
-   * at points and in rectangles.  This function should not be called before
-   * {@link GoogleEarthEnterpriseTerrainProvider#ready} returns true.  This property may be undefined if availability
+   * at points and in rectangles. This property may be undefined if availability
    * information is not available.
    * @memberof GoogleEarthEnterpriseTerrainProvider.prototype
    * @type {TileAvailability}
@@ -316,6 +330,41 @@ Object.defineProperties(GoogleEarthEnterpriseTerrainProvider.prototype, {
   },
 });
 
+/**
+ * Creates a GoogleEarthTerrainProvider from GoogleEarthEnterpriseMetadata
+ *
+ * @param {GoogleEarthEnterpriseMetadata} metadata A metadata object that can be used to share metadata requests with a GoogleEarthEnterpriseImageryProvider.
+ * @param {GoogleEarthEnterpriseTerrainProvider.ConstructorOptions} options An object describing initialization options
+ * @returns {GoogleEarthEnterpriseTerrainProvider}
+ *
+ * @see GoogleEarthEnterpriseMetadata.fromUrl
+ *
+ * @exception {RuntimeError} metadata does not specify terrain
+ *
+ * @example
+ * const geeMetadata = await GoogleEarthEnterpriseMetadata.fromUrl("http://www.example.com");
+ * const gee = Cesium.GoogleEarthEnterpriseTerrainProvider.fromMetadata(geeMetadata);
+ */
+GoogleEarthEnterpriseTerrainProvider.fromMetadata = function (
+  metadata,
+  options
+) {
+  //>>includeStart('debug', pragmas.debug);
+  Check.defined("metadata", metadata);
+  //>>includeEnd('debug');
+
+  if (!metadata.terrainPresent) {
+    throw new RuntimeError(`The server ${metadata.url} doesn't have terrain`);
+  }
+
+  const provider = new GoogleEarthEnterpriseTerrainProvider(options);
+  provider._metadata = metadata;
+  provider._readyPromise = Promise.resolve(true);
+  provider._ready = true;
+
+  return provider;
+};
+
 const taskProcessor = new TaskProcessor("decodeGoogleEarthEnterprisePacket");
 
 // If the tile has its own terrain, then you can just use its child bitmask. If it was requested using it's parent
@@ -338,8 +387,7 @@ function computeChildMask(quadKey, info, metadata) {
 }
 
 /**
- * Requests the geometry for a given tile.  This function should not be called before
- * {@link GoogleEarthEnterpriseTerrainProvider#ready} returns true.  The result must include terrain data and
+ * Requests the geometry for a given tile.   The result must include terrain data and
  * may optionally include a water mask and an indication of which child tiles are available.
  *
  * @param {number} x The X coordinate of the tile for which to request geometry.
@@ -349,9 +397,6 @@ function computeChildMask(quadKey, info, metadata) {
  * @returns {Promise<TerrainData>|undefined} A promise for the requested geometry.  If this method
  *          returns undefined instead of a promise, it is an indication that too many requests are already
  *          pending and the request will be retried later.
- *
- * @exception {DeveloperError} This function must not be called before {@link GoogleEarthEnterpriseTerrainProvider#ready}
- *            returns true.
  */
 GoogleEarthEnterpriseTerrainProvider.prototype.requestTileGeometry = function (
   x,
@@ -359,14 +404,6 @@ GoogleEarthEnterpriseTerrainProvider.prototype.requestTileGeometry = function (
   level,
   request
 ) {
-  //>>includeStart('debug', pragmas.debug)
-  if (!this._ready) {
-    throw new DeveloperError(
-      "requestTileGeometry must not be called before the terrain provider is ready."
-    );
-  }
-  //>>includeEnd('debug');
-
   const quadKey = GoogleEarthEnterpriseMetadata.tileXYToQuadKey(x, y, level);
   const terrainCache = this._terrainCache;
   const metadata = this._metadata;

package/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI4ZTMwYjM0Yy1lYTdkLTQ5YjEtOTUyYS01Y2YxMjE5OWJjMmEiLCJpZCI6MjU5LCJpYXQiOjE2Nzc2Nzk3MTZ9.OGOiqPh0He1XDVU6azp_c5w3jJcmPXcA1briVUcyrvQ";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYjk1OWEzOS0wM2UzLTQ1MmItYjVhNi0xOGE2NDAyNDc4ZjYiLCJpZCI6MjU5LCJpYXQiOjE2ODA1MzgxNTl9.ANfifMhFxb5agKqgDghPl1R__jvaz6dcEbkoNFM-txE";
 /**
  * Default settings for accessing the Cesium ion API.
  *