@inweb/viewer-visualize 25.7.10 → 25.7.12

package/dist/viewer-visualize.js

@@ -12172,6 +12172,29 @@
         }
     }
 
+    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 {
@@ -13076,7 +13099,7 @@
         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");
@@ -13300,13 +13323,6 @@
         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) {
@@ -13597,7 +13613,7 @@
                 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
@@ -13611,14 +13627,15 @@
             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(),
@@ -13636,7 +13653,7 @@
                 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(),
@@ -13653,7 +13670,7 @@
                 const shape = new KonvaEllipse(null, ellipse);
                 ellipses.push({
                     id: shape.id(),
-                    position: this.getPoint3dFromArray(worldPoint),
+                    position: worldPoint,
                     radius: {
                         x: ellipse.getRadiusX(),
                         y: ellipse.getRadiusY()
@@ -13681,8 +13698,8 @@
                 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()
                 });
             }));
@@ -13696,7 +13713,7 @@
                 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()
@@ -13712,7 +13729,7 @@
                 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(),
@@ -16439,7 +16456,6 @@
         }
     }
 
-    const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
     class VisualizeMarkup {
         constructor() {
             this._markupColor = { r: 255, g: 0, b: 0 };
@@ -16452,31 +16468,7 @@
             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;
@@ -16622,23 +16614,19 @@
             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() { }
     }
 
     ///////////////////////////////////////////////////////////////////////////////
@@ -16669,6 +16657,7 @@
     }
 
     ///////////////////////////////////////////////////////////////////////////////
+    const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
     const isExist = (value) => value !== undefined && value !== null;
     /**
      * The `Client.js` library class that provides methods to integrate with the
@@ -16753,7 +16742,7 @@
          *   library instance or leave it blank to use the default URL defined by `Client.js`.
          */
         configure(params) {
-            this._visualizeJsUrl = params.visualizeJsUrl || "https://opencloud.azureedge.net/libs/visualizejs/master/Visualize.js";
+            this._visualizeJsUrl = params.visualizeJsUrl || "https://opencloud.azureedge.net/libs/visualizejs/25.7/Visualize.js";
             return this;
         }
         /**
@@ -17187,16 +17176,41 @@
             this.update();
         }
         /**
-         * Remove markup overlay.
+         * Clear overlay view.
          */
         clearOverlay() {
+            if (!this.visualizeJs)
+                return;
             this._markup.clearOverlay();
+            this.update();
         }
         /**
-         * Synchronize markup overlay.
+         * Create overlay view.
          */
         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();
         }
         /**
          * Returns `true` if current drawing is 3D drawing.
@@ -17213,7 +17227,11 @@
             //return visViewer.activeView.upVector[1] >= 0.95;
         }
         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)
@@ -17233,15 +17251,15 @@
             const result = { x: 1.0, y: 1.0, z: 1.0 };
             const projMatrix = this.visViewer().activeView.projectionMatrix;
             const tolerance = 1.0e-6;
-            const x = projMatrix.get(1, 1);
+            const x = projMatrix.get(0, 0);
             if (x > tolerance || x < -tolerance)
-                result.x = 1 / result.x;
+                result.x = 1 / x;
             const y = projMatrix.get(1, 1);
             if (y > tolerance || y < -tolerance)
-                result.y = 1 / result.y;
+                result.y = 1 / y;
             const z = projMatrix.get(2, 2);
             if (z > tolerance || z < -tolerance)
-                result.z = 1 / result.z;
+                result.z = 1 / z;
             return result;
         }
         /**