@inweb/viewer-visualize 25.3.17 → 25.3.19

package/dist/viewer-visualize.js

@@ -65,54 +65,62 @@
 
     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({
@@ -163,151 +171,154 @@
             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;
@@ -315,42 +326,42 @@
         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();
         }
     }
 
@@ -2777,10 +2788,10 @@
             updaterController.initialize(this.viewer);
             this.viewer._abortController = abortController;
             let isFireDatabaseChunk = false;
-            const chunkLoadHandler = (progress, data) => {
+            const chunkLoadHandler = (progress, chunk) => {
                 if (!this.viewer.visualizeJs)
                     return;
-                const status = visViewer.parseVsfx(data);
+                const status = visViewer.parseVsfx(chunk);
                 updaterController.update(UpdateType.kDelay);
                 this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
                 let state = false;
@@ -2794,16 +2805,16 @@
                     this.viewer.syncOpenCloudVisualStyle(false);
                     this.viewer.syncOptions();
                     this.viewer.resize();
-                    this.viewer.emitEvent({ type: "databasechunk", data, model: this.model });
+                    this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });
                 }
                 else {
-                    this.viewer.emitEvent({ type: "geometrychunk", data, model: this.model });
+                    this.viewer.emitEvent({ type: "geometrychunk", data: chunk, model: this.model });
                 }
             };
             console.time("File load time");
             try {
                 this.viewer.emitEvent({ type: "geometrystart", model: this.model });
-                await this.model.partialDownloadResource(this.model.database, chunkLoadHandler, abortController.signal);
+                await this.model.downloadResource(this.model.database, chunkLoadHandler, abortController.signal);
                 console.timeEnd("File load time");
                 updaterController.update(UpdateType.kNormal);
                 this.viewer.emitEvent({ type: "geometryend", model: this.model });
@@ -2816,6 +2827,8 @@
     }
 
     ///////////////////////////////////////////////////////////////////////////////
+    const PENDING_REQUESTS_SIZE = 50;
+    const PENDING_REQUESTS_TIMEOUT = 250;
     class VsfXPartialLoader extends BaseLoader {
         async load() {
             if (!this.viewer.visualizeJs)
@@ -2826,8 +2839,6 @@
             const abortControllerForRequestMap = new Map();
             let servicePartAborted = false;
             const pendingRequestsMap = new Map();
-            const PENDING_REQUESTS_SIZE = 50;
-            const PENDING_REQUESTS_TIMEOUT = 250;
             let pendingRequestsTimerId = 0;
             const pendingRequestsAbortHandler = () => clearTimeout(pendingRequestsTimerId);
             const pendingRequestsAbortController = new AbortController();
@@ -2837,10 +2848,10 @@
             this.viewer._abortController = abortController;
             this.viewer._abortControllerForRequestMap = abortControllerForRequestMap;
             visViewer.memoryLimit = this.options.memoryLimit;
-            const requestLoadHandler = (progress, data, requestId) => {
+            const chunkLoadHandler = (progress, chunk, requestId = 0) => {
                 if (!this.viewer.visualizeJs)
                     return;
-                const state = visViewer.parseVsfxInPartialMode(requestId, data);
+                const state = visViewer.parseVsfxInPartialMode(requestId, chunk);
                 updaterController.update(UpdateType.kDelay);
                 this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
                 if (state) {
@@ -2848,41 +2859,39 @@
                     this.viewer.syncOpenCloudVisualStyle(false);
                     this.viewer.syncOptions();
                     this.viewer.resize();
-                    this.viewer.emitEvent({ type: "databasechunk", data, model: this.model });
+                    this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });
                 }
                 else {
-                    this.viewer.emitEvent({ type: "geometrychunk", data, model: this.model });
+                    this.viewer.emitEvent({ type: "geometrychunk", data: chunk, model: this.model });
                 }
             };
-            const downloadPartOfFile = async (requestId, records, dataId, isMultipleParts = false) => {
+            const downloadResourceRange = async (dataId, requestId, ranges) => {
                 const abortCtrl = new AbortController();
                 abortControllerForRequestMap.set(requestId, abortCtrl);
                 try {
-                    await this.model.downloadFileRange(requestId, records, dataId, requestLoadHandler, abortCtrl.signal);
+                    await this.model.downloadResourceRange(dataId, ranges, requestId, chunkLoadHandler, abortCtrl.signal);
                 }
                 catch (error) {
                     this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
                 }
                 finally {
-                    const requests = isMultipleParts ? [...new Set(records.map((item) => item.reqId))] : [requestId];
-                    requests.forEach((requestId) => visViewer.onRequestResponseComplete(requestId));
+                    ranges.forEach((range) => visViewer.onRequestResponseComplete(range.requestId));
                     abortControllerForRequestMap.delete(requestId);
                     updaterController.update(UpdateType.kNormal);
                 }
             };
-            const recordsToArray = (requestId, records) => {
-                const res = [];
+            const requestRecordsToRanges = (requestId, records) => {
+                const ranges = [];
                 for (let i = 0; i < records.size(); i++) {
                     const record = records.get(i);
-                    res.push({
-                        reqId: requestId,
-                        begin: record.begin,
-                        end: record.end,
-                        size: parseInt(record.end, 10) - parseInt(record.begin, 10),
+                    ranges.push({
+                        requestId,
+                        begin: Number(record.begin),
+                        end: Number(record.end),
                     });
                     record.delete();
                 }
-                return res;
+                return ranges;
             };
             const objectHandler = {
                 onServicePartReceived: (bHasIndex) => {
@@ -2892,11 +2901,11 @@
                     }
                 },
                 onRequest: (requestId, records) => {
-                    downloadPartOfFile(requestId, records, this.model.database);
+                    const ranges = requestRecordsToRanges(requestId, records);
+                    downloadResourceRange(this.model.database, requestId, ranges);
                 },
                 onFullLoaded: () => {
                     updaterController.update(UpdateType.kNormal);
-                    console.timeEnd("File load time");
                 },
                 onRequestResponseParsed: (requestId) => {
                     abortControllerForRequestMap.delete(requestId);
@@ -2907,44 +2916,43 @@
                     if (abortCtrl)
                         abortCtrl.abort();
                 },
-                onRequestResourceFile: async (requestId, _, records) => {
+                onRequestResourceFile: (requestId, _, records) => {
                     const dataId = `${this.model.fileId}${this.model.file.type}`;
-                    let pendingRequests = [];
-                    let recNumber = 0;
-                    const pendingRequestsRecord = pendingRequestsMap.get(dataId);
-                    if (pendingRequestsRecord) {
-                        pendingRequests = pendingRequestsRecord.array;
-                        recNumber = pendingRequestsRecord.number;
+                    const ranges = requestRecordsToRanges(requestId, records);
+                    let pendingRanges = [];
+                    let requestNumber = 0;
+                    const pendingRequest = pendingRequestsMap.get(dataId);
+                    if (pendingRequest) {
+                        pendingRanges = pendingRequest.ranges;
+                        requestNumber = pendingRequest.number;
                     }
                     // first several records of each file are processed without grouping (they usually require to be processed sequentially)
-                    if (recNumber < 6) {
-                        pendingRequestsMap.set(dataId, { array: pendingRequests, number: recNumber + 1 });
-                        await downloadPartOfFile(requestId, records, dataId);
+                    if (requestNumber <= 5) {
+                        pendingRequestsMap.set(dataId, { ranges: [], number: requestNumber + 1 });
+                        downloadResourceRange(dataId, requestId, ranges);
                         return;
                     }
+                    pendingRanges = pendingRanges.concat(ranges);
                     // group requests to each file to launch a combined server request
-                    if (pendingRequests.length >= PENDING_REQUESTS_SIZE) {
+                    if (pendingRanges.length >= PENDING_REQUESTS_SIZE) {
                         if (pendingRequestsTimerId) {
                             window.clearTimeout(pendingRequestsTimerId);
                             pendingRequestsTimerId = 0;
                         }
-                        downloadPartOfFile(requestId, pendingRequests, dataId, true);
-                        pendingRequests = [...recordsToArray(requestId, records)];
-                    }
-                    else {
-                        pendingRequests = [...pendingRequests, ...recordsToArray(requestId, records)];
+                        pendingRequestsMap.set(dataId, { ranges: [], number: requestNumber + 1 });
+                        downloadResourceRange(dataId, requestId, pendingRanges);
+                        return;
                     }
-                    pendingRequestsMap.set(dataId, { array: pendingRequests, number: recNumber + 1 });
+                    pendingRequestsMap.set(dataId, { ranges: pendingRanges, number: requestNumber + 1 });
                     // set timeout to wait for the new requests, after that process the remaining requests
                     if (pendingRequestsTimerId === 0) {
                         pendingRequestsTimerId = window.setTimeout(() => {
                             pendingRequestsAbortController.signal.removeEventListener("abort", pendingRequestsAbortHandler);
                             pendingRequestsTimerId = 0;
-                            pendingRequestsMap.forEach((requestsRecord, keyFileName) => {
-                                const array = requestsRecord.array;
-                                if (array.length > 0) {
-                                    downloadPartOfFile(requestId, array, keyFileName, true);
-                                    pendingRequestsMap.set(keyFileName, { array: [], number: requestsRecord.number + 1 });
+                            pendingRequestsMap.forEach((request, dataId) => {
+                                if (request.ranges.length > 0) {
+                                    pendingRequestsMap.set(dataId, { ranges: [], number: request.number + 1 });
+                                    downloadResourceRange(dataId, requestId, request.ranges);
                                 }
                             });
                         }, PENDING_REQUESTS_TIMEOUT);
@@ -2953,11 +2961,10 @@
                 },
             };
             visViewer.attachPartialResolver(objectHandler);
-            console.time("File load time");
             try {
                 this.viewer.emitEvent({ type: "geometrystart", model: this.model });
                 await this.model
-                    .downloadFileRange(0, null, this.model.database, requestLoadHandler, abortController.signal)
+                    .downloadResource(this.model.database, chunkLoadHandler, abortController.signal)
                     .catch((error) => {
                     if (!servicePartAborted)
                         throw error;
@@ -2984,22 +2991,25 @@
             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 progressCb = (progress) => this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
-                const arrayBuffer = await this.model.downloadResource(this.model.database, progressCb, abortController.signal);
+                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(new Uint8Array(arrayBuffer));
-                    this.viewer.update(true);
+                    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) {
@@ -16662,9 +16672,9 @@
                 visualStyleId = visViewer.findVisualStyle("OpenCloud");
             }
             catch (e) {
-                if (!isInitializing) {
-                    console.log("OpenCloud visual style not found, creating it on client side");
-                }
+                // if (!isInitializing) {
+                //   console.log("OpenCloud visual style not found, creating it on client side");
+                // }
                 visualStyleId = visViewer.createVisualStyle("OpenCloud");
                 const colorDef = new visLib.OdTvColorDef(66, 66, 66);
                 const shadedVsId = visViewer.findVisualStyle("Realistic");
@@ -16684,7 +16694,7 @@
             device.delete();
             return this;
         }
-        syncOptions(options = this.options.data) {
+        syncOptions(options = this.options) {
             if (!this.visualizeJs)
                 return this;
             const visLib = this.visLib();
@@ -16736,7 +16746,7 @@
             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();
@@ -17023,12 +17033,12 @@
                 throw new Error("No default model found");
             const overrideOptions = new Options();
             overrideOptions.data = this.options.data;
-            if (file.type === ".rcs") {
+            if (file.type === ".rcs" && !overrideOptions.enablePartialMode) {
                 console.log("Partial load mode is forced for RCS file");
                 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) {
@@ -17283,10 +17293,12 @@
         }
     }
 
+    exports.CANVAS_EVENTS = CANVAS_EVENTS;
     exports.OdBaseDragger = OdBaseDragger;
     exports.Options = Options;
     exports.Viewer = Viewer;
     exports.commands = commands;
+    exports.defaultOptions = defaultOptions;
 
     Object.defineProperty(exports, '__esModule', { value: true });