@cesium/engine 2.0.0 → 2.1.0

package/Source/Scene/ScreenSpaceCameraController.js

@@ -49,41 +49,41 @@ function ScreenSpaceCameraController(scene) {
    * start of such events, and set true on completion.  To keep inputs disabled
    * past the end of camera flights, you must use the other booleans (enableTranslate,
    * enableZoom, enableRotate, enableTilt, and enableLook).
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableInputs = true;
   /**
    * If true, allows the user to pan around the map.  If false, the camera stays locked at the current position.
    * This flag only applies in 2D and Columbus view modes.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableTranslate = true;
   /**
    * If true, allows the user to zoom in and out.  If false, the camera is locked to the current distance from the ellipsoid.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableZoom = true;
   /**
    * If true, allows the user to rotate the world which translates the user's position.
    * This flag only applies in 2D and 3D.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableRotate = true;
   /**
    * If true, allows the user to tilt the camera.  If false, the camera is locked to the current heading.
    * This flag only applies in 3D and Columbus view.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableTilt = true;
   /**
    * If true, allows the user to use free-look. If false, the camera view direction can only be changed through translating
    * or rotating. This flag only applies in 3D and Columbus view modes.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableLook = true;
@@ -91,7 +91,7 @@ function ScreenSpaceCameraController(scene) {
    * A parameter in the range <code>[0, 1)</code> used to determine how long
    * the camera will continue to spin because of inertia.
    * With value of zero, the camera will have no inertia.
-   * @type {Number}
+   * @type {number}
    * @default 0.9
    */
   this.inertiaSpin = 0.9;
@@ -99,7 +99,7 @@ function ScreenSpaceCameraController(scene) {
    * A parameter in the range <code>[0, 1)</code> used to determine how long
    * the camera will continue to translate because of inertia.
    * With value of zero, the camera will have no inertia.
-   * @type {Number}
+   * @type {number}
    * @default 0.9
    */
   this.inertiaTranslate = 0.9;
@@ -107,7 +107,7 @@ function ScreenSpaceCameraController(scene) {
    * A parameter in the range <code>[0, 1)</code> used to determine how long
    * the camera will continue to zoom because of inertia.
    * With value of zero, the camera will have no inertia.
-   * @type {Number}
+   * @type {number}
    * @default 0.8
    */
   this.inertiaZoom = 0.8;
@@ -115,25 +115,25 @@ function ScreenSpaceCameraController(scene) {
    * A parameter in the range <code>[0, 1)</code> used to limit the range
    * of various user inputs to a percentage of the window width/height per animation frame.
    * This helps keep the camera under control in low-frame-rate situations.
-   * @type {Number}
+   * @type {number}
    * @default 0.1
    */
   this.maximumMovementRatio = 0.1;
   /**
    * Sets the duration, in seconds, of the bounce back animations in 2D and Columbus view.
-   * @type {Number}
+   * @type {number}
    * @default 3.0
    */
   this.bounceAnimationTime = 3.0;
   /**
    * The minimum magnitude, in meters, of the camera position when zooming. Defaults to 1.0.
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   this.minimumZoomDistance = 1.0;
   /**
    * The maximum magnitude, in meters, of the camera position when zooming. Defaults to positive infinity.
-   * @type {Number}
+   * @type {number}
    * @default {@link Number.POSITIVE_INFINITY}
    */
   this.maximumZoomDistance = Number.POSITIVE_INFINITY;
@@ -218,14 +218,20 @@ function ScreenSpaceCameraController(scene) {
   };
   /**
    * The minimum height the camera must be before picking the terrain instead of the ellipsoid.
-   * @type {Number}
+   * @type {number}
    * @default 150000.0
    */
   this.minimumPickingTerrainHeight = 150000.0;
   this._minimumPickingTerrainHeight = this.minimumPickingTerrainHeight;
+  /**
+   * The minimum distance the camera must be before testing for collision with terrain when zoom with inertia.
+   * @type {number}
+   * @default 4000.0
+   */
+  this.minimumPickingTerrainDistanceWithInertia = 4000.0;
   /**
    * The minimum height the camera must be before testing for collision with terrain.
-   * @type {Number}
+   * @type {number}
    * @default 15000.0
    */
   this.minimumCollisionTerrainHeight = 15000.0;
@@ -233,14 +239,14 @@ function ScreenSpaceCameraController(scene) {
   /**
    * The minimum height the camera must be before switching from rotating a track ball to
    * free look when clicks originate on the sky or in space.
-   * @type {Number}
+   * @type {number}
    * @default 7500000.0
    */
   this.minimumTrackBallHeight = 7500000.0;
   this._minimumTrackBallHeight = this.minimumTrackBallHeight;
   /**
    * Enables or disables camera collision detection with terrain.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.enableCollisionDetection = true;
@@ -591,9 +597,9 @@ function handleZoom(
     return;
   }
 
-  const sameStartPosition = Cartesian2.equals(
-    startPosition,
-    object._zoomMouseStart
+  const sameStartPosition = defaultValue(
+    movement.inertiaEnabled,
+    Cartesian2.equals(startPosition, object._zoomMouseStart)
   );
   let zoomingOnVector = object._zoomingOnVector;
   let rotatingZoom = object._rotatingZoom;
@@ -2158,10 +2164,13 @@ function pan3D(controller, startPosition, movement, ellipsoid) {
 const zoom3DUnitPosition = new Cartesian3();
 const zoom3DCartographic = new Cartographic();
 
+let preIntersectionDistance = 0;
+
 function zoom3D(controller, startPosition, movement) {
   if (defined(movement.distance)) {
     movement = movement.distance;
   }
+  const inertiaMovement = movement.inertiaEnabled;
 
   const ellipsoid = controller._ellipsoid;
   const scene = controller._scene;
@@ -2187,13 +2196,22 @@ function zoom3D(controller, startPosition, movement) {
     camera.position,
     zoom3DCartographic
   ).height;
-  if (height < controller._minimumPickingTerrainHeight) {
+
+  const approachingCollision =
+    Math.abs(preIntersectionDistance) <
+    controller.minimumPickingTerrainDistanceWithInertia;
+
+  const needPickGlobe = inertiaMovement
+    ? approachingCollision
+    : height < controller._minimumPickingTerrainHeight;
+  if (needPickGlobe) {
     intersection = pickGlobe(controller, windowPosition, zoomCVIntersection);
   }
 
   let distance;
   if (defined(intersection)) {
     distance = Cartesian3.distance(ray.origin, intersection);
+    preIntersectionDistance = distance;
   }
 
   if (cameraUnderground) {
@@ -2902,7 +2920,7 @@ ScreenSpaceCameraController.prototype.update = function () {
  * 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} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
+ * @returns {boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
  *
  * @see ScreenSpaceCameraController#destroy
  */

package/Source/Scene/ShadowMap.js

@@ -59,20 +59,20 @@ import ShadowMapShader from "./ShadowMapShader.js";
  * @internalConstructor
  * @class
  *
- * @privateParam {Object} options An object containing the following properties:
+ * @privateParam {object} options An object containing the following properties:
  * @privateParam {Context} options.context The context
  * @privateParam {Camera} options.lightCamera A camera representing the light source.
- * @privateParam {Boolean} [options.enabled=true] Whether the shadow map is enabled.
- * @privateParam {Boolean} [options.isPointLight=false] Whether the light source is a point light. Point light shadows do not use cascades.
- * @privateParam {Number} [options.pointLightRadius=100.0] Radius of the point light.
- * @privateParam {Boolean} [options.cascadesEnabled=true] Use multiple shadow maps to cover different partitions of the view frustum.
- * @privateParam {Number} [options.numberOfCascades=4] The number of cascades to use for the shadow map. Supported values are one and four.
- * @privateParam {Number} [options.maximumDistance=5000.0] The maximum distance used for generating cascaded shadows. Lower values improve shadow quality.
- * @privateParam {Number} [options.size=2048] The width and height, in pixels, of each shadow map.
- * @privateParam {Boolean} [options.softShadows=false] Whether percentage-closer-filtering is enabled for producing softer shadows.
- * @privateParam {Number} [options.darkness=0.3] The shadow darkness.
- * @privateParam {Boolean} [options.normalOffset=true] Whether a normal bias is applied to shadows.
- * @privateParam {Boolean} [options.fadingEnabled=true] Whether shadows start to fade out once the light gets closer to the horizon.
+ * @privateParam {boolean} [options.enabled=true] Whether the shadow map is enabled.
+ * @privateParam {boolean} [options.isPointLight=false] Whether the light source is a point light. Point light shadows do not use cascades.
+ * @privateParam {number} [options.pointLightRadius=100.0] Radius of the point light.
+ * @privateParam {boolean} [options.cascadesEnabled=true] Use multiple shadow maps to cover different partitions of the view frustum.
+ * @privateParam {number} [options.numberOfCascades=4] The number of cascades to use for the shadow map. Supported values are one and four.
+ * @privateParam {number} [options.maximumDistance=5000.0] The maximum distance used for generating cascaded shadows. Lower values improve shadow quality.
+ * @privateParam {number} [options.size=2048] The width and height, in pixels, of each shadow map.
+ * @privateParam {boolean} [options.softShadows=false] Whether percentage-closer-filtering is enabled for producing softer shadows.
+ * @privateParam {number} [options.darkness=0.3] The shadow darkness.
+ * @privateParam {boolean} [options.normalOffset=true] Whether a normal bias is applied to shadows.
+ * @privateParam {boolean} [options.fadingEnabled=true] Whether shadows start to fade out once the light gets closer to the horizon.
  *
  * @exception {DeveloperError} Only one or four cascades are supported.
  *
@@ -114,7 +114,7 @@ function ShadowMap(options) {
   /**
    * Determines the darkness of the shadows.
    *
-   * @type {Number}
+   * @type {number}
    * @default 0.3
    */
   this.darkness = defaultValue(options.darkness, 0.3);
@@ -123,7 +123,7 @@ function ShadowMap(options) {
   /**
    * Determines whether shadows start to fade out once the light gets closer to the horizon.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.fadingEnabled = defaultValue(options.fadingEnabled, true);
@@ -131,7 +131,7 @@ function ShadowMap(options) {
   /**
    * Determines the maximum distance of the shadow map. Only applicable for cascaded shadows. Larger distances may result in lower quality shadows.
    *
-   * @type {Number}
+   * @type {number}
    * @default 5000.0
    */
   this.maximumDistance = defaultValue(options.maximumDistance, 5000.0);
@@ -355,7 +355,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * Determines if the shadow map will be shown.
    *
    * @memberof ShadowMap.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   enabled: {
@@ -372,7 +372,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * Determines if a normal bias will be applied to shadows.
    *
    * @memberof ShadowMap.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   normalOffset: {
@@ -392,7 +392,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * Determines if soft shadows are enabled. Uses pcf filtering which requires more texture reads and may hurt performance.
    *
    * @memberof ShadowMap.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   softShadows: {
@@ -409,7 +409,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * The width and height, in pixels, of each shadow map.
    *
    * @memberof ShadowMap.prototype
-   * @type {Number}
+   * @type {number}
    * @default 2048
    */
   size: {
@@ -425,7 +425,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * Whether the shadow map is out of view of the scene camera.
    *
    * @memberof ShadowMap.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    * @private
    */
@@ -467,7 +467,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * Whether the light source is a point light.
    *
    * @memberof ShadowMap.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    * @private
    */
@@ -481,7 +481,7 @@ Object.defineProperties(ShadowMap.prototype, {
    * Debug option for visualizing the cascades by color.
    *
    * @memberof ShadowMap.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    * @private
    */

package/Source/Scene/ShadowMapShader.js

@@ -39,7 +39,7 @@ ShadowMapShader.createShadowCastVertexShader = function (
     }
 
     const shadowVS =
-      "in vec3 v_positionEC; \n" +
+      "out vec3 v_positionEC; \n" +
       "void main() \n" +
       "{ \n" +
       "    czm_shadow_cast_main(); \n" +

package/Source/Scene/ShadowMode.js

@@ -2,13 +2,13 @@
  * Specifies whether the object casts or receives shadows from light sources when
  * shadows are enabled.
  *
- * @enum {Number}
+ * @enum {number}
  */
 const ShadowMode = {
   /**
    * The object does not cast or receive shadows.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   DISABLED: 0,
@@ -16,7 +16,7 @@ const ShadowMode = {
   /**
    * The object casts and receives shadows.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   ENABLED: 1,
@@ -24,7 +24,7 @@ const ShadowMode = {
   /**
    * The object casts shadows only.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   CAST_ONLY: 2,
@@ -32,7 +32,7 @@ const ShadowMode = {
   /**
    * The object receives shadows only.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   RECEIVE_ONLY: 3,

package/Source/Scene/ShadowVolumeAppearance.js

@@ -18,8 +18,8 @@ import ShadowVolumeAppearanceFS from "../Shaders/ShadowVolumeAppearanceFS.js";
 /**
  * Creates shaders for a ClassificationPrimitive to use a given Appearance, as well as for picking.
  *
- * @param {Boolean} extentsCulling Discard fragments outside the instance's texture coordinate extents.
- * @param {Boolean} planarExtents If true, texture coordinates will be computed using planes instead of spherical coordinates.
+ * @param {boolean} extentsCulling Discard fragments outside the instance's texture coordinate extents.
+ * @param {boolean} planarExtents If true, texture coordinates will be computed using planes instead of spherical coordinates.
  * @param {Appearance} appearance An Appearance to be used with a ClassificationPrimitive via GroundPrimitive.
  * @private
  */
@@ -73,7 +73,7 @@ function ShadowVolumeAppearance(extentsCulling, planarExtents, appearance) {
 /**
  * Create the fragment shader for a ClassificationPrimitive's color pass when rendering for color.
  *
- * @param {Boolean} columbusView2D Whether the shader will be used for Columbus View or 2D.
+ * @param {boolean} columbusView2D Whether the shader will be used for Columbus View or 2D.
  * @returns {ShaderSource} Shader source for the fragment shader.
  */
 ShadowVolumeAppearance.prototype.createFragmentShader = function (
@@ -175,11 +175,11 @@ ShadowVolumeAppearance.prototype.createPickFragmentShader = function (
 /**
  * Create the vertex shader for a ClassificationPrimitive's color pass on the final of 3 shadow volume passes
  *
- * @param {String[]} defines External defines to pass to the vertex shader.
- * @param {String} vertexShaderSource ShadowVolumeAppearanceVS with any required modifications for computing position.
- * @param {Boolean} columbusView2D Whether the shader will be used for Columbus View or 2D.
+ * @param {string[]} defines External defines to pass to the vertex shader.
+ * @param {string} vertexShaderSource ShadowVolumeAppearanceVS with any required modifications for computing position.
+ * @param {boolean} columbusView2D Whether the shader will be used for Columbus View or 2D.
  * @param {MapProjection} mapProjection Current scene's map projection.
- * @returns {String} Shader source for the vertex shader.
+ * @returns {string} Shader source for the vertex shader.
  */
 ShadowVolumeAppearance.prototype.createVertexShader = function (
   defines,
@@ -208,11 +208,11 @@ ShadowVolumeAppearance.prototype.createVertexShader = function (
 /**
  * Create the vertex shader for a ClassificationPrimitive's pick pass on the final of 3 shadow volume passes
  *
- * @param {String[]} defines External defines to pass to the vertex shader.
- * @param {String} vertexShaderSource ShadowVolumeAppearanceVS with any required modifications for computing position and picking.
- * @param {Boolean} columbusView2D Whether the shader will be used for Columbus View or 2D.
+ * @param {string[]} defines External defines to pass to the vertex shader.
+ * @param {string} vertexShaderSource ShadowVolumeAppearanceVS with any required modifications for computing position and picking.
+ * @param {boolean} columbusView2D Whether the shader will be used for Columbus View or 2D.
  * @param {MapProjection} mapProjection Current scene's map projection.
- * @returns {String} Shader source for the vertex shader.
+ * @returns {string} Shader source for the vertex shader.
  */
 ShadowVolumeAppearance.prototype.createPickVertexShader = function (
   defines,
@@ -675,11 +675,11 @@ const encodeScratch = new EncodedCartesian3();
  * @private
  *
  * @param {Rectangle} boundingRectangle Rectangle object that the points will approximately bound
- * @param {Number[]} textureCoordinateRotationPoints Points in the computed texture coordinate system for remapping texture coordinates
+ * @param {number[]} textureCoordinateRotationPoints Points in the computed texture coordinate system for remapping texture coordinates
  * @param {Ellipsoid} ellipsoid Ellipsoid for converting Rectangle points to world coordinates
  * @param {MapProjection} projection The MapProjection used for 2D and Columbus View.
- * @param {Number} [height=0] The maximum height for the shadow volume.
- * @returns {Object} An attributes dictionary containing planar texture coordinate attributes.
+ * @param {number} [height=0] The maximum height for the shadow volume.
+ * @returns {object} An attributes dictionary containing planar texture coordinate attributes.
  */
 ShadowVolumeAppearance.getPlanarTextureCoordinateAttributes = function (
   boundingRectangle,
@@ -793,10 +793,10 @@ const sphericalScratch = new Cartesian2();
  * @private
  *
  * @param {Rectangle} boundingRectangle Rectangle object that the spherical extents will approximately bound
- * @param {Number[]} textureCoordinateRotationPoints Points in the computed texture coordinate system for remapping texture coordinates
+ * @param {number[]} textureCoordinateRotationPoints Points in the computed texture coordinate system for remapping texture coordinates
  * @param {Ellipsoid} ellipsoid Ellipsoid for converting Rectangle points to world coordinates
  * @param {MapProjection} projection The MapProjection used for 2D and Columbus View.
- * @returns {Object} An attributes dictionary containing spherical texture coordinate attributes.
+ * @returns {object} An attributes dictionary containing spherical texture coordinate attributes.
  */
 ShadowVolumeAppearance.getSphericalExtentGeometryInstanceAttributes = function (
   boundingRectangle,
@@ -929,7 +929,7 @@ ShadowVolumeAppearance.shouldUseSphericalCoordinates = function (rectangle) {
  * Texture coordinates for ground primitives are computed either using spherical coordinates for large areas or
  * using distance from planes for small areas.
  *
- * @type {Number}
+ * @type {number}
  * @constant
  * @private
  */

package/Source/Scene/SingleTileImageryProvider.js

@@ -11,13 +11,13 @@ import TileProviderError from "../Core/TileProviderError.js";
 import ImageryProvider from "./ImageryProvider.js";
 
 /**
- * @typedef {Object} SingleTileImageryProvider.ConstructorOptions
+ * @typedef {object} SingleTileImageryProvider.ConstructorOptions
  *
  * Initialization options for the SingleTileImageryProvider constructor
  *
- * @property {Resource|String} url The url for the tile.
+ * @property {Resource|string} url The url for the tile.
  * @property {Rectangle} [rectangle=Rectangle.MAX_VALUE] The rectangle, in radians, covered by the image.
- * @property {Credit|String} [credit] A credit for the data source, which is displayed on the canvas.
+ * @property {Credit|string} [credit] A credit for the data source, which is displayed on the canvas.
  * @property {Ellipsoid} [ellipsoid] The ellipsoid.  If not specified, the WGS84 ellipsoid is used.
  */
 
@@ -51,7 +51,7 @@ function SingleTileImageryProvider(options) {
    * The default alpha blending value of this provider, with 0.0 representing fully transparent and
    * 1.0 representing fully opaque.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultAlpha = undefined;
@@ -60,7 +60,7 @@ function SingleTileImageryProvider(options) {
    * The default alpha blending value on the night side of the globe of this provider, with 0.0 representing fully transparent and
    * 1.0 representing fully opaque.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultNightAlpha = undefined;
@@ -69,7 +69,7 @@ function SingleTileImageryProvider(options) {
    * The default alpha blending value on the day side of the globe of this provider, with 0.0 representing fully transparent and
    * 1.0 representing fully opaque.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultDayAlpha = undefined;
@@ -78,7 +78,7 @@ function SingleTileImageryProvider(options) {
    * The default brightness of this provider.  1.0 uses the unmodified imagery color.  Less than 1.0
    * makes the imagery darker while greater than 1.0 makes it brighter.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultBrightness = undefined;
@@ -87,7 +87,7 @@ function SingleTileImageryProvider(options) {
    * The default contrast of this provider.  1.0 uses the unmodified imagery color.  Less than 1.0 reduces
    * the contrast while greater than 1.0 increases it.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultContrast = undefined;
@@ -95,7 +95,7 @@ function SingleTileImageryProvider(options) {
   /**
    * The default hue of this provider in radians. 0.0 uses the unmodified imagery color.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultHue = undefined;
@@ -104,7 +104,7 @@ function SingleTileImageryProvider(options) {
    * The default saturation of this provider. 1.0 uses the unmodified imagery color. Less than 1.0 reduces the
    * saturation while greater than 1.0 increases it.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultSaturation = undefined;
@@ -112,7 +112,7 @@ function SingleTileImageryProvider(options) {
   /**
    * The default gamma correction to apply to this provider.  1.0 uses the unmodified imagery color.
    *
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @default undefined
    */
   this.defaultGamma = undefined;
@@ -201,7 +201,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
   /**
    * Gets the URL of the single, top-level imagery tile.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   url: {
@@ -226,7 +226,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
    * Gets the width of each tile, in pixels. This function should
    * not be called before {@link SingleTileImageryProvider#ready} returns true.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   tileWidth: {
@@ -247,7 +247,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
    * Gets the height of each tile, in pixels.  This function should
    * not be called before {@link SingleTileImageryProvider#ready} returns true.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   tileHeight: {
@@ -268,7 +268,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
    * Gets the maximum level-of-detail that can be requested.  This function should
    * not be called before {@link SingleTileImageryProvider#ready} returns true.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Number|undefined}
+   * @type {number|undefined}
    * @readonly
    */
   maximumLevel: {
@@ -289,7 +289,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
    * Gets the minimum level-of-detail that can be requested.  This function should
    * not be called before {@link SingleTileImageryProvider#ready} returns true.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   minimumLevel: {
@@ -380,7 +380,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
   /**
    * Gets a value indicating whether or not the provider is ready for use.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   ready: {
@@ -392,7 +392,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
   /**
    * Gets a promise that resolves to true when the provider is ready for use.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Promise.<Boolean>}
+   * @type {Promise<boolean>}
    * @readonly
    */
   readyPromise: {
@@ -421,7 +421,7 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
    * as if their alpha is 1.0 everywhere.  When this property is false, memory usage
    * and texture upload time are reduced.
    * @memberof SingleTileImageryProvider.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   hasAlphaChannel: {
@@ -434,9 +434,9 @@ Object.defineProperties(SingleTileImageryProvider.prototype, {
 /**
  * Gets the credits to be displayed when a given tile is displayed.
  *
- * @param {Number} x The tile X coordinate.
- * @param {Number} y The tile Y coordinate.
- * @param {Number} level The tile level;
+ * @param {number} x The tile X coordinate.
+ * @param {number} y The tile Y coordinate.
+ * @param {number} level The tile level;
  * @returns {Credit[]} The credits to be displayed when the tile is displayed.
  *
  * @exception {DeveloperError} <code>getTileCredits</code> must not be called before the imagery provider is ready.
@@ -449,11 +449,11 @@ SingleTileImageryProvider.prototype.getTileCredits = function (x, y, level) {
  * Requests the image for a given tile.  This function should
  * not be called before {@link SingleTileImageryProvider#ready} returns true.
  *
- * @param {Number} x The tile X coordinate.
- * @param {Number} y The tile Y coordinate.
- * @param {Number} level The tile level.
+ * @param {number} x The tile X coordinate.
+ * @param {number} y The tile Y coordinate.
+ * @param {number} level The tile level.
  * @param {Request} [request] The request object. Intended for internal use only.
- * @returns {Promise.<ImageryTypes>|undefined} The resolved image
+ * @returns {Promise<ImageryTypes>|undefined} The resolved image
  *
  * @exception {DeveloperError} <code>requestImage</code> must not be called before the imagery provider is ready.
  */
@@ -482,11 +482,11 @@ SingleTileImageryProvider.prototype.requestImage = function (
  * Picking features is not currently supported by this imagery provider, so this function simply returns
  * undefined.
  *
- * @param {Number} x The tile X coordinate.
- * @param {Number} y The tile Y coordinate.
- * @param {Number} level The tile level.
- * @param {Number} longitude The longitude at which to pick features.
- * @param {Number} latitude  The latitude at which to pick features.
+ * @param {number} x The tile X coordinate.
+ * @param {number} y The tile Y coordinate.
+ * @param {number} level The tile level.
+ * @param {number} longitude The longitude at which to pick features.
+ * @param {number} latitude  The latitude at which to pick features.
  * @return {undefined} Undefined since picking is not supported.
  */
 SingleTileImageryProvider.prototype.pickFeatures = function (