Support property sets in XKT and metadata #31

xeokit · Aug 19, 2021 · fc9928a · fc9928a
1 parent 5e43f63
commit fc9928a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/specs/xkt_v9_metadata.schema.json b/specs/xkt_v9_metadata.schema.json
diff --git a/src/XKTModel/XKTMetaObject.js b/src/XKTModel/XKTMetaObject.js
@@ -21,12 +21,12 @@ class XKTMetaObject {
     /**
      * @private
      * @param metaObjectId
-     * @param propertySetId
+     * @param propertySetIds
      * @param metaObjectType
      * @param metaObjectName
      * @param parentMetaObjectId
      */
-    constructor(metaObjectId, propertySetId, metaObjectType, metaObjectName, parentMetaObjectId) {
+    constructor(metaObjectId, propertySetIds, metaObjectType, metaObjectName, parentMetaObjectId) {
 
         /**
          * Unique ID of this ````XKTMetaObject```` in {@link XKTModel#metaObjects}.
@@ -42,13 +42,13 @@ class XKTMetaObject {
         this.metaObjectId = metaObjectId;
 
         /**
-         * Unique ID of a property set that contains additional metadata about this
-         * {@link XKTMetaObject}. The property can be stored in an external system, or
-         * within the {@link XKTModel}, as a {@link XKTPropertySet} within {@link XKTModel#propertySets}.
+         * Unique ID of one or more property sets that contains additional metadata about this
+         * {@link XKTMetaObject}. The property sets can be stored in an external system, or
+         * within the {@link XKTModel}, as {@link XKTPropertySet}s within {@link XKTModel#propertySets}.
          *
-         * @type {String}
+         * @type {String[]}
          */
-        this.propertySetId = propertySetId;
+        this.propertySetIds = propertySetIds;
 
         /**
          * Indicates the XKTMetaObject meta object type.

diff --git a/src/XKTModel/XKTModel.js b/src/XKTModel/XKTModel.js
@@ -318,9 +318,9 @@ class XKTModel {
      *
      * @param {*} params Method parameters.
      * @param {String} params.metaObjectId Unique ID for the {@link XKTMetaObject}.
-     * @param {String} params.propertySetId ID of a property set that contains additional metadata about
-     * this {@link XKTMetaObject}. The property set could be stored externally (ie not managed at all by the XKT file),
-     * or could be a {@link XKTPropertySet} within {@link XKTModel#propertySets}.
+     * @param {String} params.propertySetIds ID of one or more property sets that contains additional metadata about
+     * this {@link XKTMetaObject}. The property sets could be stored externally (ie not managed at all by the XKT file),
+     * or could be {@link XKTPropertySet}s within {@link XKTModel#propertySets}.
      * @param {String} [params.metaObjectType="default"] A meta type for the {@link XKTMetaObject}. Can be anything,
      * but is usually an IFC type, such as "IfcSite" or "IfcWall".
      * @param {String} [params.metaObjectName] Human-readable name for the {@link XKTMetaObject}. Defaults to the ````metaObjectId```` parameter.
@@ -348,12 +348,12 @@ class XKTModel {
         }
 
         const metaObjectId = params.metaObjectId;
-        const propertySetId = params.propertySetId;
+        const propertySetIds = params.propertySetIds;
         const metaObjectType = params.metaObjectType || "Default";
         const metaObjectName = params.metaObjectName || params.metaObjectId;
         const parentMetaObjectId = params.parentMetaObjectId;
 
-        const metaObject = new XKTMetaObject(metaObjectId, propertySetId, metaObjectType, metaObjectName, parentMetaObjectId);
+        const metaObject = new XKTMetaObject(metaObjectId, propertySetIds, metaObjectType, metaObjectName, parentMetaObjectId);
 
         this.metaObjects[metaObjectId] = metaObject;
         this.metaObjectsList.push(metaObject);

diff --git a/src/XKTModel/writeXKTModelToArrayBuffer.js b/src/XKTModel/writeXKTModelToArrayBuffer.js
@@ -166,7 +166,7 @@ function getModelData(xktModel) {
 
         data.metadata.propertySets.push(propertySetJSON);
     }
-    
+
     for (let metaObjectsIndex = 0; metaObjectsIndex < numMetaObjects; metaObjectsIndex++) {
 
         const metaObject = metaObjectsList[metaObjectsIndex];
@@ -181,14 +181,14 @@ function getModelData(xktModel) {
             metaObjectJSON.parent = "" + metaObject.parentMetaObjectId;
         }
 
-        if (metaObject.propertySetId !== undefined && metaObject.propertySetId !== null && metaObject.propertySetId !== "") {
-            metaObjectJSON.propertySetId = "" + metaObject.propertySetId;
+        if (metaObject.propertySetIds && metaObject.propertySetIds.length > 0) {
+            metaObjectJSON.propertySetIds = metaObject.propertySetIds;
         }
 
         data.metadata.metaObjects.push(metaObjectJSON);
     }
 
-   // console.log(JSON.stringify(data.metadata, null, "\t"))
+    // console.log(JSON.stringify(data.metadata, null, "\t"))
 
     // Geometries