fix(core): missing relation between IfcPropertySet and other entities…

… in new definitions
ThatOpen · Oct 31, 2024 · 938d6a8 · 938d6a8
1 parent e4de67b
commit 938d6a8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/packages/core/src/ifc/IfcPropertiesManager/example.html b/packages/core/src/ifc/IfcPropertiesManager/example.html
@@ -9,6 +9,7 @@
 
 <body>
   <script type="module" src="./example.ts"></script>
+  <button id="download-btn">Download</button>
 </body>
 
 </html>
diff --git a/packages/core/src/ifc/IfcPropertiesManager/example.ts b/packages/core/src/ifc/IfcPropertiesManager/example.ts
@@ -10,6 +10,11 @@ const file = await fetch(
 const buffer = await file.arrayBuffer();
 const model = await ifcLoader.load(new Uint8Array(buffer));
 
+const indexer = components.get(OBC.IfcRelationsIndexer);
+
+// By the time beign, the model relations must be processed to see the new relations when downloading the IFC
+await indexer.process(model);
+
 const propertiesManager = components.get(OBC.IfcPropertiesManager);
 
 // Add a new pset
@@ -23,7 +28,12 @@ const prop = await propertiesManager.newSingleNumericProperty(
 );
 
 await propertiesManager.addPropToPset(model, pset.expressID, prop.expressID);
-await propertiesManager.addElementToPset(model, pset.expressID, 186);
+indexer.addEntitiesRelation(
+  model,
+  pset.expressID,
+  { type: WEBIFC.IFCRELDEFINESBYPROPERTIES, inv: "DefinesOcurrence" },
+  186,
+);
 
 // Modify existing entity attributes
 const entityAttributes = await model.getProperties(186);
@@ -52,14 +62,17 @@ const ifcTask = new WEBIFC.IFC4X3.IfcTask(
 await propertiesManager.setData(model, ifcTask);
 
 // Export modified model
-const modifiedBuffer = await propertiesManager.saveToIfc(
-  model,
-  new Uint8Array(buffer),
-);
+const downloadBtn = document.getElementById("download-btn")!;
+downloadBtn.addEventListener("click", async () => {
+  const modifiedBuffer = await propertiesManager.saveToIfc(
+    model,
+    new Uint8Array(buffer),
+  );
 
-const modifiedFile = new File([modifiedBuffer], "small-modified.ifc");
-const a = document.createElement("a");
-a.href = URL.createObjectURL(modifiedFile);
-a.download = modifiedFile.name;
-// a.click();
-URL.revokeObjectURL(a.href);
+  const modifiedFile = new File([modifiedBuffer], "small-modified.ifc");
+  const a = document.createElement("a");
+  a.href = URL.createObjectURL(modifiedFile);
+  a.download = modifiedFile.name;
+  a.click();
+  URL.revokeObjectURL(a.href);
+});
diff --git a/packages/core/src/ifc/IfcPropertiesManager/index.ts b/packages/core/src/ifc/IfcPropertiesManager/index.ts
@@ -204,7 +204,6 @@ export class IfcPropertiesManager extends Component implements Disposable {
     const schema = IfcPropertiesManager.getIFCSchema(model);
     const { ownerHistoryHandle } = await this.getOwnerHistory(model);
 
-    // Create the Pset
     const psetGlobalId = this.newGUID(model);
     const psetName = new WEBIFC[schema].IfcLabel(name);
     const psetDescription = description
@@ -217,23 +216,11 @@ export class IfcPropertiesManager extends Component implements Disposable {
       psetDescription,
       [],
     );
-    pset.expressID = this.getNewExpressID(model);
-
-    // Create the Pset relation
-    const relGlobalId = this.newGUID(model);
-    const rel = new WEBIFC[schema].IfcRelDefinesByProperties(
-      relGlobalId,
-      ownerHistoryHandle,
-      null,
-      null,
-      [],
-      new WEBIFC.Handle(pset.expressID),
-    );
-    rel.expressID = this.getNewExpressID(model);
 
-    await this.setData(model, pset, rel);
+    pset.expressID = this.getNewExpressID(model);
+    await this.setData(model, pset);
 
-    return { pset, rel };
+    return { pset };
   }
 
   /**
@@ -370,7 +357,7 @@ export class IfcPropertiesManager extends Component implements Disposable {
     indexer.addEntitiesRelation(
       model,
       psetID,
-      { type: WEBIFC.IFCRELDEFINESBYPROPERTIES, inv: "IsDefinedBy" },
+      { type: WEBIFC.IFCRELDEFINESBYPROPERTIES, inv: "DefinesOcurrence" },
       ...expressIDs,
     );
   }
@@ -429,7 +416,7 @@ export class IfcPropertiesManager extends Component implements Disposable {
       throw new Error(`IfcPropertiesManager: ${relName} is unsoported.`);
     }
 
-    const schema = model.ifcMetadata.schema;
+    const schema = IfcPropertiesManager.getIFCSchema(model);
     const attributePositions = ifcRelAttrsPosition[relName];
     // @ts-ignore safe to use ts-ignore as we are checking in the following line if the class exists.
     const RelClass = WEBIFC[schema][relName];

diff --git a/packages/core/src/ifc/IfcRelationsIndexer/index.ts b/packages/core/src/ifc/IfcRelationsIndexer/index.ts
@@ -570,6 +570,8 @@ export class IfcRelationsIndexer extends Component implements Disposable {
     ...relatedIDs: number[]
   ) {
     const { type, inv } = rel;
+
+    // TODO: Allow to create the relation even if the model wasn't previously processed
     const relationsMap = this.relationMaps[model.uuid];
     if (!relationsMap) return;