@inweb/viewer-visualize 26.6.1 → 26.6.3

package/dist/viewer-visualize.js

@@ -3853,7 +3853,54 @@
     // By use of this software, its documentation or related materials, you
     // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
-    class VSFModelLoader extends Loader {
+    class VSFBufferLoader extends Loader {
+        constructor(viewer) {
+            super();
+            this.viewer = viewer;
+        }
+        isSupport(file, format) {
+            return file instanceof ArrayBuffer && /vsf$/i.test(format);
+        }
+        load(buffer, format) {
+            if (!this.viewer.visualizeJs)
+                return Promise.resolve(this);
+            const visLib = this.viewer.visLib();
+            const visViewer = visLib.getViewer();
+            const data = new Uint8Array(buffer);
+            visViewer.parseFile(data);
+            this.viewer.syncOpenCloudVisualStyle(false);
+            this.viewer.syncOptions();
+            this.viewer.syncOverlay();
+            this.viewer.resize();
+            this.viewer.emitEvent({ type: "geometryprogress", data: 1, file: buffer });
+            this.viewer.emitEvent({ type: "databasechunk", data, file: buffer });
+            return Promise.resolve(this);
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
+    // All rights reserved.
+    //
+    // This software and its documentation and related materials are owned by
+    // the Alliance. The software may only be incorporated into application
+    // programs owned by members of the Alliance, subject to a signed
+    // Membership Agreement and Supplemental Software License Agreement with the
+    // Alliance. The structure and organization of this software are the valuable
+    // trade secrets of the Alliance and its suppliers. The software is also
+    // protected by copyright law and international treaty provisions. Application
+    // programs incorporating this software must include the following statement
+    // with their copyright notices:
+    //
+    //   This application incorporates Open Design Alliance software pursuant to a
+    //   license agreement with Open Design Alliance.
+    //   Open Design Alliance Copyright (C) 2002-2025 by Open Design Alliance.
+    //   All rights reserved.
+    //
+    // By use of this software, its documentation or related materials, you
+    // acknowledge and accept the above terms.
+    ///////////////////////////////////////////////////////////////////////////////
+    class VSFCloudModelLoader extends Loader {
         constructor(viewer) {
             super();
             this.viewer = viewer;
@@ -3922,13 +3969,13 @@
     // By use of this software, its documentation or related materials, you
     // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
-    class VSFBufferLoader extends Loader {
+    class VSFXBufferLoader extends Loader {
         constructor(viewer) {
             super();
             this.viewer = viewer;
         }
         isSupport(file, format) {
-            return file instanceof ArrayBuffer && /vsf$/i.test(format);
+            return file instanceof ArrayBuffer && /vsfx$/i.test(format);
         }
         load(buffer, format) {
             if (!this.viewer.visualizeJs)
@@ -3936,7 +3983,7 @@
             const visLib = this.viewer.visLib();
             const visViewer = visLib.getViewer();
             const data = new Uint8Array(buffer);
-            visViewer.parseFile(data);
+            visViewer.parseVsfx(data);
             this.viewer.syncOpenCloudVisualStyle(false);
             this.viewer.syncOptions();
             this.viewer.syncOverlay();
@@ -3969,7 +4016,7 @@
     // By use of this software, its documentation or related materials, you
     // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
-    class VSFXModelLoader extends Loader {
+    class VSFXCloudModelLoader extends Loader {
         constructor(viewer) {
             super();
             this.viewer = viewer;
@@ -4077,13 +4124,14 @@
     // By use of this software, its documentation or related materials, you
     // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
-    class VSFXStreamingLoader extends Loader {
+    class VSFXCloudStreamingLoader extends Loader {
         constructor(viewer) {
             super();
             this.viewer = viewer;
         }
         isSupport(file) {
             return (typeof file === "object" &&
+                typeof file.database === "string" &&
                 typeof file.downloadResource === "function" &&
                 /.vsfx$/i.test(file.database) &&
                 this.viewer.options.enableStreamingMode === true &&
@@ -4154,7 +4202,7 @@
     ///////////////////////////////////////////////////////////////////////////////
     const PENDING_REQUESTS_SIZE = 50;
     const PENDING_REQUESTS_TIMEOUT = 250;
-    class VSFXPartialLoader extends Loader {
+    class VSFXCloudPartialLoader extends Loader {
         constructor(viewer) {
             super();
             this.viewer = viewer;
@@ -4162,6 +4210,7 @@
         }
         isSupport(file) {
             return (typeof file === "object" &&
+                typeof file.database === "string" &&
                 typeof file.downloadResource === "function" &&
                 /.vsfx$/i.test(file.database) &&
                 (this.viewer.options.enablePartialMode === true || /.rcs$/i.test(file.name)));
@@ -4310,53 +4359,6 @@
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////////
-    // Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
-    // All rights reserved.
-    //
-    // This software and its documentation and related materials are owned by
-    // the Alliance. The software may only be incorporated into application
-    // programs owned by members of the Alliance, subject to a signed
-    // Membership Agreement and Supplemental Software License Agreement with the
-    // Alliance. The structure and organization of this software are the valuable
-    // trade secrets of the Alliance and its suppliers. The software is also
-    // protected by copyright law and international treaty provisions. Application
-    // programs incorporating this software must include the following statement
-    // with their copyright notices:
-    //
-    //   This application incorporates Open Design Alliance software pursuant to a
-    //   license agreement with Open Design Alliance.
-    //   Open Design Alliance Copyright (C) 2002-2025 by Open Design Alliance.
-    //   All rights reserved.
-    //
-    // By use of this software, its documentation or related materials, you
-    // acknowledge and accept the above terms.
-    ///////////////////////////////////////////////////////////////////////////////
-    class VSFXBufferLoader extends Loader {
-        constructor(viewer) {
-            super();
-            this.viewer = viewer;
-        }
-        isSupport(file, format) {
-            return file instanceof ArrayBuffer && /vsfx$/i.test(format);
-        }
-        load(buffer, format) {
-            if (!this.viewer.visualizeJs)
-                return Promise.resolve(this);
-            const visLib = this.viewer.visLib();
-            const visViewer = visLib.getViewer();
-            const data = new Uint8Array(buffer);
-            visViewer.parseVsfx(data);
-            this.viewer.syncOpenCloudVisualStyle(false);
-            this.viewer.syncOptions();
-            this.viewer.syncOverlay();
-            this.viewer.resize();
-            this.viewer.emitEvent({ type: "geometryprogress", data: 1, file: buffer });
-            this.viewer.emitEvent({ type: "databasechunk", data, file: buffer });
-            return Promise.resolve(this);
-        }
-    }
-
     ///////////////////////////////////////////////////////////////////////////////
     // Copyright (C) 2002-2025, Open Design Alliance (the "Alliance").
     // All rights reserved.
@@ -4446,12 +4448,12 @@
      */
     const loaders = loadersRegistry("visualizejs");
     // build-in loaders
-    loaders.registerLoader("vsf", (viewer) => new VSFModelLoader(viewer));
     loaders.registerLoader("vsf-buffer", (viewer) => new VSFBufferLoader(viewer));
-    loaders.registerLoader("vsfx", (viewer) => new VSFXModelLoader(viewer));
-    loaders.registerLoader("vsfx-streaming", (viewer) => new VSFXStreamingLoader(viewer));
-    loaders.registerLoader("vsfx-partial", (viewer) => new VSFXPartialLoader(viewer));
+    loaders.registerLoader("vsf-cloud-model", (viewer) => new VSFCloudModelLoader(viewer));
     loaders.registerLoader("vsfx-buffer", (viewer) => new VSFXBufferLoader(viewer));
+    loaders.registerLoader("vsfx-cloud-model", (viewer) => new VSFXCloudModelLoader(viewer));
+    loaders.registerLoader("vsfx-cloud-streaming", (viewer) => new VSFXCloudStreamingLoader(viewer));
+    loaders.registerLoader("vsfx-cloud-partial", (viewer) => new VSFXCloudPartialLoader(viewer));
 
     class EventEmitter2 {
         constructor() {
@@ -16512,7 +16514,7 @@
                 let wcsPoints = this._ref.getAttr("wcsPoints");
                 if (!wcsPoints) {
                     wcsPoints = [];
-                    let points = this._ref.points();
+                    const points = this._ref.points();
                     let wcsPoint;
                     for (let i = 0; i < points.length; i += 2) {
                         wcsPoint = this._worldTransformer.screenToWorld({
@@ -16541,7 +16543,7 @@
             const wcsPoints = [];
             params.points.forEach((point => {
                 konvaPoints.push(point.x, point.y);
-                let wcsPoint = this._worldTransformer.screenToWorld({
+                const wcsPoint = this._worldTransformer.screenToWorld({
                     x: point.x,
                     y: point.y
                 });
@@ -16569,8 +16571,8 @@
             }));
             this._ref.on("transformend", (e => {
                 const absoluteTransform = this._ref.getAbsoluteTransform();
-                let wcsPoints = [];
-                let points = this._ref.points();
+                const wcsPoints = [];
+                const points = this._ref.points();
                 let wcsPoint;
                 for (let i = 0; i < points.length; i += 2) {
                     const position = absoluteTransform.point({
@@ -16591,8 +16593,8 @@
             }));
             this._ref.on("dragend", (e => {
                 const absoluteTransform = this._ref.getAbsoluteTransform();
-                let wcsPoints = [];
-                let points = this._ref.points();
+                const wcsPoints = [];
+                const points = this._ref.points();
                 let wcsPoint;
                 for (let i = 0; i < points.length; i += 2) {
                     const position = absoluteTransform.point({
@@ -16680,17 +16682,17 @@
         }
         addPoints(points) {
             let newPoints = this._ref.points();
-            let wcsPoints = this._ref.getAttr("wcsPoints");
+            const wcsPoints = this._ref.getAttr("wcsPoints");
             points.forEach((point => {
                 newPoints = newPoints.concat([ point.x, point.y ]);
-                let wcsPoint = this._worldTransformer.screenToWorld(point);
+                const wcsPoint = this._worldTransformer.screenToWorld(point);
                 wcsPoints.push(wcsPoint);
             }));
             this._ref.points(newPoints);
         }
         updateScreenCoordinates() {
-            let wcsPoints = this._ref.getAttr("wcsPoints");
-            let points = [];
+            const wcsPoints = this._ref.getAttr("wcsPoints");
+            const points = [];
             let invert = this._ref.getAbsoluteTransform().copy();
             invert = invert.invert();
             wcsPoints.forEach((point => {
@@ -16849,7 +16851,7 @@
             this._ref.fontSize(size);
         }
         updateScreenCoordinates() {
-            let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+            const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
             let invert = this._ref.getStage().getAbsoluteTransform().copy();
             invert = invert.invert();
             const positionStart = invert.point(screenPositionStart);
@@ -17065,8 +17067,8 @@
             return this._ref.strokeWidth();
         }
         updateScreenCoordinates() {
-            let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-            let screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+            const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+            const screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
             let invert = this._ref.getStage().getAbsoluteTransform().copy();
             invert = invert.invert();
             const positionStart = invert.point(screenPositionStart);
@@ -17304,9 +17306,9 @@
             this._ref = null;
         }
         updateScreenCoordinates() {
-            let screenPosition = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsPosition"));
-            let radiusX = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusX"));
-            let radiusY = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusY"));
+            const screenPosition = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsPosition"));
+            const radiusX = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusX"));
+            const radiusY = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsRadiusY"));
             let invert = this._ref.getStage().getAbsoluteTransform().copy();
             invert = invert.invert();
             const position = invert.point({
@@ -17491,8 +17493,8 @@
             }));
         }
         updateScreenCoordinates() {
-            let screenStartPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-            let screenEndPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+            const screenStartPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+            const screenEndPoint = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
             let invert = this._ref.getAbsoluteTransform().copy();
             invert = invert.invert();
             const startPoint = invert.point({
@@ -17730,8 +17732,8 @@
             this._ref.setAttr("wcsEnd", wcsRightLowerPoint);
         }
         updateScreenCoordinates() {
-            let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-            let screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+            const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+            const screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
             let invert = this._ref.getStage().getAbsoluteTransform().copy();
             invert = invert.invert();
             const positionStart = invert.point(screenPositionStart);
@@ -18029,8 +18031,8 @@
             this._ref.strokeWidth(size);
         }
         updateScreenCoordinates() {
-            let screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
-            let screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
+            const screenPositionStart = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsStart"));
+            const screenPositionEnd = this._worldTransformer.worldToScreen(this._ref.getAttr("wcsEnd"));
             let invert = this._ref.getStage().getAbsoluteTransform().copy();
             invert = invert.invert();
             const positionStart = invert.point(screenPositionStart);
@@ -19449,11 +19451,12 @@
         }
         dispose() {
             this.cancel();
+            this.clear();
             this.emitEvent({ type: "dispose" });
+            this.removeAllListeners();
+            this.setActiveDragger();
             this._components.forEach((component) => component.dispose());
             this._components = [];
-            this.setActiveDragger();
-            this.removeAllListeners();
             this._markup.dispose();
             if (this.canvas) {
                 this.canvasEvents.forEach((x) => this.canvas.removeEventListener(x, this.canvaseventlistener));