@inweb/viewer-visualize 25.3.19 → 25.3.20

package/dist/viewer-visualize.module.js

@@ -693,27 +693,24 @@ commands("VisualizeJS").registerCommand("zoomToSelected", zoomToSelected);
 
 class EventEmitter2 {
     constructor() {
-        this._listeners = undefined;
+        this._listeners = {};
     }
     addEventListener(type, listener) {
-        if (this._listeners === undefined) this._listeners = {};
         if (this._listeners[type] === undefined) this._listeners[type] = [];
         this._listeners[type].push(listener);
         return this;
     }
     removeEventListener(type, listener) {
-        if (this._listeners === undefined) return this;
         if (this._listeners[type] === undefined) return this;
         const listeners = this._listeners[type].filter((x => x !== listener));
-        this._listeners[type] = listeners.length === 0 ? undefined : listeners;
+        if (listeners.length !== 0) this._listeners[type] = listeners; else delete this._listeners[type];
         return this;
     }
     removeAllListeners(type) {
-        if (type) this._listeners[type] = undefined; else this._listeners = undefined;
+        if (type) delete this._listeners[type]; else this._listeners = {};
         return this;
     }
     emitEvent(event) {
-        if (this._listeners === undefined) return false;
         if (this._listeners[event.type] === undefined) return false;
         const invoke = this._listeners[event.type].slice();
         invoke.forEach((listener => listener.call(this, event)));
@@ -2583,27 +2580,25 @@ class TCSLoader extends BaseLoader {
         const visLib = this.viewer.visLib();
         const visViewer = visLib.getViewer();
         const abortController = new AbortController;
-        const listFileForDownload = [ this.model.database, ...this.model.geometry ];
-        const chunksProgress = listFileForDownload.map((() => 0));
-        const calcProgress = (index, progress) => {
-            chunksProgress[index] = progress;
-            const fileProgress = chunksProgress.reduce(((acc, progress) => acc += progress)) / (chunksProgress.length || 1);
-            this.viewer.emitEvent({
-                type: "geometryprogress",
-                data: fileProgress,
-                model: this.model
-            });
-        };
+        const filesToDownload = [ this.model.database, ...this.model.geometry ];
         this.viewer._abortController = abortController;
+        console.time("File load time");
         try {
             this.viewer.emitEvent({
                 type: "geometrystart",
                 model: this.model
             });
-            for (let i = 0; i < listFileForDownload.length; i++) {
-                const chunk = listFileForDownload[i];
-                const progressCb = progress => calcProgress(i, progress);
-                const arrayBuffer = await this.model.downloadResource(chunk, progressCb, abortController.signal);
+            for (let i = 0; i < filesToDownload.length; i++) {
+                const dataId = filesToDownload[i];
+                const chunkLoadHandler = progress => {
+                    const data = (i + progress) / filesToDownload.length;
+                    this.viewer.emitEvent({
+                        type: "geometryprogress",
+                        data: data,
+                        model: this.model
+                    });
+                };
+                const arrayBuffer = await this.model.downloadResource(dataId, chunkLoadHandler, abortController.signal);
                 if (abortController.signal.aborted) {
                     await Promise.reject(new Error(`Open model aborted ${this.model.name}`));
                 }
@@ -2628,6 +2623,59 @@ class TCSLoader extends BaseLoader {
                     });
                 }
             }
+            console.timeEnd("File load time");
+            this.viewer.emitEvent({
+                type: "geometryend",
+                model: this.model
+            });
+        } catch (error) {
+            this.viewer.emitEvent({
+                type: "geometryerror",
+                data: error,
+                model: this.model
+            });
+            throw error;
+        }
+    }
+}
+
+class VsfXLoader extends BaseLoader {
+    async load() {
+        if (!this.viewer.visualizeJs) return;
+        const visLib = this.viewer.visLib();
+        const visViewer = visLib.getViewer();
+        const abortController = new AbortController;
+        this.viewer._abortController = abortController;
+        const chunkLoadHandler = progress => {
+            this.viewer.emitEvent({
+                type: "geometryprogress",
+                data: progress,
+                model: this.model
+            });
+        };
+        console.time("File load time");
+        try {
+            this.viewer.emitEvent({
+                type: "geometrystart",
+                model: this.model
+            });
+            const arrayBuffer = await this.model.downloadResource(this.model.database, chunkLoadHandler, abortController.signal);
+            if (abortController.signal.aborted) {
+                await Promise.reject(new Error(`Open model aborted ${this.model.name}`));
+            }
+            const data = new Uint8Array(arrayBuffer);
+            if (this.viewer.visualizeJs) {
+                visViewer.parseVsfx(data);
+                this.viewer.syncOpenCloudVisualStyle(false);
+                this.viewer.syncOptions();
+                this.viewer.resize();
+            }
+            console.timeEnd("File load time");
+            this.viewer.emitEvent({
+                type: "databasechunk",
+                data: data,
+                model: this.model
+            });
             this.viewer.emitEvent({
                 type: "geometryend",
                 model: this.model
@@ -2657,6 +2705,7 @@ var UpdateType;
 
 class UpdaterController {
     constructor() {
+        this.lastUpdate = 0;
         this.delayUpdateTime = START_UPDATE_TIME;
     }
     initialize(viewer) {
@@ -2793,7 +2842,7 @@ class VsfXPartialLoader extends BaseLoader {
             const abortCtrl = new AbortController;
             abortControllerForRequestMap.set(requestId, abortCtrl);
             try {
-                await this.model.downloadResourceRange(dataId, ranges, requestId, chunkLoadHandler, abortCtrl.signal);
+                await this.model.downloadResourceRange(dataId, requestId, ranges, chunkLoadHandler, abortCtrl.signal);
             } catch (error) {
                 this.viewer.emitEvent({
                     type: "geometryerror",
@@ -2924,58 +2973,6 @@ class VsfXPartialLoader extends BaseLoader {
     }
 }
 
-class VsfXLoader extends BaseLoader {
-    async load() {
-        if (!this.viewer.visualizeJs) return;
-        const visLib = this.viewer.visLib();
-        const visViewer = visLib.getViewer();
-        const abortController = new AbortController;
-        this.viewer._abortController = abortController;
-        const chunkLoadHandler = progress => {
-            this.viewer.emitEvent({
-                type: "geometryprogress",
-                data: progress,
-                model: this.model
-            });
-        };
-        console.time("File load time");
-        try {
-            this.viewer.emitEvent({
-                type: "geometrystart",
-                model: this.model
-            });
-            const arrayBuffer = await this.model.downloadResource(this.model.database, chunkLoadHandler, abortController.signal);
-            if (abortController.signal.aborted) {
-                await Promise.reject(new Error(`Open model aborted ${this.model.name}`));
-            }
-            const data = new Uint8Array(arrayBuffer);
-            if (this.viewer.visualizeJs) {
-                visViewer.parseVsfx(data);
-                this.viewer.syncOpenCloudVisualStyle(false);
-                this.viewer.syncOptions();
-                this.viewer.resize();
-            }
-            console.timeEnd("File load time");
-            this.viewer.emitEvent({
-                type: "databasechunk",
-                data: data,
-                model: this.model
-            });
-            this.viewer.emitEvent({
-                type: "geometryend",
-                model: this.model
-            });
-        } catch (error) {
-            this.viewer.emitEvent({
-                type: "geometryerror",
-                data: error,
-                model: this.model
-            });
-            throw error;
-        }
-    }
-}
-
 class LoaderFactory {
     create(viewer, model, options) {
         const geometryType = model.database.split(".").pop();
@@ -4918,15 +4915,17 @@ const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
 const isExist = value => value !== undefined && value !== null;
 
 class Viewer extends EventEmitter2 {
-    constructor(client, params = {
-        markupType: MarkupType.Konva
-    }) {
+    constructor(client, params = {}) {
         var _a, _b;
         super();
+        this._visualizeJsUrl = "";
+        this.frameId = 0;
         this.configure(params);
         this._options = new Options(this);
         this.client = client;
         this._activeDragger = null;
+        this._zoomWheelDragger = null;
+        this._gestureManager = null;
         this._renderTime = 0;
         this.markup = MarkupFactory.createMarkup((_a = params.markupType) !== null && _a !== void 0 ? _a : MarkupType.Konva);
         this.draggerFactory = new Map;
@@ -5064,7 +5063,7 @@ class Viewer extends EventEmitter2 {
         });
         return this;
     }
-    update(force) {
+    update(force = false) {
         var _a, _b;
         if (this._enableAutoUpdate) {
             if (force) {
@@ -5328,6 +5327,7 @@ class Viewer extends EventEmitter2 {
     async loadReferences(model) {
         var _a;
         if (!this.visualizeJs) return this;
+        if (!this.client) return this;
         const abortController = new AbortController;
         (_a = this._abortControllerForReferences) === null || _a === void 0 ? void 0 : _a.abort();
         this._abortControllerForReferences = abortController;
@@ -5364,7 +5364,7 @@ class Viewer extends EventEmitter2 {
             file: file,
             model: file
         });
-        let model;
+        let model = undefined;
         if (file) {
             const models = await file.getModels() || [];
             model = models.find((model => model.default)) || models[0];