@cesium/engine 2.0.0 → 2.2.0

package/Source/Scene/I3SDataProvider.js

@@ -51,59 +51,77 @@ import Cartographic from "../Core/Cartographic.js";
 import Check from "../Core/Check.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 HeightmapEncoding from "../Core/HeightmapEncoding.js";
 import Resource from "../Core/Resource.js";
+import RuntimeError from "../Core/RuntimeError.js";
 import TaskProcessor from "../Core/TaskProcessor.js";
 import WebMercatorProjection from "../Core/WebMercatorProjection.js";
 import I3SLayer from "./I3SLayer.js";
 import Lerc from "lerc";
 import Rectangle from "../Core/Rectangle.js";
 
+/**
+ * @typedef {Object} I3SDataProvider.ConstructorOptions
+ *
+ * Initialization options for the I3SDataProvider constructor
+ *
+ * @property {Resource|string} [url] The url of the I3S dataset. Deprecated.
+ * @property {string} [name] The name of the I3S dataset.
+ * @property {boolean} [show=true] Determines if the dataset will be shown.
+ * @property {ArcGISTiledElevationTerrainProvider|Promise<ArcGISTiledElevationTerrainProvider>} [geoidTiledTerrainProvider] Tiled elevation provider describing an Earth Gravitational Model. If defined, geometry will be shifted based on the offsets given by this provider. Required to position I3S data sets with gravity-related height at the correct location.
+ * @property {boolean} [traceFetches=false] Debug option. When true, log a message whenever an I3S tile is fetched.
+ * @property {Cesium3DTileset.ConstructorOptions} [cesium3dTilesetOptions] Object containing options to pass to an internally created {@link Cesium3DTileset}. See {@link Cesium3DTileset} for list of valid properties. All options can be used with the exception of <code>url</code> and <code>show</code> which are overridden by values from I3SDataProvider.
+ */
+
 /**
  * An I3SDataProvider is the main public class for I3S support. The url option
  * should return a scene object. Currently supported I3S versions are 1.6 and
  * 1.7/1.8 (OGC I3S 1.2). I3SFeature and I3SNode classes implement the
  * Object Model for I3S entities, with public interfaces.
  *
+ * <div class="notice">
+ * This object is normally not instantiated directly, use {@link I3SDataProvider.fromUrl}.
+ * </div>
+ *
  * @alias I3SDataProvider
  * @constructor
  *
- * @param {Object} options Object with the following properties:
- * @param {Resource|String} options.url The url of the I3S dataset.
- * @param {String} [options.name] The name of the I3S dataset.
- * @param {Boolean} [options.show=true] Determines if the dataset will be shown.
- * @param {ArcGISTiledElevationTerrainProvider} [options.geoidTiledTerrainProvider] Tiled elevation provider describing an Earth Gravitational Model. If defined, geometry will be shifted based on the offsets given by this provider. Required to position I3S data sets with gravity-related height at the correct location.
- * @param {Boolean} [options.traceFetches=false] Debug option. When true, log a message whenever an I3S tile is fetched.
- * @param {Object} [options.cesium3dTilesetOptions] Object containing options to pass to an internally created {@link Cesium3DTileset}. See {@link Cesium3DTileset} for list of valid properties. All options can be used with the exception of <code>url</code> and <code>show</code> which are overridden by values from I3SDataProvider.
+ * @param {I3SDataProvider.ConstructorOptions} options An object describing initialization options
+ *
+ * @see I3SDataProvider.fromUrl
+ * @see ArcGISTiledElevationTerrainProvider
  *
  * @example
- * const i3sData = new I3SDataProvider({
- *   url: 'https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/Frankfurt2017_vi3s_18/SceneServer/layers/0'
- * });
- * viewer.scene.primitives.add(i3sData);
+ * try {
+ *   const i3sData = await I3SDataProvider.fromUrl(
+ *     "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/Frankfurt2017_vi3s_18/SceneServer/layers/0"
+ *   );
+ *   viewer.scene.primitives.add(i3sData);
+ * } catch (error) {
+ *   console.log(`There was an error creating the I3S Data Provider: ${error}`);
+ * }
  *
  * @example
- * const geoidService = new Cesium.ArcGISTiledElevationTerrainProvider({
- *   url: "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/EGM2008/ImageServer",
- * });
- * let i3sData = new I3SDataProvider({
- *   url: 'https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/Frankfurt2017_vi3s_18/SceneServer/layers/0',
- *   geoidTiledTerrainProvider: geoidService
- * });
- * viewer.scene.primitives.add(i3sData);
+ * try {
+ *   const geoidService = await Cesium.ArcGISTiledElevationTerrainProvider.fromUrl(
+ *     "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/EGM2008/ImageServer"
+ *   );
+ *   const i3sData = await I3SDataProvider.fromUrl(
+ *     "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/Frankfurt2017_vi3s_18/SceneServer/layers/0", {
+ *       geoidTiledTerrainProvider: geoidService
+ *   });
+ *   viewer.scene.primitives.add(i3sData);
+ * } catch (error) {
+ *   console.log(`There was an error creating the I3S Data Provider: ${error}`);
+ * }
  */
 function I3SDataProvider(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
-  //>>includeStart('debug', pragmas.debug);
-  Check.defined("options.url", options.url);
-  //>>includeEnd('debug');
-
   // All public configuration is defined as ES5 properties
   // These are just the "private" variables and their defaults.
-  this._resource = Resource.createIfNeeded(options.url);
   this._name = options.name;
   this._show = defaultValue(options.show, true);
   this._geoidTiledTerrainProvider = options.geoidTiledTerrainProvider;
@@ -117,20 +135,29 @@ function I3SDataProvider(options) {
   this._layers = [];
   this._data = undefined;
   this._extent = undefined;
-  this._geoidDataIsReadyPromise = undefined;
+  this._geoidDataPromise = undefined;
   this._geoidDataList = undefined;
   this._decoderTaskProcessor = undefined;
-  this._readyPromise = undefined;
-  this._ready = false;
+  this._taskProcessorReadyPromise = undefined;
+
+  if (defined(options.url)) {
+    deprecationWarning(
+      "I3SDataProvider options.url",
+      "I3SDataProvider constructor parameter options.url was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use I3SDataProvider.fromUrl instead."
+    );
+    this._readyPromise = undefined;
+    this._ready = false;
 
-  this._load();
+    this._resource = Resource.createIfNeeded(options.url);
+    this._load();
+  }
 }
 
 Object.defineProperties(I3SDataProvider.prototype, {
   /**
    * Gets a human-readable name for this dataset.
    * @memberof I3SDataProvider.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   name: {
@@ -142,7 +169,7 @@ Object.defineProperties(I3SDataProvider.prototype, {
   /**
    * Determines if the dataset will be shown.
    * @memberof I3SDataProvider.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   show: {
     get: function () {
@@ -165,7 +192,7 @@ Object.defineProperties(I3SDataProvider.prototype, {
   /**
    * Gets or sets debugging and tracing of I3S fetches.
    * @memberof I3SDataProvider.prototype
-   * @type {Boolean}
+   * @type {boolean}
    */
   traceFetches: {
     get: function () {
@@ -200,14 +227,6 @@ Object.defineProperties(I3SDataProvider.prototype, {
    */
   layers: {
     get: function () {
-      //>>includeStart('debug', pragmas.debug);
-      if (!this.ready) {
-        throw new DeveloperError(
-          "The dataset is not loaded. Use I3SDataProvider.readyPromise or wait for I3SDataProvider.ready to be true."
-        );
-      }
-      //>>includeEnd('debug');
-
       return this._layers;
     },
   },
@@ -215,19 +234,11 @@ Object.defineProperties(I3SDataProvider.prototype, {
   /**
    * Gets the I3S data for this object.
    * @memberof I3SDataProvider.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   data: {
     get: function () {
-      //>>includeStart('debug', pragmas.debug);
-      if (!this.ready) {
-        throw new DeveloperError(
-          "The dataset is not loaded. Use I3SDataProvider.readyPromise or wait for I3SDataProvider.ready to be true."
-        );
-      }
-      //>>includeEnd('debug');
-
       return this._data;
     },
   },
@@ -240,14 +251,6 @@ Object.defineProperties(I3SDataProvider.prototype, {
    */
   extent: {
     get: function () {
-      //>>includeStart('debug', pragmas.debug);
-      if (!this.ready) {
-        throw new DeveloperError(
-          "The dataset is not loaded. Use I3SDataProvider.readyPromise or wait for I3SDataProvider.ready to be true."
-        );
-      }
-      //>>includeEnd('debug');
-
       return this._extent;
     },
   },
@@ -255,11 +258,16 @@ Object.defineProperties(I3SDataProvider.prototype, {
   /**
    * Gets the promise that will be resolved when the I3S scene is loaded.
    * @memberof I3SDataProvider.prototype
-   * @type {Promise.<I3SDataProvider>}
+   * @type {Promise<I3SDataProvider>}
    * @readonly
+   * @deprecated
    */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "I3SDataProvider.readyPromise",
+        "I3SDataProvider.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use I3SDataProvider.fromUrl instead."
+      );
       return this._readyPromise;
     },
   },
@@ -268,11 +276,16 @@ Object.defineProperties(I3SDataProvider.prototype, {
    * When <code>true</code>, the I3S scene is loaded.
    * This is set to <code>true</code> right before {@link I3SDataProvider#readyPromise} is resolved.
    * @memberof I3SDataProvider.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
+   * @deprecated
    */
   ready: {
     get: function () {
+      deprecationWarning(
+        "I3SDataProvider.ready",
+        "I3SDataProvider.ready was deprecated in CesiumJS 1.104. It will be removed in 1.107. Use I3SDataProvider.fromUrl instead."
+      );
       return this._ready;
     },
   },
@@ -320,7 +333,7 @@ I3SDataProvider.prototype.destroy = function () {
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  * </p>
  *
- * @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 I3SDataProvider#destroy
  */
@@ -333,9 +346,7 @@ I3SDataProvider.prototype.isDestroyed = function () {
  */
 I3SDataProvider.prototype.update = function (frameState) {
   for (let i = 0; i < this._layers.length; i++) {
-    // Reintroducing tileset.ready check to prevent random failures
-    // when initially loading the tileset
-    if (defined(this._layers[i]._tileset) && this._layers[i]._tileset.ready) {
+    if (defined(this._layers[i]._tileset)) {
       this._layers[i]._tileset.update(frameState);
     }
   }
@@ -346,7 +357,7 @@ I3SDataProvider.prototype.update = function (frameState) {
  */
 I3SDataProvider.prototype.prePassesUpdate = function (frameState) {
   for (let i = 0; i < this._layers.length; i++) {
-    if (defined(this._layers[i]._tileset) && this._layers[i]._tileset.ready) {
+    if (defined(this._layers[i]._tileset)) {
       this._layers[i]._tileset.prePassesUpdate(frameState);
     }
   }
@@ -357,7 +368,7 @@ I3SDataProvider.prototype.prePassesUpdate = function (frameState) {
  */
 I3SDataProvider.prototype.postPassesUpdate = function (frameState) {
   for (let i = 0; i < this._layers.length; i++) {
-    if (defined(this._layers[i]._tileset) && this._layers[i]._tileset.ready) {
+    if (defined(this._layers[i]._tileset)) {
       this._layers[i]._tileset.postPassesUpdate(frameState);
     }
   }
@@ -368,40 +379,113 @@ I3SDataProvider.prototype.postPassesUpdate = function (frameState) {
  */
 I3SDataProvider.prototype.updateForPass = function (frameState, passState) {
   for (let i = 0; i < this._layers.length; i++) {
-    if (defined(this._layers[i]._tileset) && this._layers[i]._tileset.ready) {
+    if (defined(this._layers[i]._tileset)) {
       this._layers[i]._tileset.updateForPass(frameState, passState);
     }
   }
 };
 
+/**
+ * Creates an I3SDataProvider. Currently supported I3S versions are 1.6 and
+ * 1.7/1.8 (OGC I3S 1.2).
+ *
+ * @param {string|Resource} url The url of the I3S dataset, which should return an I3S scene object
+ * @param {I3SDataProvider.ConstructorOptions} options An object describing initialization options
+ * @returns {Promise<I3SDataProvider>}
+ *
+ * @example
+ * try {
+ *   const i3sData = await I3SDataProvider.fromUrl(
+ *     "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/Frankfurt2017_vi3s_18/SceneServer/layers/0"
+ *   );
+ *   viewer.scene.primitives.add(i3sData);
+ * } catch (error) {
+ *   console.log(`There was an error creating the I3S Data Provider: ${error}`);
+ * }
+ *
+ * @example
+ * try {
+ *   const geoidService = await Cesium.ArcGISTiledElevationTerrainProvider.fromUrl(
+ *     "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/EGM2008/ImageServer"
+ *   );
+ *   const i3sData = await I3SDataProvider.fromUrl(
+ *     "https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/Frankfurt2017_vi3s_18/SceneServer/layers/0", {
+ *       geoidTiledTerrainProvider: geoidService
+ *   });
+ *   viewer.scene.primitives.add(i3sData);
+ * } catch (error) {
+ *   console.log(`There was an error creating the I3S Data Provider: ${error}`);
+ * }
+ */
+I3SDataProvider.fromUrl = async function (url, options) {
+  //>>includeStart('debug', pragmas.debug);
+  Check.defined("url", url);
+  //>>includeEnd('debug');
+
+  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+
+  const resource = Resource.createIfNeeded(url);
+  const data = await I3SDataProvider.loadJson(resource);
+
+  const provider = new I3SDataProvider(options);
+  provider._resource = resource;
+  provider._data = data;
+
+  // Success
+  if (defined(data.layers)) {
+    for (let layerIndex = 0; layerIndex < data.layers.length; layerIndex++) {
+      const newLayer = new I3SLayer(
+        provider,
+        data.layers[layerIndex],
+        layerIndex
+      );
+      provider._layers.push(newLayer);
+    }
+  } else {
+    const newLayer = new I3SLayer(provider, data, data.id);
+    provider._layers.push(newLayer);
+  }
+
+  provider._computeExtent();
+
+  // Start loading all of the tiles
+  const layerPromises = [];
+  for (let i = 0; i < provider._layers.length; i++) {
+    layerPromises.push(provider._layers[i].load());
+  }
+
+  await Promise.all(layerPromises);
+  provider._ready = true;
+  provider._readyPromise = Promise.resolve(provider);
+  return provider;
+};
+
 /**
  * @private
  */
 I3SDataProvider.prototype._load = function () {
   const that = this;
-  this._readyPromise = this._loadJson(this._resource).then(function (data) {
+  this._readyPromise = I3SDataProvider.loadJson(
+    this._resource,
+    this._traceFetches
+  ).then(function (data) {
     // Success
     that._data = data;
-    if (defined(that._data.layers)) {
-      for (
-        let layerIndex = 0;
-        layerIndex < that._data.layers.length;
-        layerIndex++
-      ) {
+    if (defined(data.layers)) {
+      for (let layerIndex = 0; layerIndex < data.layers.length; layerIndex++) {
         const newLayer = new I3SLayer(
           that,
-          that._data.layers[layerIndex],
+          data.layers[layerIndex],
           layerIndex
         );
         that._layers.push(newLayer);
       }
     } else {
-      const newLayer = new I3SLayer(that, that._data, that._data.id);
+      const newLayer = new I3SLayer(that, data, data.id);
       that._layers.push(newLayer);
     }
 
     that._computeExtent();
-    that._loadGeoidData();
 
     // Start loading all of the tiles
     const layerPromises = [];
@@ -427,27 +511,32 @@ I3SDataProvider._fetchJson = function (resource) {
 
 /**
  * @private
+ *
+ * @param {Resource} resource The JSON resource to request
+ * @param {boolean} [trace=false] Log the resource
+ * @returns {Promise<object>} The fetched data
  */
-I3SDataProvider.prototype._loadJson = function (resource) {
-  if (this._traceFetches) {
+I3SDataProvider.loadJson = async function (resource, trace) {
+  if (trace) {
     console.log("I3S FETCH:", resource.url);
   }
 
-  return I3SDataProvider._fetchJson(resource).then(function (data) {
-    if (defined(data.error)) {
-      console.error("Failed to fetch I3S ", resource.url);
-      if (defined(data.error.message)) {
-        console.error(data.error.message);
-      }
-      if (defined(data.error.details)) {
-        for (let i = 0; i < data.error.details.length; i++) {
-          console.log(data.error.details[i]);
-        }
+  const data = await I3SDataProvider._fetchJson(resource);
+  if (defined(data.error)) {
+    console.error("Failed to fetch I3S ", resource.url);
+    if (defined(data.error.message)) {
+      console.error(data.error.message);
+    }
+    if (defined(data.error.details)) {
+      for (let i = 0; i < data.error.details.length; i++) {
+        console.log(data.error.details[i]);
       }
-      return Promise.reject(data.error);
     }
-    return data;
-  });
+
+    throw new RuntimeError(data.error);
+  }
+
+  return data;
 };
 
 /**
@@ -496,25 +585,32 @@ I3SDataProvider.prototype._binarizeGltf = function (rawGltf) {
 
 /**
  * @private
+ * @returns {Promise<TaskProcessor>}
  */
-I3SDataProvider.prototype._getDecoderTaskProcessor = function () {
+I3SDataProvider.prototype.getDecoderTaskProcessor = function () {
+  if (defined(this._taskProcessorReadyPromise)) {
+    return this._taskProcessorReadyPromise;
+  }
+
   if (!defined(this._decoderTaskProcessor)) {
     const processor = new TaskProcessor("decodeI3S");
-    this._taskProcessorReadyPromise = processor.initWebAssemblyModule({
-      modulePath: "ThirdParty/Workers/draco_decoder_nodejs.js",
-      wasmBinaryFile: "ThirdParty/draco_decoder.wasm",
-    });
+    this._taskProcessorReadyPromise = processor
+      .initWebAssemblyModule({
+        modulePath: "ThirdParty/Workers/draco_decoder_nodejs.js",
+        wasmBinaryFile: "ThirdParty/draco_decoder.wasm",
+      })
+      .then(() => {
+        return processor;
+      });
 
     this._decoderTaskProcessor = processor;
   }
 
-  return this._decoderTaskProcessor;
+  return this._taskProcessorReadyPromise;
 };
 
 function getCoveredTiles(terrainProvider, extent) {
-  return terrainProvider.readyPromise.then(function () {
-    return getTiles(terrainProvider, extent);
-  });
+  return getTiles(terrainProvider, extent);
 }
 
 const scratchCartesian2 = new Cartesian2();
@@ -614,35 +710,40 @@ function getTiles(terrainProvider, extent) {
   });
 }
 
-/**
- * @private
- */
-I3SDataProvider.prototype._loadGeoidData = function () {
+async function loadGeoidData(provider) {
   // Load tiles from arcgis
-  const that = this;
-  const geoidTerrainProvider = this._geoidTiledTerrainProvider;
+  const geoidTerrainProvider = provider._geoidTiledTerrainProvider;
 
   if (!defined(geoidTerrainProvider)) {
     console.log(
       "No Geoid Terrain service provided - no geoid conversion will be performed."
     );
-    this._geoidDataIsReadyPromise = Promise.resolve();
-    return this._geoidDataIsReadyPromise;
+    return;
   }
 
-  this._geoidDataIsReadyPromise = geoidTerrainProvider.readyPromise.then(
-    function () {
-      const tilesReadyPromise = getCoveredTiles(
-        geoidTerrainProvider,
-        that._extent
-      );
-      return tilesReadyPromise.then(function (heightMaps) {
-        that._geoidDataList = heightMaps;
-      });
-    }
-  );
+  try {
+    const heightMaps = await getCoveredTiles(
+      geoidTerrainProvider,
+      provider._extent
+    );
+    provider._geoidDataList = heightMaps;
+  } catch (error) {
+    console.log(
+      "Error retrieving Geoid Terrain tiles - no geoid conversion will be performed."
+    );
+  }
+}
+
+/**
+ * @private
+ */
+I3SDataProvider.prototype.loadGeoidData = async function () {
+  if (defined(this._geoidDataPromise)) {
+    return this._geoidDataPromise;
+  }
 
-  return this._geoidDataIsReadyPromise;
+  this._geoidDataPromise = loadGeoidData(this);
+  return this._geoidDataPromise;
 };
 
 /**

package/Source/Scene/I3SFeature.js

@@ -1,4 +1,5 @@
 import defined from "../Core/defined.js";
+import I3SDataProvider from "./I3SDataProvider.js";
 
 /**
  * This class implements an I3S Feature.
@@ -37,7 +38,7 @@ Object.defineProperties(I3SFeature.prototype, {
   /**
    * Gets the I3S data for this object.
    * @memberof I3SFeature.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   data: {
@@ -52,12 +53,12 @@ Object.defineProperties(I3SFeature.prototype, {
  * @returns {Promise} A promise that is resolved when the data of the I3S feature is loaded
  * @private
  */
-I3SFeature.prototype.load = function () {
-  const that = this;
-  return this._dataProvider._loadJson(this._resource).then(function (data) {
-    that._data = data;
-    return data;
-  });
+I3SFeature.prototype.load = async function () {
+  this._data = await I3SDataProvider.loadJson(
+    this._resource,
+    this._dataProvider._traceFetches
+  );
+  return this._data;
 };
 
 export default I3SFeature;

package/Source/Scene/I3SField.js

@@ -6,7 +6,7 @@ import defined from "../Core/defined.js";
  * @alias I3SField
  * @internalConstructor
  * @privateParam {I3SNode} parent The parent of that geometry
- * @privateParam {Object} storageInfo The structure containing the storage info of the field
+ * @privateParam {object} storageInfo The structure containing the storage info of the field
  */
 function I3SField(parent, storageInfo) {
   this._storageInfo = storageInfo;
@@ -38,7 +38,7 @@ Object.defineProperties(I3SField.prototype, {
   /**
    * Gets the header for this field.
    * @memberof I3SField.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   header: {
@@ -49,7 +49,7 @@ Object.defineProperties(I3SField.prototype, {
   /**
    * Gets the values for this field.
    * @memberof I3SField.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   values: {
@@ -62,7 +62,7 @@ Object.defineProperties(I3SField.prototype, {
   /**
    * Gets the name for the field.
    * @memberof I3SField.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   name: {
@@ -94,7 +94,7 @@ function getNumericTypeSize(type) {
 
 /**
  * Loads the content.
- * @returns {Promise.<void>} A promise that is resolved when the field data is loaded
+ * @returns {Promise<void>} A promise that is resolved when the field data is loaded
  */
 I3SField.prototype.load = function () {
   const that = this;

package/Source/Scene/I3SGeometry.js

@@ -11,7 +11,7 @@ import Matrix3 from "../Core/Matrix3.js";
  * @alias I3SGeometry
  * @internalConstructor
  * @privateParam {I3SNode} parent The parent of that geometry
- * @privateParam {String} uri The uri to load the data from
+ * @privateParam {string} uri The uri to load the data from
  */
 function I3SGeometry(parent, uri) {
   const dataProvider = parent._dataProvider;
@@ -51,7 +51,7 @@ Object.defineProperties(I3SGeometry.prototype, {
   /**
    * Gets the I3S data for this object.
    * @memberof I3SGeometry.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   data: {
@@ -62,7 +62,7 @@ Object.defineProperties(I3SGeometry.prototype, {
   /**
    * Gets the custom attributes of the geometry.
    * @memberof I3SGeometry.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   customAttributes: {
@@ -74,7 +74,7 @@ Object.defineProperties(I3SGeometry.prototype, {
 
 /**
  * Loads the content.
- * @returns {Promise.<Object>} A promise that is resolved when the geometry data is loaded
+ * @returns {Promise<object>} A promise that is resolved when the geometry data is loaded
  * @private
  */
 I3SGeometry.prototype.load = function () {
@@ -121,10 +121,10 @@ const scratchV2p = new Cartesian3();
 
 /**
  * Find a triangle touching the point [px, py, pz], then return the vertex closest to the search point
- * @param {Number} px The x component of the point to query
- * @param {Number} py The y component of the point to query
- * @param {Number} pz The z component of the point to query
- * @returns {Object} A structure containing the index of the closest point,
+ * @param {number} px The x component of the point to query
+ * @param {number} py The y component of the point to query
+ * @param {number} pz The z component of the point to query
+ * @returns {object} A structure containing the index of the closest point,
  * the squared distance from the queried point to the point that is found,
  * the distance from the queried point to the point that is found,
  * the queried position in local space,