@inweb/markup 25.7.10 → 25.7.12

package/dist/markup.module.js

@@ -29,6 +29,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 {
@@ -933,7 +956,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");
@@ -1157,13 +1180,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) {
@@ -1454,7 +1470,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
@@ -1468,14 +1484,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(),
@@ -1493,7 +1510,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(),
@@ -1510,7 +1527,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()
@@ -1538,8 +1555,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()
             });
         }));
@@ -1553,7 +1570,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()
@@ -1569,7 +1586,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(),