@cesium/engine 2.0.0 → 2.2.0

package/Source/DataSources/Cesium3DTilesetVisualizer.js

@@ -47,7 +47,7 @@ function Cesium3DTilesetVisualizer(scene, entityCollection) {
  * Entity counterpart at the given time.
  *
  * @param {JulianDate} time The time to update to.
- * @returns {Boolean} This function always returns true.
+ * @returns {boolean} This function always returns true.
  */
 Cesium3DTilesetVisualizer.prototype.update = function (time) {
   //>>includeStart('debug', pragmas.debug);
@@ -65,7 +65,7 @@ Cesium3DTilesetVisualizer.prototype.update = function (time) {
     const tilesetGraphics = entity._tileset;
 
     let resource;
-    let tilesetData = tilesetHash[entity.id];
+    const tilesetData = tilesetHash[entity.id];
     const show =
       entity.isShowing &&
       entity.isAvailable(time) &&
@@ -86,28 +86,21 @@ Cesium3DTilesetVisualizer.prototype.update = function (time) {
       continue;
     }
 
-    let tileset = defined(tilesetData)
+    const tileset = defined(tilesetData)
       ? tilesetData.tilesetPrimitive
       : undefined;
-    if (!defined(tileset) || resource.url !== tilesetData.url) {
+    if (!defined(tilesetData) || resource.url !== tilesetData.url) {
       if (defined(tileset)) {
         primitives.removeAndDestroy(tileset);
-        delete tilesetHash[entity.id];
       }
-      tileset = new Cesium3DTileset({
-        url: resource,
-      });
-      tileset.id = entity;
-      primitives.add(tileset);
-
-      tilesetData = {
-        tilesetPrimitive: tileset,
-        url: resource.url,
-        loadFail: false,
-      };
-      tilesetHash[entity.id] = tilesetData;
-
-      checkLoad(tileset, entity, tilesetHash);
+
+      delete tilesetHash[entity.id];
+
+      createTileset(resource, tilesetHash, entity, primitives);
+    }
+
+    if (!defined(tileset)) {
+      continue;
     }
 
     tileset.show = true;
@@ -127,7 +120,7 @@ Cesium3DTilesetVisualizer.prototype.update = function (time) {
 /**
  * Returns true if this object was destroyed; otherwise, false.
  *
- * @returns {Boolean} True if this object was destroyed; otherwise, false.
+ * @returns {boolean} True if this object was destroyed; otherwise, false.
  */
 Cesium3DTilesetVisualizer.prototype.isDestroyed = function () {
   return false;
@@ -180,12 +173,12 @@ Cesium3DTilesetVisualizer.prototype.getBoundingSphere = function (
   }
 
   const primitive = tilesetData.tilesetPrimitive;
-  if (!defined(primitive) || !primitive.show) {
-    return BoundingSphereState.FAILED;
+  if (!defined(primitive)) {
+    return BoundingSphereState.PENDING;
   }
 
-  if (!primitive.ready) {
-    return BoundingSphereState.PENDING;
+  if (!primitive.show) {
+    return BoundingSphereState.FAILED;
   }
 
   BoundingSphere.clone(primitive.boundingSphere, result);
@@ -235,15 +228,33 @@ Cesium3DTilesetVisualizer.prototype._onCollectionChanged = function (
 function removeTileset(visualizer, entity, tilesetHash, primitives) {
   const tilesetData = tilesetHash[entity.id];
   if (defined(tilesetData)) {
-    primitives.removeAndDestroy(tilesetData.tilesetPrimitive);
+    if (defined(tilesetData.tilesetPrimitive)) {
+      primitives.removeAndDestroy(tilesetData.tilesetPrimitive);
+    }
     delete tilesetHash[entity.id];
   }
 }
 
-function checkLoad(primitive, entity, tilesetHash) {
-  primitive.readyPromise.catch(function (error) {
+async function createTileset(resource, tilesetHash, entity, primitives) {
+  tilesetHash[entity.id] = {
+    url: resource.url,
+    loadFail: false,
+  };
+
+  try {
+    const tileset = await Cesium3DTileset.fromUrl(resource);
+    tileset.id = entity;
+    primitives.add(tileset);
+
+    if (!defined(tilesetHash[entity.id])) {
+      return;
+    }
+
+    tilesetHash[entity.id].tilesetPrimitive = tileset;
+  } catch (error) {
     console.error(error);
     tilesetHash[entity.id].loadFail = true;
-  });
+  }
 }
+
 export default Cesium3DTilesetVisualizer;

package/Source/DataSources/CheckerboardMaterialProperty.js

@@ -15,7 +15,7 @@ const defaultRepeat = new Cartesian2(2.0, 2.0);
  * @alias CheckerboardMaterialProperty
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {Property|Color} [options.evenColor=Color.WHITE] A Property specifying the first {@link Color}.
  * @param {Property|Color} [options.oddColor=Color.BLACK] A Property specifying the second {@link Color}.
  * @param {Property|Cartesian2} [options.repeat=new Cartesian2(2.0, 2.0)] A {@link Cartesian2} Property specifying how many times the tiles repeat in each direction.
@@ -42,7 +42,7 @@ Object.defineProperties(CheckerboardMaterialProperty.prototype, {
    * constant if getValue always returns the same result for the current definition.
    * @memberof CheckerboardMaterialProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -99,7 +99,7 @@ Object.defineProperties(CheckerboardMaterialProperty.prototype, {
  * Gets the {@link Material} type at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the type.
- * @returns {String} The type of material.
+ * @returns {string} The type of material.
  */
 CheckerboardMaterialProperty.prototype.getType = function (time) {
   return "Checkerboard";
@@ -109,8 +109,8 @@ CheckerboardMaterialProperty.prototype.getType = function (time) {
  * Gets the value of the property at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the value.
- * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
- * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+ * @param {object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+ * @returns {object} The modified result parameter or a new instance if the result parameter was not supplied.
  */
 CheckerboardMaterialProperty.prototype.getValue = function (time, result) {
   if (!defined(result)) {
@@ -137,7 +137,7 @@ CheckerboardMaterialProperty.prototype.getValue = function (time, result) {
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 CheckerboardMaterialProperty.prototype.equals = function (other) {
   return (

package/Source/DataSources/ColorMaterialProperty.js

@@ -26,7 +26,7 @@ Object.defineProperties(ColorMaterialProperty.prototype, {
    * constant if getValue always returns the same result for the current definition.
    * @memberof ColorMaterialProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -63,7 +63,7 @@ Object.defineProperties(ColorMaterialProperty.prototype, {
  * Gets the {@link Material} type at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the type.
- * @returns {String} The type of material.
+ * @returns {string} The type of material.
  */
 ColorMaterialProperty.prototype.getType = function (time) {
   return "Color";
@@ -73,8 +73,8 @@ ColorMaterialProperty.prototype.getType = function (time) {
  * Gets the value of the property at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the value.
- * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
- * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+ * @param {object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+ * @returns {object} The modified result parameter or a new instance if the result parameter was not supplied.
  */
 ColorMaterialProperty.prototype.getValue = function (time, result) {
   if (!defined(result)) {
@@ -94,7 +94,7 @@ ColorMaterialProperty.prototype.getValue = function (time, result) {
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 ColorMaterialProperty.prototype.equals = function (other) {
   return (

package/Source/DataSources/CompositeEntityCollection.js

@@ -157,7 +157,7 @@ Object.defineProperties(CompositeEntityCollection.prototype, {
    * Gets a globally unique identifier for this collection.
    * @memberof CompositeEntityCollection.prototype
    * @readonly
-   * @type {String}
+   * @type {string}
    */
   id: {
     get: function () {
@@ -193,7 +193,7 @@ Object.defineProperties(CompositeEntityCollection.prototype, {
  * Adds a collection to the composite.
  *
  * @param {EntityCollection} collection the collection to add.
- * @param {Number} [index] the index to add the collection at.  If omitted, the collection will
+ * @param {number} [index] the index to add the collection at.  If omitted, the collection will
  *                         added on top of all existing collections.
  *
  * @exception {DeveloperError} index, if supplied, must be greater than or equal to zero and less than or equal to the number of collections.
@@ -232,7 +232,7 @@ CompositeEntityCollection.prototype.addCollection = function (
  * Removes a collection from this composite, if present.
  *
  * @param {EntityCollection} collection The collection to remove.
- * @returns {Boolean} true if the collection was in the composite and was removed,
+ * @returns {boolean} true if the collection was in the composite and was removed,
  *                    false if the collection was not in the composite.
  */
 CompositeEntityCollection.prototype.removeCollection = function (collection) {
@@ -257,7 +257,7 @@ CompositeEntityCollection.prototype.removeAllCollections = function () {
  * Checks to see if the composite contains a given collection.
  *
  * @param {EntityCollection} collection the collection to check for.
- * @returns {Boolean} true if the composite contains the collection, false otherwise.
+ * @returns {boolean} true if the composite contains the collection, false otherwise.
  */
 CompositeEntityCollection.prototype.containsCollection = function (collection) {
   return this._collections.indexOf(collection) !== -1;
@@ -267,7 +267,7 @@ CompositeEntityCollection.prototype.containsCollection = function (collection) {
  * Returns true if the provided entity is in this collection, false otherwise.
  *
  * @param {Entity} entity The entity.
- * @returns {Boolean} true if the provided entity is in this collection, false otherwise.
+ * @returns {boolean} true if the provided entity is in this collection, false otherwise.
  */
 CompositeEntityCollection.prototype.contains = function (entity) {
   return this._composite.contains(entity);
@@ -277,7 +277,7 @@ CompositeEntityCollection.prototype.contains = function (entity) {
  * Determines the index of a given collection in the composite.
  *
  * @param {EntityCollection} collection The collection to find the index of.
- * @returns {Number} The index of the collection in the composite, or -1 if the collection does not exist in the composite.
+ * @returns {number} The index of the collection in the composite, or -1 if the collection does not exist in the composite.
  */
 CompositeEntityCollection.prototype.indexOfCollection = function (collection) {
   return this._collections.indexOf(collection);
@@ -286,7 +286,7 @@ CompositeEntityCollection.prototype.indexOfCollection = function (collection) {
 /**
  * Gets a collection by index from the composite.
  *
- * @param {Number} index the index to retrieve.
+ * @param {number} index the index to retrieve.
  */
 CompositeEntityCollection.prototype.getCollection = function (index) {
   //>>includeStart('debug', pragmas.debug);
@@ -462,7 +462,7 @@ CompositeEntityCollection.prototype.computeAvailability = function () {
 /**
  * Gets an entity with the specified id.
  *
- * @param {String} id The id of the entity to retrieve.
+ * @param {string} id The id of the entity to retrieve.
  * @returns {Entity|undefined} The entity with the provided id or undefined if the id did not exist in the collection.
  */
 CompositeEntityCollection.prototype.getById = function (id) {

package/Source/DataSources/CompositeMaterialProperty.js

@@ -25,7 +25,7 @@ Object.defineProperties(CompositeMaterialProperty.prototype, {
    * constant if getValue always returns the same result for the current definition.
    * @memberof CompositeMaterialProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -64,7 +64,7 @@ Object.defineProperties(CompositeMaterialProperty.prototype, {
  * Gets the {@link Material} type at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the type.
- * @returns {String} The type of material.
+ * @returns {string} The type of material.
  */
 CompositeMaterialProperty.prototype.getType = function (time) {
   //>>includeStart('debug', pragmas.debug);
@@ -86,8 +86,8 @@ CompositeMaterialProperty.prototype.getType = function (time) {
  * Gets the value of the property at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the value.
- * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
- * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+ * @param {object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+ * @returns {object} The modified result parameter or a new instance if the result parameter was not supplied.
  */
 CompositeMaterialProperty.prototype.getValue = function (time, result) {
   //>>includeStart('debug', pragmas.debug);
@@ -110,7 +110,7 @@ CompositeMaterialProperty.prototype.getValue = function (time, result) {
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 CompositeMaterialProperty.prototype.equals = function (other) {
   return (

package/Source/DataSources/CompositePositionProperty.js

@@ -30,7 +30,7 @@ Object.defineProperties(CompositePositionProperty.prototype, {
    * constant if getValue always returns the same result for the current definition.
    * @memberof CompositePositionProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -129,7 +129,7 @@ CompositePositionProperty.prototype.getValueInReferenceFrame = function (
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 CompositePositionProperty.prototype.equals = function (other) {
   return (

package/Source/DataSources/CompositeProperty.js

@@ -68,7 +68,7 @@ Object.defineProperties(CompositeProperty.prototype, {
    * constant if getValue always returns the same result for the current definition.
    * @memberof CompositeProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -107,8 +107,8 @@ Object.defineProperties(CompositeProperty.prototype, {
  * Gets the value of the property at the provided time.
  *
  * @param {JulianDate} time The time for which to retrieve the value.
- * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
- * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+ * @param {object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+ * @returns {object} The modified result parameter or a new instance if the result parameter was not supplied.
  */
 CompositeProperty.prototype.getValue = function (time, result) {
   //>>includeStart('debug', pragmas.debug);
@@ -129,7 +129,7 @@ CompositeProperty.prototype.getValue = function (time, result) {
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 CompositeProperty.prototype.equals = function (other) {
   return (

package/Source/DataSources/ConstantPositionProperty.js

@@ -28,7 +28,7 @@ Object.defineProperties(ConstantPositionProperty.prototype, {
    * constant if getValue always returns the same result for the current definition.
    * @memberof ConstantPositionProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -69,8 +69,8 @@ Object.defineProperties(ConstantPositionProperty.prototype, {
  * Gets the value of the property at the provided time in the fixed frame.
  *
  * @param {JulianDate} time The time for which to retrieve the value.
- * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
- * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+ * @param {object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+ * @returns {object} The modified result parameter or a new instance if the result parameter was not supplied.
  */
 ConstantPositionProperty.prototype.getValue = function (time, result) {
   return this.getValueInReferenceFrame(time, ReferenceFrame.FIXED, result);
@@ -133,7 +133,7 @@ ConstantPositionProperty.prototype.getValueInReferenceFrame = function (
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 ConstantPositionProperty.prototype.equals = function (other) {
   return (

package/Source/DataSources/ConstantProperty.js

@@ -25,7 +25,7 @@ Object.defineProperties(ConstantProperty.prototype, {
    * This property always returns <code>true</code>.
    * @memberof ConstantProperty.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   isConstant: {
@@ -51,8 +51,8 @@ Object.defineProperties(ConstantProperty.prototype, {
  * Gets the value of the property.
  *
  * @param {JulianDate} [time] The time for which to retrieve the value.  This parameter is unused since the value does not change with respect to time.
- * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
- * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+ * @param {object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+ * @returns {object} The modified result parameter or a new instance if the result parameter was not supplied.
  */
 ConstantProperty.prototype.getValue = function (time, result) {
   return this._hasClone ? this._value.clone(result) : this._value;
@@ -85,7 +85,7 @@ ConstantProperty.prototype.setValue = function (value) {
  * <code>true</code> if they are equal, <code>false</code> otherwise.
  *
  * @param {Property} [other] The other property.
- * @returns {Boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if left and right are equal, <code>false</code> otherwise.
  */
 ConstantProperty.prototype.equals = function (other) {
   return (
@@ -108,7 +108,7 @@ ConstantProperty.prototype.valueOf = function () {
 /**
  * Creates a string representing this property's value.
  *
- * @returns {String} A string representing the property's value.
+ * @returns {string} A string representing the property's value.
  */
 ConstantProperty.prototype.toString = function () {
   return String(this._value);

package/Source/DataSources/CorridorGraphics.js

@@ -6,7 +6,7 @@ import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor
 import createPropertyDescriptor from "./createPropertyDescriptor.js";
 
 /**
- * @typedef {Object} CorridorGraphics.ConstructorOptions
+ * @typedef {object} CorridorGraphics.ConstructorOptions
  *
  * Initialization options for the CorridorGraphics constructor
  *

package/Source/DataSources/CustomDataSource.js

@@ -11,7 +11,7 @@ import EntityCollection from "./EntityCollection.js";
  * @alias CustomDataSource
  * @constructor
  *
- * @param {String} [name] A human-readable name for this instance.
+ * @param {string} [name] A human-readable name for this instance.
  *
  * @example
  * const dataSource = new Cesium.CustomDataSource('myData');
@@ -40,7 +40,7 @@ Object.defineProperties(CustomDataSource.prototype, {
   /**
    * Gets or sets a human-readable name for this instance.
    * @memberof CustomDataSource.prototype
-   * @type {String}
+   * @type {string}
    */
   name: {
     get: function () {
@@ -82,7 +82,7 @@ Object.defineProperties(CustomDataSource.prototype, {
   /**
    * Gets or sets whether the data source is currently loading data.
    * @memberof CustomDataSource.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   isLoading: {
     get: function () {
@@ -125,7 +125,7 @@ Object.defineProperties(CustomDataSource.prototype, {
   /**
    * Gets whether or not this data source should be displayed.
    * @memberof CustomDataSource.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   show: {
     get: function () {
@@ -164,7 +164,7 @@ Object.defineProperties(CustomDataSource.prototype, {
  * If implemented, update will be called by {@link DataSourceDisplay} once a frame.
  *
  * @param {JulianDate} time The simulation time.
- * @returns {Boolean} True if this data source is ready to be displayed at the provided time, false otherwise.
+ * @returns {boolean} True if this data source is ready to be displayed at the provided time, false otherwise.
  */
 CustomDataSource.prototype.update = function (time) {
   return true;

package/Source/DataSources/CylinderGraphics.js

@@ -6,7 +6,7 @@ import createMaterialPropertyDescriptor from "./createMaterialPropertyDescriptor
 import createPropertyDescriptor from "./createPropertyDescriptor.js";
 
 /**
- * @typedef {Object} CylinderGraphics.ConstructorOptions
+ * @typedef {object} CylinderGraphics.ConstructorOptions
  *
  * Initialization options for the CylinderGraphics constructor
  *

package/Source/DataSources/CzmlDataSource.js

@@ -4824,7 +4824,7 @@ function DocumentPacket() {
 }
 
 /**
- * @typedef {Object} CzmlDataSource.LoadOptions
+ * @typedef {object} CzmlDataSource.LoadOptions
  *
  * Initialization options for the <code>load</code> method.
  *
@@ -4837,7 +4837,7 @@ function DocumentPacket() {
  * @alias CzmlDataSource
  * @constructor
  *
- * @param {String} [name] An optional name for the data source.  This value will be overwritten if a loaded document contains a name.
+ * @param {string} [name] An optional name for the data source.  This value will be overwritten if a loaded document contains a name.
  *
  * @demo {@link https://sandcastle.cesium.com/index.html?src=CZML.html|Cesium Sandcastle CZML Demo}
  */
@@ -4859,10 +4859,10 @@ function CzmlDataSource(name) {
 /**
  * Creates a Promise to a new instance loaded with the provided CZML data.
  *
- * @param {Resource|String|Object} czml A url or CZML object to be processed.
+ * @param {Resource|string|object} czml A url or CZML object to be processed.
  * @param {CzmlDataSource.LoadOptions} [options] An object specifying configuration options
  *
- * @returns {Promise.<CzmlDataSource>} A promise that resolves to the new instance once the data is processed.
+ * @returns {Promise<CzmlDataSource>} A promise that resolves to the new instance once the data is processed.
  */
 CzmlDataSource.load = function (czml, options) {
   return new CzmlDataSource().load(czml, options);
@@ -4872,7 +4872,7 @@ Object.defineProperties(CzmlDataSource.prototype, {
   /**
    * Gets a human-readable name for this instance.
    * @memberof CzmlDataSource.prototype
-   * @type {String}
+   * @type {string}
    */
   name: {
     get: function () {
@@ -4904,7 +4904,7 @@ Object.defineProperties(CzmlDataSource.prototype, {
   /**
    * Gets a value indicating if the data source is currently loading data.
    * @memberof CzmlDataSource.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   isLoading: {
     get: function () {
@@ -4944,7 +4944,7 @@ Object.defineProperties(CzmlDataSource.prototype, {
   /**
    * Gets whether or not this data source should be displayed.
    * @memberof CzmlDataSource.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   show: {
     get: function () {
@@ -4993,7 +4993,7 @@ Object.defineProperties(CzmlDataSource.prototype, {
  * collection based on the provided CZML packet.
  *
  * @param {Entity} entity
- * @param {Object} packet
+ * @param {object} packet
  * @param {EntityCollection} entityCollection
  * @param {string} sourceUri
  */
@@ -5001,7 +5001,7 @@ Object.defineProperties(CzmlDataSource.prototype, {
 /**
  * Gets the array of CZML processing functions.
  * @memberof CzmlDataSource
- * @type {Array.<CzmlDataSource.UpdaterFunction>}
+ * @type {CzmlDataSource.UpdaterFunction[]}
  */
 CzmlDataSource.updaters = [
   processBillboard, //
@@ -5032,10 +5032,10 @@ CzmlDataSource.updaters = [
 /**
  * Processes the provided url or CZML object without clearing any existing data.
  *
- * @param {Resource|String|Object} czml A url or CZML object to be processed.
+ * @param {Resource|string|object} czml A url or CZML object to be processed.
  * @param {CzmlDataSource.LoadOptions} [options] An object specifying configuration options
  *
- * @returns {Promise.<CzmlDataSource>} A promise that resolves to this instances once the data is processed.
+ * @returns {Promise<CzmlDataSource>} A promise that resolves to this instances once the data is processed.
  */
 CzmlDataSource.prototype.process = function (czml, options) {
   return load(this, czml, options, false);
@@ -5044,10 +5044,10 @@ CzmlDataSource.prototype.process = function (czml, options) {
 /**
  * Loads the provided url or CZML object, replacing any existing data.
  *
- * @param {Resource|String|Object} czml A url or CZML object to be processed.
+ * @param {Resource|string|object} czml A url or CZML object to be processed.
  * @param {CzmlDataSource.LoadOptions} [options] An object specifying configuration options
  *
- * @returns {Promise.<CzmlDataSource>} A promise that resolves to this instances once the data is processed.
+ * @returns {Promise<CzmlDataSource>} A promise that resolves to this instances once the data is processed.
  */
 CzmlDataSource.prototype.load = function (czml, options) {
   return load(this, czml, options, true);
@@ -5060,7 +5060,7 @@ CzmlDataSource.prototype.load = function (czml, options) {
  * If implemented, update will be called by {@link DataSourceDisplay} once a frame.
  *
  * @param {JulianDate} time The simulation time.
- * @returns {Boolean} True if this data source is ready to be displayed at the provided time, false otherwise.
+ * @returns {boolean} True if this data source is ready to be displayed at the provided time, false otherwise.
  */
 CzmlDataSource.prototype.update = function (time) {
   return true;
@@ -5072,11 +5072,11 @@ CzmlDataSource.prototype.update = function (time) {
  * @function
  *
  * @param {Function} type The constructor function for the property being processed.
- * @param {Object} object The object on which the property will be added or updated.
- * @param {String} propertyName The name of the property on the object.
- * @param {Object} packetData The CZML packet being processed.
+ * @param {object} object The object on which the property will be added or updated.
+ * @param {string} propertyName The name of the property on the object.
+ * @param {object} packetData The CZML packet being processed.
  * @param {TimeInterval} interval A constraining interval for which the data is valid.
- * @param {String} sourceUri The originating uri of the data being processed.
+ * @param {string} sourceUri The originating uri of the data being processed.
  * @param {EntityCollection} entityCollection The collection being processsed.
  */
 CzmlDataSource.processPacketData = processPacketData;
@@ -5086,11 +5086,11 @@ CzmlDataSource.processPacketData = processPacketData;
  * which creates or updates a {@link PositionProperty} from a CZML packet.
  * @function
  *
- * @param {Object} object The object on which the property will be added or updated.
- * @param {String} propertyName The name of the property on the object.
- * @param {Object} packetData The CZML packet being processed.
+ * @param {object} object The object on which the property will be added or updated.
+ * @param {string} propertyName The name of the property on the object.
+ * @param {object} packetData The CZML packet being processed.
  * @param {TimeInterval} interval A constraining interval for which the data is valid.
- * @param {String} sourceUri The originating uri of the data being processed.
+ * @param {string} sourceUri The originating uri of the data being processed.
  * @param {EntityCollection} entityCollection The collection being processsed.
  */
 CzmlDataSource.processPositionPacketData = processPositionPacketData;
@@ -5100,11 +5100,11 @@ CzmlDataSource.processPositionPacketData = processPositionPacketData;
  * which creates or updates a {@link MaterialProperty} from a CZML packet.
  * @function
  *
- * @param {Object} object The object on which the property will be added or updated.
- * @param {String} propertyName The name of the property on the object.
- * @param {Object} packetData The CZML packet being processed.
+ * @param {object} object The object on which the property will be added or updated.
+ * @param {string} propertyName The name of the property on the object.
+ * @param {object} packetData The CZML packet being processed.
  * @param {TimeInterval} interval A constraining interval for which the data is valid.
- * @param {String} sourceUri The originating uri of the data being processed.
+ * @param {string} sourceUri The originating uri of the data being processed.
  * @param {EntityCollection} entityCollection The collection being processsed.
  */
 CzmlDataSource.processMaterialPacketData = processMaterialPacketData;