@inweb/viewer-visualize 25.3.19 → 25.3.21

package/dist/viewer-visualize.js

@@ -365,7 +365,9 @@
         }
     }
 
-    const CANVAS_EVENTS = [ "click", "dblclick", "mousedown", "mousemove", "mouseup", "mouseleave", "pointerdown", "pointermove", "pointerup", "pointerleave", "pointercancel", "wheel", "touchstart", "touchmove", "touchend", "touchcancel" ];
+    const CanvasEvents = [ "click", "contextmenu", "dblclick", "mousedown", "mouseleave", "mousemove", "mouseup", "pointercancel", "pointerdown", "pointerleave", "pointermove", "pointerup", "touchcancel", "touchend", "touchmove", "touchstart", "wheel" ];
+
+    const CANVAS_EVENTS = CanvasEvents;
 
     ///////////////////////////////////////////////////////////////////////////////
     const composeMatrixFromTransform = (translate, rotate, scale, modelCenter, matrix) => {
@@ -680,27 +682,24 @@
 
     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)));
@@ -2709,20 +2708,18 @@
             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, 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}`));
                     }
@@ -2740,6 +2737,44 @@
                         this.viewer.emitEvent({ type: "geometrychunk", data, model: this.model });
                     }
                 }
+                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, model: this.model });
                 this.viewer.emitEvent({ type: "geometryend", model: this.model });
             }
             catch (error) {
@@ -2759,6 +2794,7 @@
     })(UpdateType || (UpdateType = {}));
     class UpdaterController {
         constructor() {
+            this.lastUpdate = 0;
             this.delayUpdateTime = START_UPDATE_TIME;
         }
         initialize(viewer) {
@@ -2869,7 +2905,7 @@
                 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", data: error, model: this.model });
@@ -2982,43 +3018,6 @@
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////////
-    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, 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) {
@@ -16401,15 +16400,17 @@
          *   the auto-update is disabled, you need to update the `VisualizeJS` viewer and the active
          *   dragger manually using the `update` event. Default is `true`.
          */
-        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();
@@ -16427,7 +16428,7 @@
             markupDraggers === null || markupDraggers === void 0 ? void 0 : markupDraggers.forEach((value, key) => {
                 this.registerDragger(key, value);
             });
-            this.canvasEvents = CANVAS_EVENTS;
+            this.canvasEvents = CANVAS_EVENTS.slice();
             this.canvaseventlistener = (event) => this.emit(event);
             this._enableAutoUpdate = (_b = params.enableAutoUpdate) !== null && _b !== void 0 ? _b : true;
             this._isNeedRender = false;
@@ -16586,7 +16587,7 @@
          * @param force - If `true` updates the viewer immidietly. Otherwise updates on next
          *   animation frame. Default is `false`.
          */
-        update(force) {
+        update(force = false) {
             var _a, _b;
             if (this._enableAutoUpdate) {
                 if (force) {
@@ -16961,6 +16962,8 @@
             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;
@@ -17024,7 +17027,7 @@
             this.cancel();
             this.clear();
             this.emitEvent({ type: "open", file, model: file });
-            let model;
+            let model = undefined;
             if (file) {
                 const models = (await file.getModels()) || [];
                 model = models.find((model) => model.default) || models[0];
@@ -17294,6 +17297,7 @@
     }
 
     exports.CANVAS_EVENTS = CANVAS_EVENTS;
+    exports.CanvasEvents = CanvasEvents;
     exports.OdBaseDragger = OdBaseDragger;
     exports.Options = Options;
     exports.Viewer = Viewer;