@inweb/viewer-visualize 25.3.18 → 25.3.20

package/dist/viewer-visualize.module.js

@@ -61,54 +61,62 @@ commands("VisualizeJS").registerCommand("noop", (() => {}));
 
 commands("ThreeJS").registerCommand("noop", (() => {}));
 
+function defaultOptions() {
+    return {
+        showWCS: true,
+        cameraAnimation: true,
+        antialiasing: true,
+        groundShadow: false,
+        shadows: false,
+        cameraAxisXSpeed: 4,
+        cameraAxisYSpeed: 1,
+        ambientOcclusion: false,
+        enableStreamingMode: true,
+        enablePartialMode: false,
+        memoryLimit: 3294967296,
+        cuttingPlaneFillColor: {
+            red: 255,
+            green: 152,
+            blue: 0
+        },
+        edgesColor: {
+            r: 255,
+            g: 152,
+            b: 0
+        },
+        facesColor: {
+            r: 255,
+            g: 152,
+            b: 0
+        },
+        edgesVisibility: true,
+        edgesOverlap: true,
+        facesOverlap: false,
+        facesTransparancy: 200,
+        enableCustomHighlight: true,
+        sceneGraph: false,
+        edgeModel: true,
+        reverseZoomWheel: false,
+        enableZoomWheel: true,
+        enableGestures: true,
+        geometryType: "vsfx"
+    };
+}
+
 class Options {
     constructor(emitter) {
         this._emitter = emitter;
-        this._data = Options.defaults();
+        this._data = defaultOptions();
         this.loadFromStorage();
     }
     static defaults() {
-        return {
-            showWCS: true,
-            cameraAnimation: true,
-            antialiasing: true,
-            groundShadow: false,
-            shadows: false,
-            cameraAxisXSpeed: 4,
-            cameraAxisYSpeed: 1,
-            ambientOcclusion: false,
-            enableStreamingMode: true,
-            enablePartialMode: false,
-            memoryLimit: 3294967296,
-            cuttingPlaneFillColor: {
-                red: 255,
-                green: 152,
-                blue: 0
-            },
-            edgesColor: {
-                r: 255,
-                g: 152,
-                b: 0
-            },
-            facesColor: {
-                r: 255,
-                g: 152,
-                b: 0
-            },
-            edgesVisibility: true,
-            edgesOverlap: true,
-            facesOverlap: false,
-            facesTransparancy: 200,
-            enableCustomHighlight: true,
-            sceneGraph: false,
-            edgeModel: true,
-            reverseZoomWheel: false,
-            enableZoomWheel: true,
-            enableGestures: true,
-            geometryType: "vsfx"
-        };
+        return defaultOptions();
     }
     notifierChangeEvent() {
+        console.warn("Options.notifierChangeEvent() has been deprecated since 25.3 and will be removed in a future release, use Options.change() instead.");
+        this.change();
+    }
+    change() {
         if (this._emitter !== undefined) {
             this.saveToStorage();
             this._emitter.emit({
@@ -159,151 +167,154 @@ class Options {
         return this._data;
     }
     set data(value) {
-        const sceneGraph = value.enablePartialMode ? false : value.sceneGraph;
+        const enablePartialMode = value.enableStreamingMode ? value.enablePartialMode : false;
+        const sceneGraph = enablePartialMode ? false : value.sceneGraph;
         this._data = {
             ...Options.defaults(),
             ...this._data,
             ...value,
+            enablePartialMode: enablePartialMode,
             sceneGraph: sceneGraph
         };
-        this.notifierChangeEvent();
+        this.change();
     }
     get showWCS() {
         return this._data.showWCS;
     }
     set showWCS(value) {
         this._data.showWCS = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get cameraAnimation() {
         return this._data.cameraAnimation;
     }
     set cameraAnimation(value) {
         this._data.cameraAnimation = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get antialiasing() {
         return this._data.antialiasing;
     }
     set antialiasing(value) {
         this._data.antialiasing = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get groundShadow() {
         return this._data.groundShadow;
     }
     set groundShadow(value) {
         this._data.groundShadow = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get shadows() {
         return this._data.shadows;
     }
     set shadows(value) {
         this._data.shadows = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get cameraAxisXSpeed() {
         return this._data.cameraAxisXSpeed;
     }
     set cameraAxisXSpeed(value) {
         this._data.cameraAxisXSpeed = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get cameraAxisYSpeed() {
         return this._data.cameraAxisYSpeed;
     }
     set cameraAxisYSpeed(value) {
         this.cameraAxisYSpeed = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get ambientOcclusion() {
         return this._data.ambientOcclusion;
     }
     set ambientOcclusion(value) {
         this._data.ambientOcclusion = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get enableStreamingMode() {
         return this._data.enableStreamingMode;
     }
     set enableStreamingMode(value) {
         this._data.enableStreamingMode = value;
-        if (this._data.enableStreamingMode) {
-            this._data.enablePartialMode = false;
-        }
-        this.notifierChangeEvent();
+        if (!value) this._data.enablePartialMode = false;
+        this.change();
     }
     get enablePartialMode() {
         return this._data.enablePartialMode;
     }
     set enablePartialMode(value) {
         this._data.enablePartialMode = value;
-        if (value) this._data.sceneGraph = false;
-        this.notifierChangeEvent();
+        if (value) {
+            this._data.enableStreamingMode = true;
+            this._data.sceneGraph = false;
+        }
+        this.change();
     }
     get memoryLimit() {
         return this._data.memoryLimit;
     }
     set memoryLimit(value) {
         this._data.memoryLimit = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get cuttingPlaneFillColor() {
         return this._data.cuttingPlaneFillColor;
     }
     set cuttingPlaneFillColor(value) {
         this._data.cuttingPlaneFillColor = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get edgesColor() {
         return this._data.edgesColor;
     }
     set edgesColor(value) {
         this._data.edgesColor = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get facesColor() {
         return this._data.facesColor;
     }
     set facesColor(value) {
         this._data.facesColor = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get edgesVisibility() {
         return this._data.edgesVisibility;
     }
     set edgesVisibility(value) {
         this._data.edgesVisibility = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get edgesOverlap() {
         return this._data.edgesOverlap;
     }
     set edgesOverlap(value) {
         this._data.edgesOverlap = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get facesOverlap() {
         return this._data.facesOverlap;
     }
     set facesOverlap(value) {
         this._data.facesOverlap = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get facesTransparancy() {
         return this._data.facesTransparancy;
     }
     set facesTransparancy(value) {
         this._data.facesTransparancy = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get enableCustomHighlight() {
         return this._data.enableCustomHighlight;
     }
     set enableCustomHighlight(value) {
         this._data.enableCustomHighlight = value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get sceneGraph() {
         return this._data.sceneGraph;
@@ -311,42 +322,42 @@ class Options {
     set sceneGraph(value) {
         this._data.sceneGraph = value;
         if (value) this._data.enablePartialMode = false;
-        this.notifierChangeEvent();
+        this.change();
     }
     get edgeModel() {
         return Boolean(this._data.edgeModel);
     }
     set edgeModel(value) {
         this._data.edgeModel = Boolean(value);
-        this.notifierChangeEvent();
+        this.change();
     }
     get reverseZoomWheel() {
         return this._data.reverseZoomWheel;
     }
     set reverseZoomWheel(value) {
         this._data.reverseZoomWheel = !!value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get enableZoomWheel() {
         return this._data.enableZoomWheel;
     }
     set enableZoomWheel(value) {
         this._data.enableZoomWheel = !!value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get enableGestures() {
         return this._data.enableGestures;
     }
     set enableGestures(value) {
         this._data.enableGestures = !!value;
-        this.notifierChangeEvent();
+        this.change();
     }
     get geometryType() {
         return this._data.geometryType;
     }
     set geometryType(value) {
         this._data.geometryType = value;
-        this.notifierChangeEvent();
+        this.change();
     }
 }
 
@@ -682,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)));
@@ -2572,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}`));
                 }
@@ -2617,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
@@ -2646,6 +2705,7 @@ var UpdateType;
 
 class UpdaterController {
     constructor() {
+        this.lastUpdate = 0;
         this.delayUpdateTime = START_UPDATE_TIME;
     }
     initialize(viewer) {
@@ -2779,13 +2839,11 @@ class VsfXPartialLoader extends BaseLoader {
             }
         };
         const downloadResourceRange = async (dataId, requestId, ranges) => {
-            console.log("--- VsfXPartialLoader.downloadResourceRange", dataId, requestId, ranges);
             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) {
-                console.log("--- VsfXPartialLoader.downloadResourceRange error", dataId, requestId, error);
                 this.viewer.emitEvent({
                     type: "geometryerror",
                     data: error,
@@ -2812,7 +2870,6 @@ class VsfXPartialLoader extends BaseLoader {
         };
         const objectHandler = {
             onServicePartReceived: bHasIndex => {
-                console.log("--- VsfXPartialLoader.onServicePartReceived", bHasIndex);
                 if (bHasIndex) {
                     servicePartAborted = true;
                     abortController.abort();
@@ -2820,26 +2877,22 @@ class VsfXPartialLoader extends BaseLoader {
             },
             onRequest: (requestId, records) => {
                 const ranges = requestRecordsToRanges(requestId, records);
-                console.log("--- VsfXPartialLoader.onRequest", this.model.database, requestId, ranges);
                 downloadResourceRange(this.model.database, requestId, ranges);
             },
             onFullLoaded: () => {
-                console.log("--- VsfXPartialLoader.onFullLoaded");
                 updaterController.update(UpdateType.kNormal);
             },
             onRequestResponseParsed: requestId => {
-                console.log("--- VsfXPartialLoader.onRequestResponseParsed", requestId);
                 abortControllerForRequestMap.delete(requestId);
                 updaterController.update(UpdateType.kNormal);
             },
             onRequestAborted: requestId => {
-                console.log("--- VsfXPartialLoader.onRequestAborted", requestId);
                 const abortCtrl = abortControllerForRequestMap.get(requestId);
                 if (abortCtrl) abortCtrl.abort();
             },
-            onRequestResourceFile: (requestId, dataId, records) => {
+            onRequestResourceFile: (requestId, _, records) => {
+                const dataId = `${this.model.fileId}${this.model.file.type}`;
                 const ranges = requestRecordsToRanges(requestId, records);
-                console.log("--- VsfXPartialLoader.onRequestResourceFile", dataId, requestId, ranges);
                 let pendingRanges = [];
                 let requestNumber = 0;
                 const pendingRequest = pendingRequestsMap.get(dataId);
@@ -2848,7 +2901,6 @@ class VsfXPartialLoader extends BaseLoader {
                     requestNumber = pendingRequest.number;
                 }
                 if (requestNumber <= 5) {
-                    console.log("--- VsfXPartialLoader.onRequestResourceFile: requestNumber <= 5");
                     pendingRequestsMap.set(dataId, {
                         ranges: [],
                         number: requestNumber + 1
@@ -2858,7 +2910,6 @@ class VsfXPartialLoader extends BaseLoader {
                 }
                 pendingRanges = pendingRanges.concat(ranges);
                 if (pendingRanges.length >= PENDING_REQUESTS_SIZE) {
-                    console.log("--- VsfXPartialLoader.onRequestResourceFile: pendingRanges.length >", PENDING_REQUESTS_SIZE);
                     if (pendingRequestsTimerId) {
                         window.clearTimeout(pendingRequestsTimerId);
                         pendingRequestsTimerId = 0;
@@ -2876,7 +2927,6 @@ class VsfXPartialLoader extends BaseLoader {
                 });
                 if (pendingRequestsTimerId === 0) {
                     pendingRequestsTimerId = window.setTimeout((() => {
-                        console.log("--- VsfXPartialLoader.onRequestResourceFile: timer", PENDING_REQUESTS_SIZE);
                         pendingRequestsAbortController.signal.removeEventListener("abort", pendingRequestsAbortHandler);
                         pendingRequestsTimerId = 0;
                         pendingRequestsMap.forEach(((request, dataId) => {
@@ -2923,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();
@@ -4917,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;
@@ -5063,7 +5063,7 @@ class Viewer extends EventEmitter2 {
         });
         return this;
     }
-    update(force) {
+    update(force = false) {
         var _a, _b;
         if (this._enableAutoUpdate) {
             if (force) {
@@ -5145,7 +5145,7 @@ class Viewer extends EventEmitter2 {
         device.delete();
         return this;
     }
-    syncOptions(options = this.options.data) {
+    syncOptions(options = this.options) {
         if (!this.visualizeJs) return this;
         const visLib = this.visLib();
         const visViewer = visLib.getViewer();
@@ -5195,7 +5195,7 @@ class Viewer extends EventEmitter2 {
         this.update();
         return this;
     }
-    syncHighlightingOptions(options = this.options.data) {
+    syncHighlightingOptions(options = this.options) {
         if (!this.visualizeJs) return this;
         const params = options.enableCustomHighlight ? options : Options.defaults();
         const visLib = this.visLib();
@@ -5327,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;
@@ -5363,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];
@@ -5376,7 +5377,7 @@ class Viewer extends EventEmitter2 {
             overrideOptions.enablePartialMode = true;
         }
         const loaderFactory = new LoaderFactory;
-        const loader = loaderFactory.create(this, model, overrideOptions.data);
+        const loader = loaderFactory.create(this, model, overrideOptions);
         await this.loadReferences(model);
         await loader.load();
         if (this.visualizeJs) {
@@ -5607,5 +5608,5 @@ class Viewer extends EventEmitter2 {
     }
 }
 
-export { OdBaseDragger, Options, Viewer, commands };
+export { CANVAS_EVENTS, OdBaseDragger, Options, Viewer, commands, defaultOptions };
 //# sourceMappingURL=viewer-visualize.module.js.map