bimplus-renderer 1.6.13 → 1.6.15

package/modelviewer-data-driven-tests/ddt-test-data/README.md

@@ -0,0 +1,3 @@
+* Data ist stored at https://webdrive.allplan.com/s/n274sxcapgCAsyA
+* In case you want to download the data manually, use link above and extract the files in the /files subfolder.
+* Otherwise you can call **yarn sync-modelviewer-ddt** which does the steps for you

package/modelviewer-data-driven-tests/ddt-test-data/remote.conf

@@ -0,0 +1 @@
+https://webdrive.allplan.com/s/n274sxcapgCAsyA/download

package/modelviewer-data-driven-tests/ddt-test-data-long/README.md

@@ -0,0 +1,3 @@
+* Data ist stored at https://webdrive.allplan.com/s/LMSJ3pEQ6xG2MDN
+* In case you want to download the data manually, use link above and extract the files in the /files subfolder.
+* Otherwise you can call **yarn sync-modelviewer-ddt-long** which does the steps for you

package/modelviewer-data-driven-tests/ddt-test-data-long/remote.conf

@@ -0,0 +1 @@
+https://webdrive.allplan.com/s/LMSJ3pEQ6xG2MDN/download

package/modelviewer-data-driven-tests/simple-ddt-client/client.js

@@ -0,0 +1,162 @@
+const DEFAULT_SERVER_URI = 'http://localhost:3456'
+
+
+/**
+ * Client for the simple-ddt-server
+ * Purpose is to list an deliver test data files and store results
+ * to be compareable to previous runs.
+ * @date 12/7/2023 - 6:18:55 AM
+ *
+ * @class Client
+ * @typedef {Client}
+ */
+class Client{
+    constructor(uri){
+        this._serverUri = uri || DEFAULT_SERVER_URI;        
+    }
+
+    /**
+     * Get list of test files from the ddt server
+     * @date 12/7/2023 - 6:21:34 AM
+     *
+     * @returns {*} List of file names
+     */
+    getTestDataList(){
+        return new Promise((resolve, reject)=> {
+          let oReq = new XMLHttpRequest();
+          oReq.open("GET", this._serverUri + '/testdata', true);
+          oReq.responseType = "json";
+        
+          oReq.onerror = () =>{
+            alert('Network error');
+            reject(new Error('Network error'));
+          }
+    
+          oReq.onload = ()=> {
+    
+            if(oReq.status !== 200){
+              alert(`Status: ${oReq.status}. Unable to open file from uri`);
+              return;
+            }
+            
+            resolve(oReq.response.files);      
+          }
+    
+          oReq.send(); 
+        });
+    }
+
+    /**
+     * Get test data file from ddt server
+     * @date 12/7/2023 - 6:22:14 AM
+     *
+     * @param {*} filename
+     * @returns {*}
+     */
+    getTestData(filename){
+    
+        return new Promise((resolve, reject)=> {
+          let oReq = new XMLHttpRequest();
+          oReq.open("GET", `${this._serverUri}/testdata/${filename}`, true);
+          oReq.responseType = "arraybuffer";
+        
+          oReq.onerror = () =>{
+            alert('Network error');
+            reject(new Error('Network error'));
+          }
+    
+          oReq.onload = ()=> {
+    
+            if(oReq.status !== 200){
+              alert(`Status: ${oReq.status}. Unable to open file from uri`);
+              reject(new Error('Unable to open file from uri'));
+            }
+    
+            let arraybuffer = oReq.response;
+            let fileData = new Uint8Array(arraybuffer);
+            
+            resolve(fileData);      
+          }
+    
+          oReq.send(); 
+        });
+      }
+
+      /**
+       * Get previous test result for one file and test name
+       * @date 12/7/2023 - 6:23:06 AM
+       *
+       * @param {*} filename
+       * @param {*} testname
+       * @returns {*}
+       */
+      getTestResult(filename, testname){
+    
+        return new Promise((resolve, reject)=> {
+          let oReq = new XMLHttpRequest();
+          oReq.open("GET", `${this._serverUri}/testdata/${filename}/results/${testname}`, true);
+          oReq.responseType = "json";
+        
+          oReq.onerror = () =>{
+            alert('Network error');
+            reject(new Error('Network error'));
+          }
+    
+          oReq.onload = ()=> {
+    
+    
+            if(oReq.status === 404){
+              resolve();
+            }
+    
+            if(oReq.status !== 200){
+              alert(`Status: ${oReq.status}. Unable to open file from uri`);
+              reject(new Error('Unable to open file from uri'));
+            }
+            
+            resolve(oReq.response);      
+          }
+    
+          oReq.send(); 
+        });
+      }
+
+      /**
+       * Add or replace test result for a filename and testname
+       * @date 12/7/2023 - 6:23:58 AM
+       *
+       * @param {*} filename
+       * @param {*} testname
+       * @param {*} results
+       * @returns {*}
+       */
+      postTestResult(filename, testname, results){
+    
+        return new Promise((resolve, reject)=> {
+          let oReq = new XMLHttpRequest();
+          oReq.open("POST", `${this._serverUri}/testdata/${filename}/results/${testname}`, true);
+          oReq.responseType = "json";
+          oReq.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+        
+          oReq.onerror = () =>{
+            alert('Network error');
+            reject(new Error('Network error'));
+          }
+    
+          oReq.onload = ()=> {
+    
+            if(oReq.status !== 200){
+              alert(`Status: ${oReq.status}. Unable to post test result`);
+              reject(new Error('Unable to post test result'));
+            }
+            
+            resolve(oReq.response);      
+          }
+    
+          oReq.send(JSON.stringify(results)); 
+        });
+    }
+    
+}
+
+export default Client;

package/modelviewer-data-driven-tests/tests/loadIfcTests.js

@@ -0,0 +1,114 @@
+  // Import depdendencies (note you can use relative paths here)
+  import {
+    ViewportHelper
+  } from '../../test/helpers/viewportHelper';
+
+  import {
+    TestHelper
+  } from '../../test/helpers/testHelper';
+  import {
+    GC
+  } from '../../test/helpers/gcHelper';
+  import ProjectViewer from './../../src/viewers/projectViewer';
+  import Client from './../simple-ddt-client/client'
+
+  QUnit.module("modelviewer_tests/loadFromIfc", function () {
+
+    QUnit.test("Ifc loader basic test", async function (assert) {
+
+      // Create client for the simple-ddt-server listening on port 3456
+      let client = new Client('http://localhost:3456');
+
+      let testData = await client.getTestDataList();
+
+      let testHelper = new TestHelper();
+
+      assert.ok(testData && testData.length >0, "No test data files found. In case of remote data, run sync from remote.");
+      
+      // Loop through all test data files
+      for(let filename of testData){
+
+        let viewport3D = new ViewportHelper(true).viewport3D;
+
+        let viewer = new ProjectViewer(testHelper.api, viewport3D, 8, true);
+
+        let project = await viewer.openProject({
+              id : 'MockProject',
+              name : 'MockProjectName'
+          }, []);
+  
+        let objectsContainer = project.getObjectsContainer();
+          
+        let fileData = await client.getTestData(filename);
+        
+        console.log('Starting Test for ' + filename);
+
+        let ifcVIew = new Uint8Array(fileData);
+
+        let model = await viewer.loadIfcFile(ifcVIew);
+
+        assert.ok(model);
+
+        assert.ok(viewport3D.diagnostics.checkViewportState());
+        assert.ok(viewport3D.diagnostics.checkObjects());
+        assert.ok(viewport3D.diagnostics.checkObjectSets());
+        assert.ok(viewport3D.diagnostics.checkDisciplineNodes());
+
+        let numLayers = model.getLayerArray().length;
+        let numObjects = objectsContainer.getObjectCount();
+        let numObjectTypes = 0;
+        let numSubMeshs = 0;
+        let numVertices = 0;
+        let numFaces = 0;
+
+        assert.ok(await viewport3D.setupProjectView());
+        let bb = viewport3D.visibleGeometryBoundingBox;
+        let width = Math.ceil(bb.max.x - bb.min.x);
+        let height = Math.ceil(bb.max.y - bb.min.y);
+        let depth = Math.ceil(bb.max.z - bb.min.z);
+
+        let objectTypes = {};
+        objectsContainer.forEachObject(obj=>{
+          numSubMeshs += obj.meshesData.length;
+          
+          if(!objectTypes[obj.type]){
+            objectTypes[obj.type] = true;
+            numObjectTypes++;
+          }
+
+          numFaces += obj.getNumberOfFaces();
+          numVertices += obj.getEndVertex() - obj.getStartVertex();
+        });
+
+        let testName = QUnit.config.current.testName + '_0';
+        let existingResults = await client.getTestResult(filename, testName);
+        let results = { 
+          numLayers : numLayers,
+          numObjects : numObjects,
+          numObjectTypes : numObjectTypes,
+          numSubMeshs : numSubMeshs,
+          numVertices : numVertices,
+          numFaces : numFaces,
+          boundingBox : {
+            width : width,
+            height : height,
+            depth : depth
+          }
+        };
+
+        // Post results when not existing, otherwise check for equality
+        if(!existingResults){
+          await client.postTestResult(filename, testName, results);
+        }else{
+          assert.deepEqual(existingResults, results, `Test results for ${filename} are differnt to the stored reference!`)
+        }
+
+        await viewer.dispose();
+        GC.run();
+      }
+
+      
+    });
+
+
+  });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bimplus-renderer",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "description": "bim+ renderer",
   "main": "dist/bimplus-renderer.js",
   "license": "MIT",
@@ -100,7 +100,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.2",
     "async": "^3.2.5",
-    "bimplus-renderer": "1.6.4-overlays-43",
+    "bimplus-renderer": "1.6.4-overlays-45",
     "dexie": "3.2.4",
     "fit_transform": "^0.0.6",
     "moment-timezone": "^0.5.43",