Bug Fixes

Author: beachtom

src/wasm/parsing/IfcTokenChunk.cpp

@@ -17,7 +17,7 @@ namespace webifc::parsing
   {
     _chunkData = nullptr;
     if (_fileStream!=nullptr) Load();
-   
+    else _loaded=true;
   }
 
   bool IfcTokenStream::IfcTokenChunk::Clear()

src/wasm/web-ifc-api.cpp

@@ -181,15 +181,15 @@ void StreamMeshes(uint32_t modelID, const std::vector<uint32_t> & expressIds, em
     }
 }
 
-void StreamMeshesVal(uint32_t modelID, emscripten::val expressIdsVal, emscripten::val callback)
+void StreamMeshesWithExpressID(uint32_t modelID, emscripten::val expressIdsVal, emscripten::val callback)
 {
     std::vector<uint32_t> expressIds;
 
     uint32_t size = expressIdsVal["length"].as<uint32_t>();
     uint32_t index = 0;
-    while (index < size)
+    for (size_t i=0; i < size; i++) 
     {
-        emscripten::val expressIdVal = expressIdsVal[std::to_string(index++)];
+        emscripten::val expressIdVal = expressIdsVal[std::to_string(i)];
 
         uint32_t expressId = expressIdVal.as<uint32_t>();
 
@@ -1025,7 +1025,7 @@ EMSCRIPTEN_BINDINGS(my_module) {
     emscripten::function("IsModelOpen", &IsModelOpen);
     emscripten::function("GetGeometry", &GetGeometry);
     emscripten::function("GetFlatMesh", &GetFlatMesh);
-    emscripten::function("StreamMeshes", &StreamMeshesVal);
+    emscripten::function("StreamMeshes", &StreamMeshesWithExpressID);
     emscripten::function("GetCoordinationMatrix", &GetCoordinationMatrix);
     emscripten::function("StreamAllMeshes", &StreamAllMeshes);
     emscripten::function("StreamAllMeshesWithTypes", &StreamAllMeshesWithTypesVal);

tests/functional/WebIfcApi.spec.ts

@@ -570,7 +570,7 @@ describe('creating ifc', () => {
 describe('opening large amounts of data', () => {
     test("open a small model but with a heavy memory restriction", () => {
         let s: LoaderSettings = {
-            MEMORY_LIMIT :  209714,
+            MEMORY_LIMIT :  10485760,
             TAPE_SIZE : 104857
         };
         const exampleIFCData = fs.readFileSync(path.join(__dirname, '../artifacts/S_Office_Integrated Design Archi.ifc.test'));