@cesium/engine 2.0.0 → 2.2.0

package/Source/Scene/FrameState.js

@@ -60,7 +60,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
 
   /**
    * The maximum level-of-detail of the specular environment atlas used for image-based lighting for PBR models.
-   * @type {Number}
+   * @type {number}
    */
   this.specularEnvironmentMapsMaximumLOD = undefined;
 
@@ -76,14 +76,14 @@ function FrameState(context, creditDisplay, jobScheduler) {
    * The current morph transition time between 2D/Columbus View and 3D,
    * with 0.0 being 2D or Columbus View and 1.0 being 3D.
    *
-   * @type {Number}
+   * @type {number}
    */
   this.morphTime = SceneMode.getMorphTime(SceneMode.SCENE3D);
 
   /**
    * The current frame number.
    *
-   * @type {Number}
+   * @type {number}
    * @default 0
    */
   this.frameNumber = 0;
@@ -91,7 +91,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
   /**
    * <code>true</code> if a new frame has been issued and the frame number has been updated.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.newFrame = false;
@@ -130,7 +130,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
   /**
    * Whether the camera is underground.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.cameraUnderground = false;
@@ -163,7 +163,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
    * The maximum screen-space error used to drive level-of-detail refinement.  Higher
    * values will provide better performance but lower visual quality.
    *
-   * @type {Number}
+   * @type {number}
    * @default 2
    */
   this.maximumScreenSpaceError = undefined;
@@ -172,19 +172,19 @@ function FrameState(context, creditDisplay, jobScheduler) {
    * Ratio between a pixel and a density-independent pixel. Provides a standard unit of
    * measure for real pixel measurements appropriate to a particular device.
    *
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.pixelRatio = 1.0;
 
   /**
    * @typedef FrameState.Passes
-   * @type {Object}
-   * @property {Boolean} render <code>true</code> if the primitive should update for a render pass, <code>false</code> otherwise.
-   * @property {Boolean} pick <code>true</code> if the primitive should update for a picking pass, <code>false</code> otherwise.
-   * @property {Boolean} depth <code>true</code> if the primitive should update for a depth only pass, <code>false</code> otherwise.
-   * @property {Boolean} postProcess <code>true</code> if the primitive should update for a per-feature post-process pass, <code>false</code> otherwise.
-   * @property {Boolean} offscreen <code>true</code> if the primitive should update for an offscreen pass, <code>false</code> otherwise.
+   * @type {object}
+   * @property {boolean} render <code>true</code> if the primitive should update for a render pass, <code>false</code> otherwise.
+   * @property {boolean} pick <code>true</code> if the primitive should update for a picking pass, <code>false</code> otherwise.
+   * @property {boolean} depth <code>true</code> if the primitive should update for a depth only pass, <code>false</code> otherwise.
+   * @property {boolean} postProcess <code>true</code> if the primitive should update for a per-feature post-process pass, <code>false</code> otherwise.
+   * @property {boolean} offscreen <code>true</code> if the primitive should update for an offscreen pass, <code>false</code> otherwise.
    */
 
   /**
@@ -246,18 +246,18 @@ function FrameState(context, creditDisplay, jobScheduler) {
   /**
    * Gets whether or not to optimize for 3D only.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.scene3DOnly = false;
 
   /**
    * @typedef FrameState.Fog
-   * @type {Object}
-   * @property {Boolean} enabled <code>true</code> if fog is enabled, <code>false</code> otherwise.
-   * @property {Number} density A positive number used to mix the color and fog color based on camera distance.
-   * @property {Number} sse A scalar used to modify the screen space error of geometry partially in fog.
-   * @property {Number} minimumBrightness The minimum brightness of terrain with fog applied.
+   * @type {object}
+   * @property {boolean} enabled <code>true</code> if fog is enabled, <code>false</code> otherwise.
+   * @property {number} density A positive number used to mix the color and fog color based on camera distance.
+   * @property {number} sse A scalar used to modify the screen space error of geometry partially in fog.
+   * @property {number} minimumBrightness The minimum brightness of terrain with fog applied.
    */
 
   /**
@@ -276,30 +276,30 @@ function FrameState(context, creditDisplay, jobScheduler) {
 
   /**
    * A scalar used to exaggerate the terrain.
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.terrainExaggeration = 1.0;
 
   /**
    * The height relative to which terrain is exaggerated.
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.terrainExaggerationRelativeHeight = 0.0;
 
   /**
    * @typedef FrameState.ShadowState
-   * @type {Object}
-   * @property {Boolean} shadowsEnabled Whether there are any active shadow maps this frame.
-   * @property {Boolean} lightShadowsEnabled Whether there are any active shadow maps that originate from light sources. Does not include shadow maps that are used for analytical purposes.
+   * @type {object}
+   * @property {boolean} shadowsEnabled Whether there are any active shadow maps this frame.
+   * @property {boolean} lightShadowsEnabled Whether there are any active shadow maps that originate from light sources. Does not include shadow maps that are used for analytical purposes.
    * @property {ShadowMap[]} shadowMaps All shadow maps that are enabled this frame.
    * @property {ShadowMap[]} lightShadowMaps Shadow maps that originate from light sources. Does not include shadow maps that are used for analytical purposes. Only these shadow maps will be used to generate receive shadows shaders.
-   * @property {Number} nearPlane The near plane of the scene's frustum commands. Used for fitting cascaded shadow maps.
-   * @property {Number} farPlane The far plane of the scene's frustum commands. Used for fitting cascaded shadow maps.
-   * @property {Number} closestObjectSize The size of the bounding volume that is closest to the camera. This is used to place more shadow detail near the object.
-   * @property {Number} lastDirtyTime The time when a shadow map was last dirty
-   * @property {Boolean} outOfView Whether the shadows maps are out of view this frame
+   * @property {number} nearPlane The near plane of the scene's frustum commands. Used for fitting cascaded shadow maps.
+   * @property {number} farPlane The far plane of the scene's frustum commands. Used for fitting cascaded shadow maps.
+   * @property {number} closestObjectSize The size of the bounding volume that is closest to the camera. This is used to place more shadow detail near the object.
+   * @property {number} lastDirtyTime The time when a shadow map was last dirty
+   * @property {boolean} outOfView Whether the shadows maps are out of view this frame
    */
 
   /**
@@ -338,14 +338,14 @@ function FrameState(context, creditDisplay, jobScheduler) {
   /**
    * The position of the splitter to use when rendering different things on either side of a splitter.
    * This value should be between 0.0 and 1.0 with 0 being the far left of the viewport and 1 being the far right of the viewport.
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.splitPosition = 0.0;
 
   /**
    * Distances to the near and far planes of the camera frustums
-   * @type {Number[]}
+   * @type {number[]}
    * @default []
    */
   this.frustumSplits = [];
@@ -368,14 +368,14 @@ function FrameState(context, creditDisplay, jobScheduler) {
    * The distance from the camera at which to disable the depth test of billboards, labels and points
    * to, for example, prevent clipping against terrain. When set to zero, the depth test should always
    * be applied. When less than zero, the depth test should never be applied.
-   * @type {Number}
+   * @type {number}
    */
   this.minimumDisableDepthTestDistance = undefined;
 
   /**
    * When <code>false</code>, 3D Tiles will render normally. When <code>true</code>, classified 3D Tile geometry will render normally and
    * unclassified 3D Tile geometry will render with the color multiplied with {@link FrameState#invertClassificationColor}.
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.invertClassification = false;
@@ -389,7 +389,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
   /**
    * Whether or not the scene uses a logarithmic depth buffer.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.useLogDepth = false;
@@ -404,7 +404,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
   /**
    * The minimum terrain height out of all rendered terrain tiles. Used to improve culling for objects underneath the ellipsoid but above terrain.
    *
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.minimumTerrainHeight = 0.0;
@@ -414,6 +414,6 @@ function FrameState(context, creditDisplay, jobScheduler) {
  * A function that will be called at the end of the frame.
  *
  * @callback FrameState.AfterRenderCallback
- * @returns {Boolean} true if another render should be requested in request render mode
+ * @returns {boolean} true if another render should be requested in request render mode
  */
 export default FrameState;

package/Source/Scene/FrustumCommands.js

@@ -6,8 +6,8 @@ import Pass from "../Renderer/Pass.js";
  * @alias FrustumCommands
  * @constructor
  *
- * @param {Number} [near=0.0] The lower bound or closest distance from the camera.
- * @param {Number} [far=0.0] The upper bound or farthest distance from the camera.
+ * @param {number} [near=0.0] The lower bound or closest distance from the camera.
+ * @param {number} [far=0.0] The upper bound or farthest distance from the camera.
  *
  * @private
  */

package/Source/Scene/Geometry3DTileContent.js

@@ -1,6 +1,7 @@
 import Cartesian3 from "../Core/Cartesian3.js";
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
+import deprecationWarning from "../Core/deprecationWarning.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import getJsonFromTypedArray from "../Core/getJsonFromTypedArray.js";
@@ -42,7 +43,15 @@ function Geometry3DTileContent(
   this.featurePropertiesDirty = false;
   this._group = undefined;
 
-  this._readyPromise = initialize(this, arrayBuffer, byteOffset);
+  this._ready = false;
+
+  // This is for backwards compatibility. It can be removed once readyPromise is removed.
+  this._resolveContent = undefined;
+  this._readyPromise = new Promise((resolve) => {
+    this._resolveContent = resolve;
+  });
+
+  initialize(this, arrayBuffer, byteOffset);
 }
 
 Object.defineProperties(Geometry3DTileContent.prototype, {
@@ -96,8 +105,37 @@ Object.defineProperties(Geometry3DTileContent.prototype, {
     },
   },
 
+  /**
+   * Returns true when the tile's content is ready to render; otherwise false
+   *
+   * @memberof Geometry3DTileContent.prototype
+   *
+   * @type {boolean}
+   * @readonly
+   * @private
+   */
+  ready: {
+    get: function () {
+      return this._ready;
+    },
+  },
+
+  /**
+   * Gets the promise that will be resolved when the tile's content is ready to render.
+   *
+   * @memberof Geometry3DTileContent.prototype
+   *
+   * @type {Promise<Geometry3DTileContent>}
+   * @readonly
+   * @deprecated
+   * @private
+   */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "Geometry3DTileContent.readyPromise",
+        "Geometry3DTileContent.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for Geometry3DTileContent.ready to return true instead."
+      );
       return this._readyPromise;
     },
   },
@@ -224,7 +262,7 @@ function getBatchIds(featureTableJson, featureTableBinary) {
 
   if (atLeastOneDefined && atLeastOneUndefined) {
     throw new RuntimeError(
-      "If one group of batch ids is defined, then all batch ids must be defined."
+      "If one group of batch ids is defined, then all batch ids must be defined"
     );
   }
 
@@ -290,7 +328,8 @@ function initialize(content, arrayBuffer, byteOffset) {
   byteOffset += sizeOfUint32;
 
   if (byteLength === 0) {
-    content._readyPromise.resolve(content);
+    content._ready = true;
+    content._resolveContent(content);
     return;
   }
 
@@ -451,9 +490,7 @@ function initialize(content, arrayBuffer, byteOffset) {
       boundingVolume: content.tile.boundingVolume.boundingVolume,
     });
 
-    return content._geometries.readyPromise.then(function () {
-      return content;
-    });
+    return content;
   }
 
   return Promise.resolve(content);
@@ -509,8 +546,11 @@ Geometry3DTileContent.prototype.update = function (tileset, frameState) {
     this._geometries.debugWireframe = this._tileset.debugWireframe;
     this._geometries.update(frameState);
   }
-  if (defined(this._batchTable) && this._geometries._ready) {
+
+  if (defined(this._batchTable) && this._geometries.ready) {
     this._batchTable.update(tileset, frameState);
+    this._ready = true;
+    this._resolveContent(this);
   }
 };
 

package/Source/Scene/GetFeatureInfoFormat.js

@@ -10,9 +10,9 @@ import ImageryLayerFeatureInfo from "./ImageryLayerFeatureInfo.js";
  * @alias GetFeatureInfoFormat
  * @constructor
  *
- * @param {String} type The type of response to expect from a GetFeatureInfo request.  Valid
+ * @param {string} type The type of response to expect from a GetFeatureInfo request.  Valid
  *        values are 'json', 'xml', 'html', or 'text'.
- * @param {String} [format] The info format to request from the WMS server.  This is usually a
+ * @param {string} [format] The info format to request from the WMS server.  This is usually a
  *        MIME type such as 'application/json' or text/xml'.  If this parameter is not specified, the provider will request 'json'
  *        using 'application/json', 'xml' using 'text/xml', 'html' using 'text/html', and 'text' using 'text/plain'.
  * @param {Function} [callback] A function to invoke with the GetFeatureInfo response from the WMS server

package/Source/Scene/Globe.js

@@ -78,7 +78,7 @@ function Globe(ellipsoid) {
   /**
    * Determines if the globe will be shown.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.show = true;
@@ -92,7 +92,7 @@ function Globe(ellipsoid) {
    * The maximum screen-space error used to drive level-of-detail refinement.  Higher
    * values will provide better performance but lower visual quality.
    *
-   * @type {Number}
+   * @type {number}
    * @default 2
    */
   this.maximumScreenSpaceError = 2;
@@ -103,7 +103,7 @@ function Globe(ellipsoid) {
    * this frame.  A larger number will consume more memory but will show detail faster
    * when, for example, zooming out and then back in.
    *
-   * @type {Number}
+   * @type {number}
    * @default 100
    */
   this.tileCacheSize = 100;
@@ -116,7 +116,7 @@ function Globe(ellipsoid) {
    * tile level to be loaded successively, significantly increasing load time. Setting it to a large
    * number (e.g. 1000) will minimize the number of tiles that are loaded but tend to make
    * detail appear all at once after a long wait.
-   * @type {Number}
+   * @type {number}
    * @default 20
    */
   this.loadingDescendantLimit = 20;
@@ -125,7 +125,7 @@ function Globe(ellipsoid) {
    * Gets or sets a value indicating whether the ancestors of rendered tiles should be preloaded.
    * Setting this to true optimizes the zoom-out experience and provides more detail in
    * newly-exposed areas when panning. The down side is that it requires loading more tiles.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.preloadAncestors = true;
@@ -135,7 +135,7 @@ function Globe(ellipsoid) {
    * Setting this to true causes tiles with the same parent as a rendered tile to be loaded, even
    * if they are culled. Setting this to true may provide a better panning experience at the
    * cost of loading more tiles.
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.preloadSiblings = false;
@@ -153,7 +153,7 @@ function Globe(ellipsoid) {
   /**
    * Enable lighting the globe with the scene's light source.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.enableLighting = false;
@@ -163,7 +163,7 @@ function Globe(ellipsoid) {
    * This number is multiplied by the result of <code>czm_getLambertDiffuse</code> in GlobeFS.glsl.
    * This only takes effect when <code>enableLighting</code> is <code>true</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @default 0.9
    */
   this.lambertDiffuseMultiplier = 0.9;
@@ -172,7 +172,7 @@ function Globe(ellipsoid) {
    * Enable dynamic lighting effects on atmosphere and fog. This only takes effect
    * when <code>enableLighting</code> is <code>true</code>.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.dynamicAtmosphereLighting = true;
@@ -182,7 +182,7 @@ function Globe(ellipsoid) {
    * light direction. This only takes effect when <code>enableLighting</code> and
    * <code>dynamicAtmosphereLighting</code> are <code>true</code>.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.dynamicAtmosphereLightingFromSun = false;
@@ -190,7 +190,7 @@ function Globe(ellipsoid) {
   /**
    * Enable the ground atmosphere, which is drawn over the globe when viewed from a distance between <code>lightingFadeInDistance</code> and <code>lightingFadeOutDistance</code>.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.showGroundAtmosphere = true;
@@ -198,7 +198,7 @@ function Globe(ellipsoid) {
   /**
    * The intensity of the light that is used for computing the ground atmosphere color.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10.0
    */
   this.atmosphereLightIntensity = 10.0;
@@ -222,7 +222,7 @@ function Globe(ellipsoid) {
   /**
    * The Rayleigh scale height used in the atmospheric scattering equations for the ground atmosphere, in meters.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10000.0
    */
   this.atmosphereRayleighScaleHeight = 10000.0;
@@ -230,7 +230,7 @@ function Globe(ellipsoid) {
   /**
    * The Mie scale height used in the atmospheric scattering equations for the ground atmosphere, in meters.
    *
-   * @type {Number}
+   * @type {number}
    * @default 3200.0
    */
   this.atmosphereMieScaleHeight = 3200.0;
@@ -240,7 +240,7 @@ function Globe(ellipsoid) {
    * <p>
    * Valid values are between -1.0 and 1.0.
    * </p>
-   * @type {Number}
+   * @type {number}
    * @default 0.9
    */
   this.atmosphereMieAnisotropy = 0.9;
@@ -249,7 +249,7 @@ function Globe(ellipsoid) {
    * The distance where everything becomes lit. This only takes effect
    * when <code>enableLighting</code> or <code>showGroundAtmosphere</code> is <code>true</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10000000.0
    */
   this.lightingFadeOutDistance = 1.0e7;
@@ -258,7 +258,7 @@ function Globe(ellipsoid) {
    * The distance where lighting resumes. This only takes effect
    * when <code>enableLighting</code> or <code>showGroundAtmosphere</code> is <code>true</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @default 20000000.0
    */
   this.lightingFadeInDistance = 2.0e7;
@@ -268,7 +268,7 @@ function Globe(ellipsoid) {
    * This only takes effect when <code>showGroundAtmosphere</code>, <code>enableLighting</code>, and
    * <code>dynamicAtmosphereLighting</code> are <code>true</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10000000.0
    */
   this.nightFadeOutDistance = 1.0e7;
@@ -278,7 +278,7 @@ function Globe(ellipsoid) {
    * This only takes effect when <code>showGroundAtmosphere</code>, <code>enableLighting</code>, and
    * <code>dynamicAtmosphereLighting</code> are <code>true</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @default 50000000.0
    */
   this.nightFadeInDistance = 5.0e7;
@@ -288,7 +288,7 @@ function Globe(ellipsoid) {
    * covered by water; otherwise, false.  This property is ignored if the
    * <code>terrainProvider</code> does not provide a water mask.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.showWaterEffect = true;
@@ -300,7 +300,7 @@ function Globe(ellipsoid) {
    * testing primitives against terrain is that slight numerical noise or terrain level-of-detail
    * switched can sometimes make a primitive that should be on the surface disappear underneath it.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    *
    */
@@ -319,7 +319,7 @@ function Globe(ellipsoid) {
   /**
    * The hue shift to apply to the atmosphere. Defaults to 0.0 (no shift).
    * A hue shift of 1.0 indicates a complete rotation of the hues available.
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.atmosphereHueShift = 0.0;
@@ -327,7 +327,7 @@ function Globe(ellipsoid) {
   /**
    * The saturation shift to apply to the atmosphere. Defaults to 0.0 (no shift).
    * A saturation shift of -1.0 is monochrome.
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.atmosphereSaturationShift = 0.0;
@@ -335,7 +335,7 @@ function Globe(ellipsoid) {
   /**
    * The brightness shift to apply to the atmosphere. Defaults to 0.0 (no shift).
    * A brightness shift of -1.0 is complete darkness, which will let space show through.
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.atmosphereBrightnessShift = 0.0;
@@ -345,7 +345,7 @@ function Globe(ellipsoid) {
    * A value of <code>2.0</code> scales the terrain by 2x.
    * A value of <code>0.0</code> makes the terrain completely flat.
    * Note that terrain exaggeration will not modify any other primitive as they are positioned relative to the ellipsoid.
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.terrainExaggeration = 1.0;
@@ -355,7 +355,7 @@ function Globe(ellipsoid) {
    * Terrain that is above this height will scale upwards and terrain that is below this height will scale downwards.
    * Note that terrain exaggeration will not modify any other primitive as they are positioned relative to the ellipsoid.
    * If {@link Globe#terrainExaggeration} is <code>1.0</code> this value will have no effect.
-   * @type {Number}
+   * @type {number}
    * @default 0.0
    */
   this.terrainExaggerationRelativeHeight = 0.0;
@@ -364,7 +364,7 @@ function Globe(ellipsoid) {
    * Whether to show terrain skirts. Terrain skirts are geometry extending downwards from a tile's edges used to hide seams between neighboring tiles.
    * Skirts are always hidden when the camera is underground or translucency is enabled.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.showSkirts = true;
@@ -372,7 +372,7 @@ function Globe(ellipsoid) {
   /**
    * Whether to cull back-facing terrain. Back faces are not culled when the camera is underground or translucency is enabled.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.backFaceCulling = true;
@@ -384,7 +384,7 @@ function Globe(ellipsoid) {
    * Determines the darkness of the vertex shadow.
    * This only takes effect when <code>enableLighting</code> is <code>true</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @default 0.3
    */
   this.vertexShadowDarkness = 0.3;
@@ -427,7 +427,7 @@ Object.defineProperties(Globe.prototype, {
    * Returns <code>true</code> when the tile load queue is empty, <code>false</code> otherwise.  When the load queue is empty,
    * all terrain and imagery for the current view have been loaded.
    * @memberof Globe.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   tilesLoaded: {
@@ -436,6 +436,7 @@ Object.defineProperties(Globe.prototype, {
         return true;
       }
       return (
+        // ready is deprecated. This is here for backwards compatibility
         this._surface.tileProvider.ready &&
         this._surface._tileLoadQueueHigh.length === 0 &&
         this._surface._tileLoadQueueMedium.length === 0 &&
@@ -493,7 +494,7 @@ Object.defineProperties(Globe.prototype, {
    * The normal map to use for rendering waves in the ocean.  Setting this property will
    * only have an effect if the configured terrain provider includes a water mask.
    * @memberof Globe.prototype
-   * @type {String}
+   * @type {string}
    * @default buildModuleUrl('Assets/Textures/waterNormalsSmall.jpg')
    */
   oceanNormalMapUrl: {
@@ -699,7 +700,7 @@ const scratchSphereIntersectionResult = {
  *
  * @param {Ray} ray The ray to test for intersection.
  * @param {Scene} scene The scene.
- * @param {Boolean} [cullBackFaces=true] Set to true to not pick back faces.
+ * @param {boolean} [cullBackFaces=true] Set to true to not pick back faces.
  * @param {Cartesian3} [result] The object onto which to store the result.
  * @returns {Cartesian3|undefined} The intersection or <code>undefined</code> if none was found.  The returned position is in projected coordinates for 2D and Columbus View.
  *
@@ -837,7 +838,7 @@ function tileIfContainsCartographic(tile, cartographic) {
  * Get the height of the surface at a given cartographic.
  *
  * @param {Cartographic} cartographic The cartographic for which to find the height.
- * @returns {Number|undefined} The height of the cartographic or undefined if it could not be found.
+ * @returns {number|undefined} The height of the cartographic or undefined if it could not be found.
  */
 Globe.prototype.getHeight = function (cartographic) {
   //>>includeStart('debug', pragmas.debug);
@@ -984,7 +985,10 @@ Globe.prototype.beginFrame = function (frameState) {
   const terrainProvider = this.terrainProvider;
   const hasWaterMask =
     this.showWaterEffect &&
-    terrainProvider.ready &&
+    defined(terrainProvider) &&
+    terrainProvider.hasWaterMask &&
+    // ready is deprecated; This is here for backwards compatibility
+    terrainProvider._ready &&
     terrainProvider.hasWaterMask;
 
   if (hasWaterMask && this._oceanNormalMapResourceDirty) {
@@ -1097,7 +1101,7 @@ Globe.prototype.endFrame = function (frameState) {
  * If this object was destroyed, it should not be used; calling any function other than
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  *
- * @returns {Boolean} True if this object was destroyed; otherwise, false.
+ * @returns {boolean} True if this object was destroyed; otherwise, false.
  *
  * @see Globe#destroy
  */

package/Source/Scene/GlobeSurfaceTile.js

@@ -79,7 +79,7 @@ Object.defineProperties(GlobeSurfaceTile.prototype, {
    * unloaded while it is needed for rendering, regardless of the value of this
    * property.
    * @memberof GlobeSurfaceTile.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   eligibleForUnloading: {
     get: function () {
@@ -345,7 +345,8 @@ GlobeSurfaceTile.prototype.processImagery = function (
 
     if (tileImagery.loadingImagery.state === ImageryState.PLACEHOLDER) {
       const imageryLayer = tileImagery.loadingImagery.imageryLayer;
-      if (imageryLayer.imageryProvider.ready) {
+      // ImageryProvider.ready is deprecated. This is here for backwards compatibility
+      if (imageryLayer.ready && imageryLayer.imageryProvider._ready) {
         // Remove the placeholder and add the actual skeletons (if any)
         // at the same position.  Then continue the loop at the same index.
         tileImagery.freeResources();