@cesium/engine 22.2.0 → 23.0.0

package/Source/Scene/MetadataSchemaLoader.js

@@ -11,47 +11,43 @@ import ResourceLoaderState from "./ResourceLoaderState.js";
  * Implements the {@link ResourceLoader} interface.
  * </p>
  *
- * @alias MetadataSchemaLoader
- * @constructor
- * @augments ResourceLoader
- *
- * @param {object} options Object with the following properties:
- * @param {object} [options.schema] An object that explicitly defines a schema JSON. Mutually exclusive with options.resource.
- * @param {Resource} [options.resource] The {@link Resource} pointing to the schema JSON. Mutually exclusive with options.schema.
- * @param {string} [options.cacheKey] The cache key of the resource.
- *
- * @exception {DeveloperError} One of options.schema and options.resource must be defined.
- *
  * @private
  * @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.
  */
-function MetadataSchemaLoader(options) {
-  options = options ?? Frozen.EMPTY_OBJECT;
-  const schema = options.schema;
-  const resource = options.resource;
-  const cacheKey = options.cacheKey;
+class MetadataSchemaLoader extends ResourceLoader {
+  /**
+   * @param {object} options Object with the following properties:
+   * @param {object} [options.schema] An object that explicitly defines a schema JSON. Mutually exclusive with options.resource.
+   * @param {Resource} [options.resource] The {@link Resource} pointing to the schema JSON. Mutually exclusive with options.schema.
+   * @param {string} [options.cacheKey] The cache key of the resource.
+   *
+   * @exception {DeveloperError} One of options.schema and options.resource must be defined.
+   */
+  constructor(options) {
+    super();
 
-  //>>includeStart('debug', pragmas.debug);
-  if (defined(schema) === defined(resource)) {
-    throw new DeveloperError(
-      "One of options.schema and options.resource must be defined.",
-    );
-  }
-  //>>includeEnd('debug');
+    options = options ?? Frozen.EMPTY_OBJECT;
+    const schema = options.schema;
+    const resource = options.resource;
+    const cacheKey = options.cacheKey;
 
-  this._schema = defined(schema) ? MetadataSchema.fromJson(schema) : undefined;
-  this._resource = resource;
-  this._cacheKey = cacheKey;
-  this._state = ResourceLoaderState.UNLOADED;
-  this._promise = undefined;
-}
+    //>>includeStart('debug', pragmas.debug);
+    if (defined(schema) === defined(resource)) {
+      throw new DeveloperError(
+        "One of options.schema and options.resource must be defined.",
+      );
+    }
+    //>>includeEnd('debug');
 
-if (defined(Object.create)) {
-  MetadataSchemaLoader.prototype = Object.create(ResourceLoader.prototype);
-  MetadataSchemaLoader.prototype.constructor = MetadataSchemaLoader;
-}
+    this._schema = defined(schema)
+      ? MetadataSchema.fromJson(schema)
+      : undefined;
+    this._resource = resource;
+    this._cacheKey = cacheKey;
+    this._state = ResourceLoaderState.UNLOADED;
+    this._promise = undefined;
+  }
 
-Object.defineProperties(MetadataSchemaLoader.prototype, {
   /**
    * The cache key of the resource.
    *
@@ -61,11 +57,10 @@ Object.defineProperties(MetadataSchemaLoader.prototype, {
    * @readonly
    * @private
    */
-  cacheKey: {
-    get: function () {
-      return this._cacheKey;
-    },
-  },
+  get cacheKey() {
+    return this._cacheKey;
+  }
+
   /**
    * The metadata schema object.
    *
@@ -75,31 +70,37 @@ Object.defineProperties(MetadataSchemaLoader.prototype, {
    * @readonly
    * @private
    */
-  schema: {
-    get: function () {
-      return this._schema;
-    },
-  },
-});
-
-/**
- * Loads the resource.
- * @returns {Promise<MetadataSchemaLoader>} A promise which resolves to the loader when the resource loading is completed.
- * @private
- */
-MetadataSchemaLoader.prototype.load = async function () {
-  if (defined(this._promise)) {
-    return this._promise;
+  get schema() {
+    return this._schema;
   }
 
-  if (defined(this._schema)) {
-    this._promise = Promise.resolve(this);
+  /**
+   * Loads the resource.
+   * @returns {Promise<MetadataSchemaLoader>} A promise which resolves to the loader when the resource loading is completed.
+   * @private
+   */
+  async load() {
+    if (defined(this._promise)) {
+      return this._promise;
+    }
+
+    if (defined(this._schema)) {
+      this._promise = Promise.resolve(this);
+      return this._promise;
+    }
+
+    this._promise = loadExternalSchema(this);
     return this._promise;
   }
 
-  this._promise = loadExternalSchema(this);
-  return this._promise;
-};
+  /**
+   * Unloads the resource.
+   * @private
+   */
+  unload() {
+    this._schema = undefined;
+  }
+}
 
 async function loadExternalSchema(schemaLoader) {
   const resource = schemaLoader._resource;
@@ -124,12 +125,4 @@ async function loadExternalSchema(schemaLoader) {
   }
 }
 
-/**
- * Unloads the resource.
- * @private
- */
-MetadataSchemaLoader.prototype.unload = function () {
-  this._schema = undefined;
-};
-
 export default MetadataSchemaLoader;

package/Source/Scene/MetadataTable.js

@@ -100,6 +100,20 @@ Object.defineProperties(MetadataTable.prototype, {
       return this._byteLength;
     },
   },
+
+  /**
+   * The properties of the table.
+   *
+   * @memberof MetadataTable.prototype
+   * @type {Object<string, MetadataTableProperty>}
+   * @readonly
+   * @private
+   */
+  properties: {
+    get: function () {
+      return this._properties;
+    },
+  },
 });
 
 /**

package/Source/Scene/MetadataTableProperty.js

@@ -292,6 +292,20 @@ Object.defineProperties(MetadataTableProperty.prototype, {
       return this._byteLength;
     },
   },
+
+  /**
+   * The class property that this table property corresponds to.
+   *
+   * @memberof MetadataTableProperty.prototype
+   * @type {MetadataClassProperty}
+   * @readonly
+   * @private
+   */
+  classProperty: {
+    get: function () {
+      return this._classProperty;
+    },
+  },
 });
 
 /**