feat: add catch for property streaming

ThatOpen · Feb 26, 2024 · 5bca000 · 5bca000
1 parent 2eb6dd3
commit 5bca000
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openbim-components",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "main": "src/index.js",
   "author": "harry collin, antonio gonzalez viegas",
   "license": "MIT",

diff --git a/resources/openbim-components.js b/resources/openbim-components.js
@@ -108538,11 +108538,16 @@ class FragmentPropsStreamConverter extends Component {
                     count++;
                     // finalCount++;
                     const nextProperty = ids.get(i + j);
-                    const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
-                    if (relationTypes.includes(type)) {
-                        this.getIndices(property, nextProperty, propertyIndices);
+                    try {
+                        const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
+                        if (relationTypes.includes(type)) {
+                            this.getIndices(property, nextProperty, propertyIndices);
+                        }
+                        data[property.expressID] = property;
+                    }
+                    catch (e) {
+                        console.log(`Could not get property: ${nextProperty}`);
                     }
-                    data[property.expressID] = property;
                 }
                 await this.onPropertiesStreamed.trigger({ type, data });
             }
@@ -108552,11 +108557,16 @@ class FragmentPropsStreamConverter extends Component {
                 for (let i = count; i < idCount; i++) {
                     // finalCount++;
                     const nextProperty = ids.get(i);
-                    const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
-                    if (relationTypes.includes(type)) {
-                        this.getIndices(property, nextProperty, propertyIndices);
+                    try {
+                        const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
+                        if (relationTypes.includes(type)) {
+                            this.getIndices(property, nextProperty, propertyIndices);
+                        }
+                        data[property.expressID] = property;
+                    }
+                    catch (e) {
+                        console.log(`Could not get property: ${nextProperty}`);
                     }
-                    data[property.expressID] = property;
                 }
                 await this.onPropertiesStreamed.trigger({ type, data });
             }

diff --git a/src/fragments/FragmentIfcStreamer/src/fragment-props-stream-converter.ts b/src/fragments/FragmentIfcStreamer/src/fragment-props-stream-converter.ts
@@ -140,13 +140,17 @@ export class FragmentPropsStreamConverter
           // finalCount++;
           const nextProperty = ids.get(i + j);
 
-          const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
+          try {
+            const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
 
-          if (relationTypes.includes(type)) {
-            this.getIndices(property, nextProperty, propertyIndices);
-          }
+            if (relationTypes.includes(type)) {
+              this.getIndices(property, nextProperty, propertyIndices);
+            }
 
-          data[property.expressID] = property;
+            data[property.expressID] = property;
+          } catch (e) {
+            console.log(`Could not get property: ${nextProperty}`);
+          }
         }
         await this.onPropertiesStreamed.trigger({ type, data });
       }
@@ -158,14 +162,20 @@ export class FragmentPropsStreamConverter
         for (let i = count; i < idCount; i++) {
           // finalCount++;
           const nextProperty = ids.get(i);
-          const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
 
-          if (relationTypes.includes(type)) {
-            this.getIndices(property, nextProperty, propertyIndices);
-          }
+          try {
+            const property = this._webIfc.GetLine(0, nextProperty, isSpatial);
 
-          data[property.expressID] = property;
+            if (relationTypes.includes(type)) {
+              this.getIndices(property, nextProperty, propertyIndices);
+            }
+
+            data[property.expressID] = property;
+          } catch (e) {
+            console.log(`Could not get property: ${nextProperty}`);
+          }
         }
+
         await this.onPropertiesStreamed.trigger({ type, data });
       }
 

diff --git a/src/utils/GeometryUtils/bbox.ts b/src/utils/GeometryUtils/bbox.ts
@@ -1,6 +1,5 @@
 import * as THREE from "three";
 import { ConvexHull } from "three/examples/jsm/math/ConvexHull";
-import ArrayLike = jasmine.ArrayLike;
 
 // src: https://github.com/Mugen87/yuka/blob/844b2581d29de0105336be80eb2fe4cc8dca4ede/src/math/OBB.js#L409-L597