@cesium/engine 2.0.0 → 2.2.0

package/Source/Core/GeographicTilingScheme.js

@@ -15,13 +15,13 @@ import Rectangle from "./Rectangle.js";
  * @alias GeographicTilingScheme
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {Ellipsoid} [options.ellipsoid=Ellipsoid.WGS84] The ellipsoid whose surface is being tiled. Defaults to
  * the WGS84 ellipsoid.
  * @param {Rectangle} [options.rectangle=Rectangle.MAX_VALUE] The rectangle, in radians, covered by the tiling scheme.
- * @param {Number} [options.numberOfLevelZeroTilesX=2] The number of tiles in the X direction at level zero of
+ * @param {number} [options.numberOfLevelZeroTilesX=2] The number of tiles in the X direction at level zero of
  * the tile tree.
- * @param {Number} [options.numberOfLevelZeroTilesY=1] The number of tiles in the Y direction at level zero of
+ * @param {number} [options.numberOfLevelZeroTilesY=1] The number of tiles in the Y direction at level zero of
  * the tile tree.
  */
 function GeographicTilingScheme(options) {
@@ -78,8 +78,8 @@ Object.defineProperties(GeographicTilingScheme.prototype, {
 /**
  * Gets the total number of tiles in the X direction at a specified level-of-detail.
  *
- * @param {Number} level The level-of-detail.
- * @returns {Number} The number of tiles in the X direction at the given level.
+ * @param {number} level The level-of-detail.
+ * @returns {number} The number of tiles in the X direction at the given level.
  */
 GeographicTilingScheme.prototype.getNumberOfXTilesAtLevel = function (level) {
   return this._numberOfLevelZeroTilesX << level;
@@ -88,8 +88,8 @@ GeographicTilingScheme.prototype.getNumberOfXTilesAtLevel = function (level) {
 /**
  * Gets the total number of tiles in the Y direction at a specified level-of-detail.
  *
- * @param {Number} level The level-of-detail.
- * @returns {Number} The number of tiles in the Y direction at the given level.
+ * @param {number} level The level-of-detail.
+ * @returns {number} The number of tiles in the Y direction at the given level.
  */
 GeographicTilingScheme.prototype.getNumberOfYTilesAtLevel = function (level) {
   return this._numberOfLevelZeroTilesY << level;
@@ -133,10 +133,10 @@ GeographicTilingScheme.prototype.rectangleToNativeRectangle = function (
  * Converts tile x, y coordinates and level to a rectangle expressed in the native coordinates
  * of the tiling scheme.
  *
- * @param {Number} x The integer x coordinate of the tile.
- * @param {Number} y The integer y coordinate of the tile.
- * @param {Number} level The tile level-of-detail.  Zero is the least detailed.
- * @param {Object} [result] The instance to which to copy the result, or undefined if a new instance
+ * @param {number} x The integer x coordinate of the tile.
+ * @param {number} y The integer y coordinate of the tile.
+ * @param {number} level The tile level-of-detail.  Zero is the least detailed.
+ * @param {object} [result] The instance to which to copy the result, or undefined if a new instance
  *        should be created.
  * @returns {Rectangle} The specified 'result', or a new object containing the rectangle
  *          if 'result' is undefined.
@@ -158,10 +158,10 @@ GeographicTilingScheme.prototype.tileXYToNativeRectangle = function (
 /**
  * Converts tile x, y coordinates and level to a cartographic rectangle in radians.
  *
- * @param {Number} x The integer x coordinate of the tile.
- * @param {Number} y The integer y coordinate of the tile.
- * @param {Number} level The tile level-of-detail.  Zero is the least detailed.
- * @param {Object} [result] The instance to which to copy the result, or undefined if a new instance
+ * @param {number} x The integer x coordinate of the tile.
+ * @param {number} y The integer y coordinate of the tile.
+ * @param {number} level The tile level-of-detail.  Zero is the least detailed.
+ * @param {object} [result] The instance to which to copy the result, or undefined if a new instance
  *        should be created.
  * @returns {Rectangle} The specified 'result', or a new object containing the rectangle
  *          if 'result' is undefined.
@@ -201,7 +201,7 @@ GeographicTilingScheme.prototype.tileXYToRectangle = function (
  * a given cartographic position.
  *
  * @param {Cartographic} position The position.
- * @param {Number} level The tile level-of-detail.  Zero is the least detailed.
+ * @param {number} level The tile level-of-detail.  Zero is the least detailed.
  * @param {Cartesian2} [result] The instance to which to copy the result, or undefined if a new instance
  *        should be created.
  * @returns {Cartesian2} The specified 'result', or a new object containing the tile x, y coordinates

package/Source/Core/Geometry.js

@@ -26,7 +26,7 @@ import Transforms from "./Transforms.js";
  * @alias Geometry
  * @constructor
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {GeometryAttributes} options.attributes Attributes, which make up the geometry's vertices.
  * @param {PrimitiveType} [options.primitiveType=PrimitiveType.TRIANGLES] The type of primitives in the geometry.
  * @param {Uint16Array|Uint32Array} [options.indices] Optional index data that determines the primitives in the geometry.
@@ -123,7 +123,7 @@ function Geometry(options) {
    * Optional index data that - along with {@link Geometry#primitiveType} -
    * determines the primitives in the geometry.
    *
-   * @type Array
+   * @type {Array}
    *
    * @default undefined
    */
@@ -174,7 +174,7 @@ function Geometry(options) {
  * respect to the number of attributes in a vertex, not the number of vertices.
  *
  * @param {Geometry} geometry The geometry.
- * @returns {Number} The number of vertices in the geometry.
+ * @returns {number} The number of vertices in the geometry.
  *
  * @example
  * const numVertices = Cesium.Geometry.computeNumberOfVertices(geometry);
@@ -244,10 +244,10 @@ const rotation2DScratch = new Matrix2();
  * as an intermediary instead of local ENU, which is more accurate for large-area rectangles.
  *
  * @param {Cartesian3[]} positions Array of positions outlining the geometry
- * @param {Number} stRotation Texture coordinate rotation.
+ * @param {number} stRotation Texture coordinate rotation.
  * @param {Ellipsoid} ellipsoid Ellipsoid for projecting and generating local vectors.
  * @param {Rectangle} boundingRectangle Bounding rectangle around the positions.
- * @returns {Number[]} An array of 6 numbers specifying [minimum point, u extent, v extent] as points in the "cartographic" system.
+ * @returns {number[]} An array of 6 numbers specifying [minimum point, u extent, v extent] as points in the "cartographic" system.
  * @private
  */
 Geometry._textureCoordinateRotationPoints = function (

package/Source/Core/GeometryAttribute.js

@@ -10,10 +10,10 @@ import DeveloperError from "./DeveloperError.js";
  * @alias GeometryAttribute
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {ComponentDatatype} [options.componentDatatype] The datatype of each component in the attribute, e.g., individual elements in values.
- * @param {Number} [options.componentsPerAttribute] A number between 1 and 4 that defines the number of components in an attributes.
- * @param {Boolean} [options.normalize=false] When <code>true</code> and <code>componentDatatype</code> is an integer format, indicate that the components should be mapped to the range [0, 1] (unsigned) or [-1, 1] (signed) when they are accessed as floating-point for rendering.
+ * @param {number} [options.componentsPerAttribute] A number between 1 and 4 that defines the number of components in an attributes.
+ * @param {boolean} [options.normalize=false] When <code>true</code> and <code>componentDatatype</code> is an integer format, indicate that the components should be mapped to the range [0, 1] (unsigned) or [-1, 1] (signed) when they are accessed as floating-point for rendering.
  * @param {number[]|Int8Array|Uint8Array|Int16Array|Uint16Array|Int32Array|Uint32Array|Float32Array|Float64Array} [options.values] The values for the attributes stored in a typed array.
  *
  * @exception {DeveloperError} options.componentsPerAttribute must be between 1 and 4.
@@ -64,7 +64,7 @@ function GeometryAttribute(options) {
    * The datatype of each component in the attribute, e.g., individual elements in
    * {@link GeometryAttribute#values}.
    *
-   * @type ComponentDatatype
+   * @type {ComponentDatatype}
    *
    * @default undefined
    */
@@ -75,7 +75,7 @@ function GeometryAttribute(options) {
    * For example, a position attribute with x, y, and z components would have 3 as
    * shown in the code example.
    *
-   * @type Number
+   * @type {number}
    *
    * @default undefined
    *
@@ -98,7 +98,7 @@ function GeometryAttribute(options) {
    * This is commonly used when storing colors using {@link ComponentDatatype.UNSIGNED_BYTE}.
    * </p>
    *
-   * @type Boolean
+   * @type {boolean}
    *
    * @default false
    *

package/Source/Core/GeometryInstance.js

@@ -12,11 +12,11 @@ import Matrix4 from "./Matrix4.js";
  * @alias GeometryInstance
  * @constructor
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Geometry|GeometryFactory} options.geometry The geometry to instance.
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The model matrix that transforms to transform the geometry from model to world coordinates.
- * @param {Object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick} or get/set per-instance attributes with {@link Primitive#getGeometryInstanceAttributes}.
- * @param {Object} [options.attributes] Per-instance attributes like a show or color attribute shown in the example below.
+ * @param {object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick} or get/set per-instance attributes with {@link Primitive#getGeometryInstanceAttributes}.
+ * @param {object} [options.attributes] Per-instance attributes like a show or color attribute shown in the example below.
  *
  *
  * @example
@@ -83,7 +83,7 @@ function GeometryInstance(options) {
   /**
    * User-defined object returned when the instance is picked or used to get/set per-instance attributes.
    *
-   * @type Object
+   * @type {object}
    *
    * @default undefined
    *
@@ -103,7 +103,7 @@ function GeometryInstance(options) {
    * Per-instance attributes like {@link ColorGeometryInstanceAttribute} or {@link ShowGeometryInstanceAttribute}.
    * {@link Geometry} attributes varying per vertex; these attributes are constant for the entire instance.
    *
-   * @type Object
+   * @type {object}
    *
    * @default undefined
    */

package/Source/Core/GeometryInstanceAttribute.js

@@ -8,11 +8,11 @@ import DeveloperError from "./DeveloperError.js";
  * @alias GeometryInstanceAttribute
  * @constructor
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {ComponentDatatype} options.componentDatatype The datatype of each component in the attribute, e.g., individual elements in values.
- * @param {Number} options.componentsPerAttribute A number between 1 and 4 that defines the number of components in an attributes.
- * @param {Boolean} [options.normalize=false] When <code>true</code> and <code>componentDatatype</code> is an integer format, indicate that the components should be mapped to the range [0, 1] (unsigned) or [-1, 1] (signed) when they are accessed as floating-point for rendering.
- * @param {Number[]} options.value The value for the attribute.
+ * @param {number} options.componentsPerAttribute A number between 1 and 4 that defines the number of components in an attributes.
+ * @param {boolean} [options.normalize=false] When <code>true</code> and <code>componentDatatype</code> is an integer format, indicate that the components should be mapped to the range [0, 1] (unsigned) or [-1, 1] (signed) when they are accessed as floating-point for rendering.
+ * @param {number[]} options.value The value for the attribute.
  *
  * @exception {DeveloperError} options.componentsPerAttribute must be between 1 and 4.
  *
@@ -77,7 +77,7 @@ function GeometryInstanceAttribute(options) {
    * For example, a position attribute with x, y, and z components would have 3 as
    * shown in the code example.
    *
-   * @type Number
+   * @type {number}
    *
    * @default undefined
    *
@@ -99,7 +99,7 @@ function GeometryInstanceAttribute(options) {
    * This is commonly used when storing colors using {@link ComponentDatatype.UNSIGNED_BYTE}.
    * </p>
    *
-   * @type Boolean
+   * @type {boolean}
    *
    * @default false
    *
@@ -121,7 +121,7 @@ function GeometryInstanceAttribute(options) {
    * every three elements in <code>values</code> defines one attributes since
    * <code>componentsPerAttribute</code> is 3.
    *
-   * @type {Number[]}
+   * @type {number[]}
    *
    * @default undefined
    *

package/Source/Core/GeometryPipeline.js

@@ -155,8 +155,8 @@ GeometryPipeline.toWireframe = function (geometry) {
  * visualize vector attributes like normals, tangents, and bitangents.
  *
  * @param {Geometry} geometry The <code>Geometry</code> instance with the attribute.
- * @param {String} [attributeName='normal'] The name of the attribute.
- * @param {Number} [length=10000.0] The length of each line segment in meters.  This can be negative to point the vector in the opposite direction.
+ * @param {string} [attributeName='normal'] The name of the attribute.
+ * @param {number} [length=10000.0] The length of each line segment in meters.  This can be negative to point the vector in the opposite direction.
  * @returns {Geometry} A new <code>Geometry</code> instance with line segments for the vector.
  *
  * @exception {DeveloperError} geometry.attributes must have an attribute with the same name as the attributeName parameter.
@@ -228,7 +228,7 @@ GeometryPipeline.createLineSegmentsForVectors = function (
  * for matching vertex attributes and shader programs.
  *
  * @param {Geometry} geometry The geometry, which is not modified, to create the object for.
- * @returns {Object} An object with attribute name / index pairs.
+ * @returns {object} An object with attribute name / index pairs.
  *
  * @example
  * const attributeLocations = Cesium.GeometryPipeline.createAttributeLocations(geometry);
@@ -394,7 +394,7 @@ GeometryPipeline.reorderForPreVertexCache = function (geometry) {
  * is not <code>TRIANGLES</code> or the geometry does not have an <code>indices</code>, this function has no effect.
  *
  * @param {Geometry} geometry The geometry to modify.
- * @param {Number} [cacheCapacity=24] The number of vertices that can be held in the GPU's vertex cache.
+ * @param {number} [cacheCapacity=24] The number of vertices that can be held in the GPU's vertex cache.
  * @returns {Geometry} The modified <code>geometry</code> argument, with its indices reordered for the post-vertex-shader cache.
  *
  * @exception {DeveloperError} cacheCapacity must be greater than two.
@@ -601,10 +601,10 @@ const scratchProjectTo2DCartographic = new Cartographic();
  * </p>
  *
  * @param {Geometry} geometry The geometry to modify.
- * @param {String} attributeName The name of the attribute.
- * @param {String} attributeName3D The name of the attribute in 3D.
- * @param {String} attributeName2D The name of the attribute in 2D.
- * @param {Object} [projection=new GeographicProjection()] The projection to use.
+ * @param {string} attributeName The name of the attribute.
+ * @param {string} attributeName3D The name of the attribute in 3D.
+ * @param {string} attributeName2D The name of the attribute in 2D.
+ * @param {object} [projection=new GeographicProjection()] The projection to use.
  * @returns {Geometry} The modified <code>geometry</code> argument with <code>position3D</code> and <code>position2D</code> attributes.
  *
  * @exception {DeveloperError} geometry must have attribute matching the attributeName argument.
@@ -714,9 +714,9 @@ const encodedResult = {
  * </p>
  *
  * @param {Geometry} geometry The geometry to modify.
- * @param {String} attributeName The name of the attribute.
- * @param {String} attributeHighName The name of the attribute for the encoded high bits.
- * @param {String} attributeLowName The name of the attribute for the encoded low bits.
+ * @param {string} attributeName The name of the attribute.
+ * @param {string} attributeHighName The name of the attribute for the encoded high bits.
+ * @param {string} attributeLowName The name of the attribute for the encoded low bits.
  * @returns {Geometry} The modified <code>geometry</code> argument, with its encoded attribute.
  *
  * @exception {DeveloperError} geometry must have attribute matching the attributeName argument.

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,75 +31,61 @@ 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}
+   * @type {boolean}
    * @default true
    */
   this.imageryPresent = true;
 
   /**
    * True if imagery is sent as a protocol buffer, false if sent as plain images. If undefined we will try both.
-   * @type {Boolean}
+   * @type {boolean}
    * @default undefined
    */
   this.protoImagery = undefined;
 
   /**
    * True if terrain is available.
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.terrainPresent = true;
 
   /**
    * Exponent used to compute constant to calculate negative height values.
-   * @type {Number}
+   * @type {number}
    * @default 32
    */
   this.negativeAltitudeExponentBias = 32;
 
   /**
    * Threshold where any numbers smaller are actually negative values. They are multiplied by -2^negativeAltitudeExponentBias.
-   * @type {Number}
+   * @type {number}
    * @default EPSILON12
    */
   this.negativeAltitudeThreshold = CesiumMath.EPSILON12;
 
   /**
    * Dictionary of provider id to copyright strings.
-   * @type {Object}
+   * @type {object}
    * @default {}
    */
   this.providers = {};
@@ -109,32 +96,50 @@ 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, {
   /**
    * Gets the name of the Google Earth Enterprise server.
    * @memberof GoogleEarthEnterpriseMetadata.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   url: {
@@ -170,23 +175,70 @@ Object.defineProperties(GoogleEarthEnterpriseMetadata.prototype, {
   /**
    * Gets a promise that resolves to true when the metadata is ready for use.
    * @memberof GoogleEarthEnterpriseMetadata.prototype
-   * @type {Promise.<Boolean>}
+   * @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.
  *
- * @param {Number} x The tile's x coordinate.
- * @param {Number} y The tile's y coordinate.
- * @param {Number} level The tile's zoom level.
+ * @param {number} x The tile's x coordinate.
+ * @param {number} y The tile's y coordinate.
+ * @param {number} level The tile's zoom level.
  *
  * @see GoogleEarthEnterpriseMetadata#quadKeyToTileXY
  */
@@ -226,7 +278,7 @@ GoogleEarthEnterpriseMetadata.tileXYToQuadKey = function (x, y, level) {
  * Converts a tile's quadkey used to request an image from a Google Earth Enterprise server into the
  * (x, y, level) position.
  *
- * @param {String} quadkey The tile's quad key
+ * @param {string} quadkey The tile's quad key
  *
  * @see GoogleEarthEnterpriseMetadata#tileXYToQuadKey
  */
@@ -294,8 +346,8 @@ const taskProcessor = new TaskProcessor("decodeGoogleEarthEnterprisePacket");
 /**
  * Retrieves a Google Earth Enterprise quadtree packet.
  *
- * @param {String} [quadKey=''] The quadkey to retrieve the packet for.
- * @param {Number} [version=1] The cnode version to be used in the request.
+ * @param {string} [quadKey=''] The quadkey to retrieve the packet for.
+ * @param {number} [version=1] The cnode version to be used in the request.
  * @param {Request} [request] The request object. Intended for internal use only.
  *
  * @private
@@ -373,9 +425,9 @@ GoogleEarthEnterpriseMetadata.prototype.getQuadTreePacket = function (
 /**
  * Populates the metadata subtree down to the specified tile.
  *
- * @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<GoogleEarthEnterpriseTileInformation>} A promise that resolves to the tile info for the requested quad key
@@ -460,9 +512,9 @@ function populateSubtree(that, quadKey, request) {
 /**
  * Gets information about a tile
  *
- * @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 {GoogleEarthEnterpriseTileInformation|undefined} Information about the tile or undefined if it isn't loaded.
  *
  * @private
@@ -479,7 +531,7 @@ GoogleEarthEnterpriseMetadata.prototype.getTileInformation = function (
 /**
  * Gets information about a tile from a quadKey
  *
- * @param {String} quadkey The quadkey for the tile
+ * @param {string} quadkey The quadkey for the tile
  * @returns {GoogleEarthEnterpriseTileInformation|undefined} Information about the tile or undefined if it isn't loaded.
  *
  * @private