@inweb/viewer-visualize 25.7.11 → 25.7.13

package/dist/viewer-visualize.module.js

@@ -734,6 +734,29 @@ class MarkupColor {
     }
 }
 
+class WorldTransform {
+    screenToWorld(position) {
+        return {
+            x: position.x,
+            y: position.y,
+            z: 0
+        };
+    }
+    worldToScreen(position) {
+        return {
+            x: position.x,
+            y: position.y
+        };
+    }
+    getScale() {
+        return {
+            x: 1,
+            y: 1,
+            z: 1
+        };
+    }
+}
+
 const LineTypeSpecs = new Map([ [ "solid", [] ], [ "dot", [ 30, 30, .001, 30 ] ], [ "dash", [ 30, 30 ] ] ]);
 
 class KonvaLine {
@@ -1638,7 +1661,7 @@ class KonvaMarkup {
     initialize(container, pointerEvents, viewer, worldTransformer) {
         if (!Konva) throw new Error('Markup: Error during initialization. Konva is not initialized. Update node_modules or add to your page <script src="https://unpkg.com/konva@9/konva.min.js"><\/script>');
         this._viewer = viewer;
-        this._worldTransformer = worldTransformer;
+        this._worldTransformer = worldTransformer !== null && worldTransformer !== void 0 ? worldTransformer : new WorldTransform;
         this._container = container;
         this._pointerEvents = pointerEvents !== null && pointerEvents !== void 0 ? pointerEvents : [];
         this._markupContainer = document.createElement("div");
@@ -1862,13 +1885,6 @@ class KonvaMarkup {
     clearSelected() {
         this._konvaTransformer.nodes([]);
     }
-    getPoint3dFromArray(array) {
-        return {
-            x: array[0],
-            y: array[1],
-            z: array[2]
-        };
-    }
     fillViewpointShapes(viewpoint) {
         const markupLines = this.getMarkupLines();
         if (markupLines && markupLines.length > 0) {
@@ -2159,7 +2175,7 @@ class KonvaMarkup {
             const konvaLine = new KonvaLine(null, line);
             lines.push({
                 id: konvaLine.id(),
-                points: worldPoints.map((p => this.getPoint3dFromArray(p))),
+                points: worldPoints,
                 color: konvaLine.getColor() || "#ff0000",
                 type: konvaLine.getLineType() || this.lineType,
                 width: konvaLine.getLineWidth() || this.lineWidth
@@ -2173,14 +2189,15 @@ class KonvaMarkup {
         const textScale = this._worldTransformer.getScale();
         this.konvaLayerFind("Text").forEach((text => {
             if (!text) return;
-            const position = this._worldTransformer.screenToWorld({
+            const position = {
                 x: text.x(),
                 y: text.y()
-            });
+            };
+            const worldPoint = this._worldTransformer.screenToWorld(position);
             const shape = new KonvaText(null, text);
             texts.push({
                 id: shape.id(),
-                position: this.getPoint3dFromArray(position),
+                position: worldPoint,
                 text: shape.getText(),
                 text_size: textSize * textScale.y,
                 angle: shape.getRotation(),
@@ -2198,7 +2215,7 @@ class KonvaMarkup {
             const shape = new KonvaRectangle(null, rect);
             rectangles.push({
                 id: shape.id(),
-                position: this.getPoint3dFromArray(worldPoint),
+                position: worldPoint,
                 width: shape.getWidth(),
                 height: shape.getHeigth(),
                 line_width: shape.getLineWidth(),
@@ -2215,7 +2232,7 @@ class KonvaMarkup {
             const shape = new KonvaEllipse(null, ellipse);
             ellipses.push({
                 id: shape.id(),
-                position: this.getPoint3dFromArray(worldPoint),
+                position: worldPoint,
                 radius: {
                     x: ellipse.getRadiusX(),
                     y: ellipse.getRadiusY()
@@ -2243,8 +2260,8 @@ class KonvaMarkup {
             const shape = new KonvaArrow(null, arrow);
             arrows.push({
                 id: shape.id(),
-                start: this.getPoint3dFromArray(worldStartPoint),
-                end: this.getPoint3dFromArray(worldEndPoint),
+                start: worldStartPoint,
+                end: worldEndPoint,
                 color: shape.getColor()
             });
         }));
@@ -2258,7 +2275,7 @@ class KonvaMarkup {
             const shape = new KonvaImage(null, image);
             images.push({
                 id: shape.id(),
-                position: this.getPoint3dFromArray(worldPoint),
+                position: worldPoint,
                 src: shape.getSrc(),
                 width: shape.getWidth(),
                 height: shape.getHeight()
@@ -2274,7 +2291,7 @@ class KonvaMarkup {
             const shape = new KonvaCloud(null, cloud);
             clouds.push({
                 id: shape.id(),
-                position: this.getPoint3dFromArray(worldPoint),
+                position: worldPoint,
                 width: shape.getWidth(),
                 height: shape.getHeigth(),
                 line_width: shape.getLineWidth(),
@@ -4954,8 +4971,6 @@ class OdaTextDragger extends OdBaseDragger {
     }
 }
 
-const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
-
 class VisualizeMarkup {
     constructor() {
         this._markupColor = {
@@ -4972,30 +4987,7 @@ class VisualizeMarkup {
         this._viewer.registerDragger("Text", OdaTextDragger);
     }
     dispose() {}
-    syncOverlay() {
-        if (!this._viewer.visualizeJs) return;
-        const visViewer = this._viewer.visViewer();
-        const activeView = visViewer.activeView;
-        let overlayView = visViewer.getViewByName(OVERLAY_VIEW_NAME);
-        if (!overlayView) {
-            const overlayModel = visViewer.getMarkupModel();
-            const pDevice = visViewer.getActiveDevice();
-            overlayView = pDevice.createView(OVERLAY_VIEW_NAME, false);
-            overlayView.addModel(overlayModel);
-            activeView.addSibling(overlayView);
-            pDevice.addView(overlayView);
-        }
-        overlayView.viewPosition = activeView.viewPosition;
-        overlayView.viewTarget = activeView.viewTarget;
-        overlayView.upVector = activeView.upVector;
-        overlayView.viewFieldWidth = activeView.viewFieldWidth;
-        overlayView.viewFieldHeight = activeView.viewFieldHeight;
-        const viewPort = overlayView.getViewport();
-        overlayView.setViewport(viewPort.lowerLeft, viewPort.upperRight);
-        overlayView.vportRect = activeView.vportRect;
-        this._viewer.update();
-        return overlayView;
-    }
+    syncOverlay() {}
     clearOverlay() {
         if (!this._viewer.visualizeJs) return;
         const visViewer = this._viewer.visViewer();
@@ -5148,23 +5140,19 @@ class VisualizeMarkup {
         return viewpoint;
     }
     enableEditMode(mode) {
-        throw new Error("Not implemented yet");
+        return this;
     }
     createObject(type, params) {
-        throw new Error("Not implemented yet");
+        return undefined;
     }
     getObjects() {
-        throw new Error("Not implemented yet");
+        return [];
     }
     getSelectedObjects() {
-        throw new Error("Not implemented yet");
-    }
-    selectObjects(objects) {
-        throw new Error("Not implemented yet");
-    }
-    clearSelected() {
-        throw new Error("Not implemented yet");
+        return [];
     }
+    selectObjects(objects) {}
+    clearSelected() {}
 }
 
 var MarkupType;
@@ -5194,6 +5182,8 @@ class MarkupFactory {
     }
 }
 
+const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
+
 const isExist = value => value !== undefined && value !== null;
 
 class Viewer extends EventEmitter2 {
@@ -5239,7 +5229,7 @@ class Viewer extends EventEmitter2 {
         return this._markup;
     }
     configure(params) {
-        this._visualizeJsUrl = params.visualizeJsUrl || "https://opencloud.azureedge.net/libs/visualizejs/25.7/Visualize.js";
+        this._visualizeJsUrl = params.visualizeJsUrl || "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/25.7/Visualize.js";
         return this;
     }
     async initialize(canvas, onProgress) {
@@ -5573,10 +5563,33 @@ class Viewer extends EventEmitter2 {
         this.update();
     }
     clearOverlay() {
+        if (!this.visualizeJs) return;
         this._markup.clearOverlay();
+        this.update();
     }
     syncOverlay() {
-        return this._markup.syncOverlay();
+        if (!this.visualizeJs) return;
+        const visViewer = this.visViewer();
+        const activeView = visViewer.activeView;
+        let overlayView = visViewer.getViewByName(OVERLAY_VIEW_NAME);
+        if (!overlayView) {
+            const markupModel = visViewer.getMarkupModel();
+            const pDevice = visViewer.getActiveDevice();
+            overlayView = pDevice.createView(OVERLAY_VIEW_NAME, false);
+            overlayView.addModel(markupModel);
+            activeView.addSibling(overlayView);
+            pDevice.addView(overlayView);
+        }
+        overlayView.viewPosition = activeView.viewPosition;
+        overlayView.viewTarget = activeView.viewTarget;
+        overlayView.upVector = activeView.upVector;
+        overlayView.viewFieldWidth = activeView.viewFieldWidth;
+        overlayView.viewFieldHeight = activeView.viewFieldHeight;
+        const viewPort = overlayView.getViewport();
+        overlayView.setViewport(viewPort.lowerLeft, viewPort.upperRight);
+        overlayView.vportRect = activeView.vportRect;
+        this._markup.syncOverlay();
+        this.update();
     }
     is3D() {
         if (!this.visualizeJs) return false;
@@ -5588,7 +5601,18 @@ class Viewer extends EventEmitter2 {
         return extHeight !== 0;
     }
     screenToWorld(position) {
-        return this.visViewer().screenToWorld(position.x * window.devicePixelRatio, position.y * window.devicePixelRatio);
+        if (!this.visualizeJs) return {
+            x: position.x,
+            y: position.y,
+            z: 0
+        };
+        const worldPoint = this.visViewer().screenToWorld(position.x * window.devicePixelRatio, position.y * window.devicePixelRatio);
+        const result = {
+            x: worldPoint[0],
+            y: worldPoint[1],
+            z: worldPoint[2]
+        };
+        return result;
     }
     worldToScreen(position) {
         if (!this.visualizeJs) return position;
@@ -5614,12 +5638,12 @@ class Viewer extends EventEmitter2 {
         };
         const projMatrix = this.visViewer().activeView.projectionMatrix;
         const tolerance = 1e-6;
-        const x = projMatrix.get(1, 1);
-        if (x > tolerance || x < -tolerance) result.x = 1 / result.x;
+        const x = projMatrix.get(0, 0);
+        if (x > tolerance || x < -tolerance) result.x = 1 / x;
         const y = projMatrix.get(1, 1);
-        if (y > tolerance || y < -tolerance) result.y = 1 / result.y;
+        if (y > tolerance || y < -tolerance) result.y = 1 / y;
         const z = projMatrix.get(2, 2);
-        if (z > tolerance || z < -tolerance) result.z = 1 / result.z;
+        if (z > tolerance || z < -tolerance) result.z = 1 / z;
         return result;
     }
     getSelected() {