@inweb/viewer-visualize 26.6.2 → 26.6.3

package/lib/Viewer/Loaders/{VSFModelLoader.d.ts → VSFCloudModelLoader.d.ts}

@@ -1,6 +1,6 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
-export declare class VSFModelLoader extends Loader {
+export declare class VSFCloudModelLoader extends Loader {
     viewer: Viewer;
     constructor(viewer: Viewer);
     isSupport(file: any, format?: string): boolean;

package/lib/Viewer/Loaders/{VSFXModelLoader.d.ts → VSFXCloudModelLoader.d.ts}

@@ -1,6 +1,6 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
-export declare class VSFXModelLoader extends Loader {
+export declare class VSFXCloudModelLoader extends Loader {
     viewer: Viewer;
     constructor(viewer: Viewer);
     isSupport(file: any): boolean;

package/lib/Viewer/Loaders/{VSFXPartialLoader.d.ts → VSFXCloudPartialLoader.d.ts}

@@ -1,6 +1,6 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
-export declare class VSFXPartialLoader extends Loader {
+export declare class VSFXCloudPartialLoader extends Loader {
     viewer: Viewer;
     abortControllerForRequestMap: Map<number, AbortController>;
     constructor(viewer: Viewer);

package/lib/Viewer/Loaders/{VSFXStreamingLoader.d.ts → VSFXCloudStreamingLoader.d.ts}

@@ -1,6 +1,6 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
-export declare class VSFXStreamingLoader extends Loader {
+export declare class VSFXCloudStreamingLoader extends Loader {
     viewer: Viewer;
     constructor(viewer: Viewer);
     isSupport(file: any): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "26.6.2",
+  "version": "26.6.3",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using VisualizeJS",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.6.2",
-    "@inweb/eventemitter2": "~26.6.2",
-    "@inweb/markup": "~26.6.2",
-    "@inweb/viewer-core": "~26.6.2"
+    "@inweb/client": "~26.6.3",
+    "@inweb/eventemitter2": "~26.6.3",
+    "@inweb/markup": "~26.6.3",
+    "@inweb/viewer-core": "~26.6.3"
   },
   "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
 }

package/src/Viewer/Loaders/{VSFModelLoader.ts → VSFCloudModelLoader.ts}

@@ -24,7 +24,7 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 
-export class VSFModelLoader extends Loader {
+export class VSFCloudModelLoader extends Loader {
   public viewer: Viewer;
 
   constructor(viewer: Viewer) {

package/src/Viewer/Loaders/{VSFXModelLoader.ts → VSFXCloudModelLoader.ts}

@@ -24,7 +24,7 @@
 import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 
-export class VSFXModelLoader extends Loader {
+export class VSFXCloudModelLoader extends Loader {
   public viewer: Viewer;
 
   constructor(viewer: Viewer) {

package/src/Viewer/Loaders/{VSFXPartialLoader.ts → VSFXCloudPartialLoader.ts}

@@ -28,7 +28,7 @@ import { UpdateController, UpdateType } from "./UpdateController";
 const PENDING_REQUESTS_SIZE = 50;
 const PENDING_REQUESTS_TIMEOUT = 250;
 
-export class VSFXPartialLoader extends Loader {
+export class VSFXCloudPartialLoader extends Loader {
   public viewer: Viewer;
   public abortControllerForRequestMap: Map<number, AbortController>;
 
@@ -41,6 +41,7 @@ export class VSFXPartialLoader extends Loader {
   override isSupport(file: any): boolean {
     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))

package/src/Viewer/Loaders/{VSFXStreamingLoader.ts → VSFXCloudStreamingLoader.ts}

@@ -25,7 +25,7 @@ import { Loader } from "@inweb/viewer-core";
 import { Viewer } from "../Viewer";
 import { UpdateController, UpdateType } from "./UpdateController";
 
-export class VSFXStreamingLoader extends Loader {
+export class VSFXCloudStreamingLoader extends Loader {
   public viewer: Viewer;
 
   constructor(viewer: Viewer) {
@@ -36,6 +36,7 @@ export class VSFXStreamingLoader extends Loader {
   override isSupport(file: any): boolean {
     return (
       typeof file === "object" &&
+      typeof file.database === "string" &&
       typeof file.downloadResource === "function" &&
       /.vsfx$/i.test(file.database) &&
       this.viewer.options.enableStreamingMode === true &&

package/src/Viewer/Loaders/index.ts

@@ -23,12 +23,13 @@
 
 import { ILoadersRegistry, loadersRegistry } from "@inweb/viewer-core";
 
-import { VSFModelLoader } from "./VSFModelLoader";
 import { VSFBufferLoader } from "./VSFBufferLoader";
-import { VSFXModelLoader } from "./VSFXModelLoader";
-import { VSFXStreamingLoader } from "./VSFXStreamingLoader";
-import { VSFXPartialLoader } from "./VSFXPartialLoader";
+import { VSFCloudModelLoader } from "./VSFCloudModelLoader";
+
 import { VSFXBufferLoader } from "./VSFXBufferLoader";
+import { VSFXCloudModelLoader } from "./VSFXCloudModelLoader";
+import { VSFXCloudStreamingLoader } from "./VSFXCloudStreamingLoader";
+import { VSFXCloudPartialLoader } from "./VSFXCloudPartialLoader";
 
 /**
  * Viewer loaders registry. Use this registry to register custom loaders.
@@ -99,10 +100,10 @@ export const loaders: ILoadersRegistry = loadersRegistry("visualizejs");
 
 // build-in loaders
 
-loaders.registerLoader("vsf", (viewer: any) => new VSFModelLoader(viewer));
 loaders.registerLoader("vsf-buffer", (viewer: any) => new VSFBufferLoader(viewer));
+loaders.registerLoader("vsf-cloud-model", (viewer: any) => new VSFCloudModelLoader(viewer));
 
-loaders.registerLoader("vsfx", (viewer: any) => new VSFXModelLoader(viewer));
-loaders.registerLoader("vsfx-streaming", (viewer: any) => new VSFXStreamingLoader(viewer));
-loaders.registerLoader("vsfx-partial", (viewer: any) => new VSFXPartialLoader(viewer));
 loaders.registerLoader("vsfx-buffer", (viewer: any) => new VSFXBufferLoader(viewer));
+loaders.registerLoader("vsfx-cloud-model", (viewer: any) => new VSFXCloudModelLoader(viewer));
+loaders.registerLoader("vsfx-cloud-streaming", (viewer: any) => new VSFXCloudStreamingLoader(viewer));
+loaders.registerLoader("vsfx-cloud-partial", (viewer: any) => new VSFXCloudPartialLoader(viewer));

package/src/Viewer/Viewer.ts

@@ -252,14 +252,16 @@ export class Viewer
 
   dispose(): this {
     this.cancel();
+    this.clear();
+
     this.emitEvent({ type: "dispose" });
+    this.removeAllListeners();
+
+    this.setActiveDragger();
 
     this._components.forEach((component: IComponent) => component.dispose());
     this._components = [];
 
-    this.setActiveDragger();
-    this.removeAllListeners();
-
     this._markup.dispose();
 
     if (this.canvas) {
@@ -268,6 +270,7 @@ export class Viewer
     }
 
     if (this._visualizeJs) this._visualizeJs.getViewer().clear();
+
     this._visualizeJs = undefined;
     this._visualizeTimestamp = undefined;