@cesium/engine 2.0.0 → 2.2.0

package/Source/Scene/MetadataType.js

@@ -11,70 +11,70 @@ import Matrix4 from "../Core/Matrix4.js";
  * An enum of metadata types. These metadata types are containers containing
  * one or more components of type {@link MetadataComponentType}
  *
- * @enum {String}
+ * @enum {string}
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
 const MetadataType = {
   /**
    * A single component
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   SCALAR: "SCALAR",
   /**
    * A vector with two components
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   VEC2: "VEC2",
   /**
    * A vector with three components
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   VEC3: "VEC3",
   /**
    * A vector with four components
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   VEC4: "VEC4",
   /**
    * A 2x2 matrix, stored in column-major format.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MAT2: "MAT2",
   /**
    * A 3x3 matrix, stored in column-major format.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MAT3: "MAT3",
   /**
    * A 4x4 matrix, stored in column-major format.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MAT4: "MAT4",
   /**
    * A boolean (true/false) value
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   BOOLEAN: "BOOLEAN",
   /**
    * A UTF-8 encoded string value
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   STRING: "STRING",
@@ -83,7 +83,7 @@ const MetadataType = {
    *
    * @see MetadataEnum
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   ENUM: "ENUM",
@@ -93,7 +93,7 @@ const MetadataType = {
  * Check if a type is VEC2, VEC3 or VEC4
  *
  * @param {MetadataType} type The type
- * @return {Boolean} <code>true</code> if the type is a vector, <code>false</code> otherwise
+ * @return {boolean} <code>true</code> if the type is a vector, <code>false</code> otherwise
  * @private
  */
 MetadataType.isVectorType = function (type) {
@@ -115,7 +115,7 @@ MetadataType.isVectorType = function (type) {
  * Check if a type is MAT2, MAT3 or MAT4
  *
  * @param {MetadataType} type The type
- * @return {Boolean} <code>true</code> if the type is a matrix, <code>false</code> otherwise
+ * @return {boolean} <code>true</code> if the type is a matrix, <code>false</code> otherwise
  * @private
  */
 MetadataType.isMatrixType = function (type) {
@@ -138,7 +138,7 @@ MetadataType.isMatrixType = function (type) {
  * a VECN returns N, and a MATN returns N*N. All other types return 1.
  *
  * @param {MetadataType} type The type to get the component count for
- * @return {Number} The number of components
+ * @return {number} The number of components
  * @private
  */
 MetadataType.getComponentCount = function (type) {
@@ -175,7 +175,7 @@ MetadataType.getComponentCount = function (type) {
  * Get the corresponding vector or matrix class. This is used to simplify
  * packing and unpacking code.
  * @param {MetadataType} type The metadata type
- * @return {Object} The appropriate CartesianN class for vector types, MatrixN class for matrix types, or undefined otherwise.
+ * @return {object} The appropriate CartesianN class for vector types, MatrixN class for matrix types, or undefined otherwise.
  * @private
  */
 MetadataType.getMathType = function (type) {

package/Source/Scene/Model/B3dmLoader.js

@@ -38,21 +38,21 @@ const FeatureIdAttribute = ModelComponents.FeatureIdAttribute;
  * @augments ResourceLoader
  * @private
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Resource} options.b3dmResource The {@link Resource} containing the b3dm.
  * @param {ArrayBuffer} options.arrayBuffer The array buffer of the b3dm contents.
- * @param {Number} [options.byteOffset] The byte offset to the beginning of the b3dm contents in the array buffer.
+ * @param {number} [options.byteOffset] The byte offset to the beginning of the b3dm contents in the array buffer.
  * @param {Resource} [options.baseResource] The {@link Resource} that paths in the glTF JSON are relative to.
- * @param {Boolean} [options.releaseGltfJson=false] When true, the glTF JSON is released once the glTF is loaded. This is especially useful for cases like 3D Tiles, where each .gltf model is unique and caching the glTF JSON is not effective.
- * @param {Boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
- * @param {Boolean} [options.incrementallyLoadTextures=true] Determine if textures may continue to stream in after the glTF is loaded.
+ * @param {boolean} [options.releaseGltfJson=false] When true, the glTF JSON is released once the glTF is loaded. This is especially useful for cases like 3D Tiles, where each .gltf model is unique and caching the glTF JSON is not effective.
+ * @param {boolean} [options.asynchronous=true] Determines if WebGL resource creation will be spread out over several frames or block until all WebGL resources are created.
+ * @param {boolean} [options.incrementallyLoadTextures=true] Determine if textures may continue to stream in after the glTF is loaded.
  * @param {Axis} [options.upAxis=Axis.Y] The up-axis of the glTF model.
  * @param {Axis} [options.forwardAxis=Axis.X] The forward-axis of the glTF model.
- * @param {Boolean} [options.loadAttributesAsTypedArray=false] If <code>true</code>, load all attributes as typed arrays instead of GPU buffers. If the attributes are interleaved in the glTF they will be de-interleaved in the typed array.
- * @param {Boolean} [options.loadAttributesFor2D=false] If <code>true</code>, load the positions buffer and any instanced attribute buffers as typed arrays for accurately projecting models to 2D.
- * @param {Boolean} [options.loadIndicesForWireframe=false] If <code>true</code>, load the index buffer as a typed array. This is useful for creating wireframe indices in WebGL1.
- * @param {Boolean} [options.loadPrimitiveOutline=true] If <code>true</code>, load outlines from the {@link https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/CESIUM_primitive_outline|CESIUM_primitive_outline} extension. This can be set false to avoid post-processing geometry at load time.
- * @param {Boolean} [options.loadForClassification=false] If <code>true</code> and if the model has feature IDs, load the feature IDs and indices as typed arrays. This is useful for batching features for classification.
+ * @param {boolean} [options.loadAttributesAsTypedArray=false] If <code>true</code>, load all attributes as typed arrays instead of GPU buffers. If the attributes are interleaved in the glTF they will be de-interleaved in the typed array.
+ * @param {boolean} [options.loadAttributesFor2D=false] If <code>true</code>, load the positions buffer and any instanced attribute buffers as typed arrays for accurately projecting models to 2D.
+ * @param {boolean} [options.loadIndicesForWireframe=false] If <code>true</code>, load the index buffer as a typed array. This is useful for creating wireframe indices in WebGL1.
+ * @param {boolean} [options.loadPrimitiveOutline=true] If <code>true</code>, load outlines from the {@link https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/CESIUM_primitive_outline|CESIUM_primitive_outline} extension. This can be set false to avoid post-processing geometry at load time.
+ * @param {boolean} [options.loadForClassification=false] If <code>true</code> and if the model has feature IDs, load the feature IDs and indices as typed arrays. This is useful for batching features for classification.
  * */
 function B3dmLoader(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
@@ -129,34 +129,17 @@ if (defined(Object.create)) {
 
 Object.defineProperties(B3dmLoader.prototype, {
   /**
-   * A promise that resolves to the resource when the resource is ready, or undefined if the resource hasn't started loading.
+   * true if textures are loaded, useful when incrementallyLoadTextures is true
    *
    * @memberof B3dmLoader.prototype
    *
-   * @type {Promise.<B3dmLoader>|undefined}
+   * @type {boolean}
    * @readonly
    * @private
    */
-  promise: {
+  texturesLoaded: {
     get: function () {
-      return this._promise;
-    },
-  },
-
-  /**
-   * A promise that resolves when all textures are loaded.
-   * When <code>incrementallyLoadTextures</code> is true this may resolve after
-   * <code>promise</code> resolves.
-   *
-   * @memberof B3dmLoader.prototype
-   *
-   * @type {Promise}
-   * @readonly
-   * @private
-   */
-  texturesLoadedPromise: {
-    get: function () {
-      return this._gltfLoader.texturesLoadedPromise;
+      return this._gltfLoader?.texturesLoaded;
     },
   },
   /**
@@ -164,7 +147,7 @@ Object.defineProperties(B3dmLoader.prototype, {
    *
    * @memberof B3dmLoader.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    * @private
    */
@@ -192,10 +175,14 @@ Object.defineProperties(B3dmLoader.prototype, {
 
 /**
  * Loads the resource.
- * @returns {Promise.<B3dmLoader>} A promise which resolves to the loader when the resource loading is completed.
+ * @returns {Promise<B3dmLoader>} A promise which resolves to the loader when the resource loading is completed.
  * @private
  */
 B3dmLoader.prototype.load = function () {
+  if (defined(this._promise)) {
+    return this._promise;
+  }
+
   const b3dm = B3dmParser.parse(this._arrayBuffer, this._byteOffset);
 
   let batchLength = b3dm.batchLength;
@@ -246,37 +233,21 @@ B3dmLoader.prototype.load = function () {
   this._state = B3dmLoaderState.LOADING;
 
   const that = this;
-  gltfLoader.load();
-  this._promise = gltfLoader.promise
+  this._promise = gltfLoader
+    .load()
     .then(function () {
       if (that.isDestroyed()) {
         return;
       }
 
-      const components = gltfLoader.components;
-
-      // Combine the RTC_CENTER transform from the b3dm and the CESIUM_RTC
-      // transform from the glTF. In practice usually only one or the
-      // other is supplied. If they don't exist the transforms will
-      // be identity matrices.
-      components.transform = Matrix4.multiplyTransformation(
-        that._transform,
-        components.transform,
-        components.transform
-      );
-      createStructuralMetadata(that, components);
-      that._components = components;
-
-      // Now that we have the parsed components, we can release the array buffer
-      that._arrayBuffer = undefined;
-
-      that._state = B3dmLoaderState.READY;
+      that._state = B3dmLoaderState.PROCESSING;
       return that;
     })
     .catch(function (error) {
       if (that.isDestroyed()) {
         return;
       }
+
       return handleError(that, error);
     });
 
@@ -296,13 +267,38 @@ B3dmLoader.prototype.process = function (frameState) {
   Check.typeOf.object("frameState", frameState);
   //>>includeEnd('debug');
 
-  if (this._state === B3dmLoaderState.LOADING) {
-    this._state = B3dmLoaderState.PROCESSING;
+  if (this._state === B3dmLoaderState.READY) {
+    return true;
+  }
+
+  if (this._state !== B3dmLoaderState.PROCESSING) {
+    return false;
   }
 
-  if (this._state === B3dmLoaderState.PROCESSING) {
-    this._gltfLoader.process(frameState);
+  const ready = this._gltfLoader.process(frameState);
+  if (!ready) {
+    return false;
   }
+
+  const components = this._gltfLoader.components;
+
+  // Combine the RTC_CENTER transform from the b3dm and the CESIUM_RTC
+  // transform from the glTF. In practice usually only one or the
+  // other is supplied. If they don't exist the transforms will
+  // be identity matrices.
+  components.transform = Matrix4.multiplyTransformation(
+    this._transform,
+    components.transform,
+    components.transform
+  );
+  createStructuralMetadata(this, components);
+  this._components = components;
+
+  // Now that we have the parsed components, we can release the array buffer
+  this._arrayBuffer = undefined;
+
+  this._state = B3dmLoaderState.READY;
+  return true;
 };
 
 function createStructuralMetadata(loader, components) {
@@ -368,7 +364,7 @@ function processNode(node) {
 }
 
 B3dmLoader.prototype.unload = function () {
-  if (defined(this._gltfLoader)) {
+  if (defined(this._gltfLoader) && !this._gltfLoader.isDestroyed()) {
     this._gltfLoader.unload();
   }
 

package/Source/Scene/Model/ClassificationModelDrawCommand.js

@@ -18,7 +18,7 @@ import StencilOperation from "../StencilOperation.js";
  * derived commands and returns only the necessary commands depending on the
  * given frame state.
  *
- * @param {Object} options An object containing the following options:
+ * @param {object} options An object containing the following options:
  * @param {DrawCommand} options.command The draw command from which to derive other commands from.
  * @param {PrimitiveRenderResources} options.primitiveRenderResources The render resources of the primitive associated with the command.
  *
@@ -348,7 +348,7 @@ Object.defineProperties(ClassificationModelDrawCommand.prototype, {
    * The batch lengths used to generate multiple draw commands.
    *
    * @memberof ClassificationModelDrawCommand.prototype
-   * @type {Number[]}
+   * @type {number[]}
    *
    * @readonly
    * @private
@@ -363,7 +363,7 @@ Object.defineProperties(ClassificationModelDrawCommand.prototype, {
    * The batch offsets used to generate multiple draw commands.
    *
    * @memberof ClassificationModelDrawCommand.prototype
-   * @type {Number[]}
+   * @type {number[]}
    *
    * @readonly
    * @private

package/Source/Scene/Model/CustomShader.js

@@ -11,9 +11,9 @@ import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js";
 /**
  * An object describing a uniform, its type, and an initial value
  *
- * @typedef {Object} UniformSpecifier
+ * @typedef {object} UniformSpecifier
  * @property {UniformType} type The Glsl type of the uniform.
- * @property {Boolean|Number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4|TextureUniform} value The initial value of the uniform
+ * @property {boolean|number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4|TextureUniform} value The initial value of the uniform
  *
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
@@ -29,13 +29,13 @@ import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js";
  *   <li>Using a dictionary automatically de-duplicates variable names</li>
  *   <li>Queries such as <code>variableSet.hasOwnProperty("position")</code> are straightforward</li>
  * </ul>
- * @typedef {Object<String, Boolean>} VariableSet
+ * @typedef {Object<string, boolean>} VariableSet
  * @private
  */
 
 /**
  * Variable sets parsed from the user-defined vertex shader text.
- * @typedef {Object} VertexVariableSets
+ * @typedef {object} VertexVariableSets
  * @property {VariableSet} attributeSet A set of all unique attributes used in the vertex shader via the <code>vsInput.attributes</code> struct.
  * @property {VariableSet} featureIdSet A set of all unique feature ID sets used in the vertex shader via the <code>vsInput.featureIds</code> struct.
  * @property {VariableSet} metadataSet A set of all unique metadata properties used in the vertex shader via the <code>vsInput.metadata</code> struct.
@@ -44,7 +44,7 @@ import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js";
 
 /**
  * Variable sets parsed from the user-defined fragment shader text.
- * @typedef {Object} FragmentVariableSets
+ * @typedef {object} FragmentVariableSets
  * @property {VariableSet} attributeSet A set of all unique attributes used in the fragment shader via the <code>fsInput.attributes</code> struct
  * @property {VariableSet} featureIdSet A set of all unique feature ID sets used in the fragment shader via the <code>fsInput.featureIds</code> struct.
  * @property {VariableSet} metadataSet A set of all unique metadata properties used in the fragment shader via the <code>fsInput.metadata</code> struct.
@@ -74,14 +74,14 @@ import CustomShaderTranslucencyMode from "./CustomShaderTranslucencyMode.js";
  * See the {@link https://github.com/CesiumGS/cesium/tree/main/Documentation/CustomShaderGuide|Custom Shader Guide} for more detailed documentation.
  * </p>
  *
- * @param {Object} options An object with the following options
+ * @param {object} options An object with the following options
  * @param {CustomShaderMode} [options.mode=CustomShaderMode.MODIFY_MATERIAL] The custom shader mode, which determines how the custom shader code is inserted into the fragment shader.
  * @param {LightingModel} [options.lightingModel] The lighting model (e.g. PBR or unlit). If present, this overrides the default lighting for the model.
  * @param {CustomShaderTranslucencyMode} [options.translucencyMode=CustomShaderTranslucencyMode.INHERIT] The translucency mode, which determines how the custom shader will be applied. If the value is CustomShaderTransulcencyMode.OPAQUE or CustomShaderTransulcencyMode.TRANSLUCENT, the custom shader will override settings from the model's material. If the value is CustomShaderTransulcencyMode.INHERIT, the custom shader will render as either opaque or translucent depending on the primitive's material settings.
- * @param {Object.<String, UniformSpecifier>} [options.uniforms] A dictionary for user-defined uniforms. The key is the uniform name that will appear in the GLSL code. The value is an object that describes the uniform type and initial value
- * @param {Object.<String, VaryingType>} [options.varyings] A dictionary for declaring additional GLSL varyings used in the shader. The key is the varying name that will appear in the GLSL code. The value is the data type of the varying. For each varying, the declaration will be added to the top of the shader automatically. The caller is responsible for assigning a value in the vertex shader and using the value in the fragment shader.
- * @param {String} [options.vertexShaderText] The custom vertex shader as a string of GLSL code. It must include a GLSL function called vertexMain. See the example for the expected signature. If not specified, the custom vertex shader step will be skipped in the computed vertex shader.
- * @param {String} [options.fragmentShaderText] The custom fragment shader as a string of GLSL code. It must include a GLSL function called fragmentMain. See the example for the expected signature. If not specified, the custom fragment shader step will be skipped in the computed fragment shader.
+ * @param {Object<string, UniformSpecifier>} [options.uniforms] A dictionary for user-defined uniforms. The key is the uniform name that will appear in the GLSL code. The value is an object that describes the uniform type and initial value
+ * @param {Object<string, VaryingType>} [options.varyings] A dictionary for declaring additional GLSL varyings used in the shader. The key is the varying name that will appear in the GLSL code. The value is the data type of the varying. For each varying, the declaration will be added to the top of the shader automatically. The caller is responsible for assigning a value in the vertex shader and using the value in the fragment shader.
+ * @param {string} [options.vertexShaderText] The custom vertex shader as a string of GLSL code. It must include a GLSL function called vertexMain. See the example for the expected signature. If not specified, the custom vertex shader step will be skipped in the computed vertex shader.
+ * @param {string} [options.fragmentShaderText] The custom fragment shader as a string of GLSL code. It must include a GLSL function called fragmentMain. See the example for the expected signature. If not specified, the custom fragment shader step will be skipped in the computed fragment shader.
  *
  * @alias CustomShader
  * @constructor
@@ -141,7 +141,7 @@ function CustomShader(options) {
   /**
    * Additional uniforms as declared by the user.
    *
-   * @type {Object.<String, UniformSpecifier>}
+   * @type {Object<string, UniformSpecifier>}
    * @readonly
    */
   this.uniforms = defaultValue(options.uniforms, defaultValue.EMPTY_OBJECT);
@@ -149,21 +149,21 @@ function CustomShader(options) {
    * Additional varyings as declared by the user.
    * This is used by {@link CustomShaderPipelineStage}
    *
-   * @type {Object.<String, VaryingType>}
+   * @type {Object<string, VaryingType>}
    * @readonly
    */
   this.varyings = defaultValue(options.varyings, defaultValue.EMPTY_OBJECT);
   /**
    * The user-defined GLSL code for the vertex shader
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   this.vertexShaderText = options.vertexShaderText;
   /**
    * The user-defined GLSL code for the fragment shader
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   this.fragmentShaderText = options.fragmentShaderText;
@@ -205,7 +205,7 @@ function CustomShader(options) {
    * The map of uniform names to a function that returns a value. This map
    * is combined with the overall uniform map used by the {@link DrawCommand}
    *
-   * @type {Object.<String, Function>}
+   * @type {Object<string, Function>}
    * @readonly
    * @private
    */
@@ -404,8 +404,8 @@ function validateBuiltinVariables(customShader) {
 
 /**
  * Update the value of a uniform declared in the shader
- * @param {String} uniformName The GLSL name of the uniform. This must match one of the uniforms declared in the constructor
- * @param {Boolean|Number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4|String|Resource} value The new value of the uniform.
+ * @param {string} uniformName The GLSL name of the uniform. This must match one of the uniforms declared in the constructor
+ * @param {boolean|number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4|string|Resource} value The new value of the uniform.
  */
 CustomShader.prototype.setUniform = function (uniformName, value) {
   //>>includeStart('debug', pragmas.debug);
@@ -440,7 +440,7 @@ CustomShader.prototype.update = function (frameState) {
  * If this object was destroyed, it should not be used; calling any function other than
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  *
- * @returns {Boolean} True if this object was destroyed; otherwise, false.
+ * @returns {boolean} True if this object was destroyed; otherwise, false.
  *
  * @see CustomShader#destroy
  * @private

package/Source/Scene/Model/CustomShaderMode.js

@@ -2,7 +2,7 @@
  * An enum describing how the {@link CustomShader} will be added to the
  * fragment shader. This determines how the shader interacts with the material.
  *
- * @enum {String}
+ * @enum {string}
  *
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
@@ -11,7 +11,7 @@ const CustomShaderMode = {
    * The custom shader will be used to modify the results of the material stage
    * before lighting is applied.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   MODIFY_MATERIAL: "MODIFY_MATERIAL",
@@ -19,7 +19,7 @@ const CustomShaderMode = {
    * The custom shader will be used instead of the material stage. This is a hint
    * to optimize out the material processing code.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   REPLACE_MATERIAL: "REPLACE_MATERIAL",
@@ -29,7 +29,7 @@ const CustomShaderMode = {
  * Convert the shader mode to an uppercase identifier for use in GLSL define
  * directives. For example:  <code>#define CUSTOM_SHADER_MODIFY_MATERIAL</code>
  * @param {CustomShaderMode} customShaderMode The shader mode
- * @return {String} The name of the GLSL macro to use
+ * @return {string} The name of the GLSL macro to use
  *
  * @private
  */

package/Source/Scene/Model/CustomShaderTranslucencyMode.js

@@ -2,7 +2,7 @@
  * An enum for controling how {@link CustomShader} handles translucency compared with the original
  * primitive.
  *
- * @enum {Number}
+ * @enum {number}
  *
  * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
  */
@@ -12,21 +12,21 @@ const CustomShaderTranslucencyMode = {
    * translucent material, the custom shader will also be considered translucent. If the primitive
    * used an opaque material, the custom shader will be considered opaque.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   INHERIT: 0,
   /**
    * Force the primitive to render the primitive as opaque, ignoring any material settings.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   OPAQUE: 1,
   /**
    * Force the primitive to render the primitive as translucent, ignoring any material settings.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   TRANSLUCENT: 2,

package/Source/Scene/Model/GeoJsonLoader.js

@@ -37,8 +37,8 @@ import BufferUsage from "../../Renderer/BufferUsage.js";
  * @augments ResourceLoader
  * @private
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.geoJson The GeoJson object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.geoJson The GeoJson object.
  */
 function GeoJsonLoader(options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);
@@ -48,8 +48,6 @@ function GeoJsonLoader(options) {
   //>>includeEnd('debug');
 
   this._geoJson = options.geoJson;
-  this._promise = undefined;
-  this._process = function (loader, frameState) {};
   this._components = undefined;
 }
 
@@ -59,26 +57,12 @@ if (defined(Object.create)) {
 }
 
 Object.defineProperties(GeoJsonLoader.prototype, {
-  /**
-   * A promise that resolves to the resource when the resource is ready, or undefined if the resource has not yet started loading.
-   *
-   * @memberof GeoJsonLoader.prototype
-   *
-   * @type {Promise.<GeoJsonLoader>|Undefined}
-   * @readonly
-   * @private
-   */
-  promise: {
-    get: function () {
-      return this._promise;
-    },
-  },
   /**
    * The cache key of the resource.
    *
    * @memberof GeoJsonLoader.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    * @private
    */
@@ -105,25 +89,11 @@ Object.defineProperties(GeoJsonLoader.prototype, {
 
 /**
  * Loads the resource.
- * @returns {Promise.<GeoJsonLoader>} A promise which resolves to the loader when the resource loading is completed.
+ * @returns {Promise<GeoJsonLoader>} A promise which resolves to the loader when the resource loading is completed.
  * @private
  */
 GeoJsonLoader.prototype.load = function () {
-  const loader = this;
-  const promise = new Promise(function (resolve) {
-    loader._process = function (loader, frameState) {
-      if (defined(loader._components)) {
-        return;
-      }
-
-      loader._components = parse(loader._geoJson, frameState);
-      loader._geoJson = undefined;
-      resolve(loader);
-    };
-  });
-
-  this._promise = promise;
-  return promise;
+  return Promise.resolve(this);
 };
 
 /**
@@ -137,7 +107,13 @@ GeoJsonLoader.prototype.process = function (frameState) {
   Check.typeOf.object("frameState", frameState);
   //>>includeEnd('debug');
 
-  this._process(this, frameState);
+  if (defined(this._components)) {
+    return true;
+  }
+
+  this._components = parse(this._geoJson, frameState);
+  this._geoJson = undefined;
+  return true;
 };
 
 function ParsedFeature() {