Use same variables for updating metadata and calling callback

Signed-off-by: massimo.ferraro <massimo.ferraro@soft.it>
powsybl · Jun 3, 2024 · 71b10d1 · 71b10d1
1 parent cca7bb4
commit 71b10d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/src/components/network-area-diagram-viewer/diagram-utils.ts b/src/components/network-area-diagram-viewer/diagram-utils.ts
@@ -27,11 +27,6 @@ const EdgeTypeMapping: { [key: string]: EdgeType } = {
     ThreeWtEdge: EdgeType.THREE_WINDINGS_TRANSFORMER,
 };
 
-// round a number w.r.t a precision
-export function round(value: number, precision: number): number {
-    return +value.toFixed(precision);
-}
-
 // format number to string
 export function getFormattedValue(value: number): string {
     return value.toFixed(2);

diff --git a/src/components/network-area-diagram-viewer/network-area-diagram-viewer.ts b/src/components/network-area-diagram-viewer/network-area-diagram-viewer.ts
@@ -1211,30 +1211,27 @@ export class NetworkAreaDiagramViewer {
     }
 
     private updateMetadataCallCallback(mousePosition: Point) {
-        // get move node in metadata
+        // get moved node in metadata
         const node: SVGGraphicsElement | null = this.container.querySelector(
             'nad\\:node[svgid="' + this.selectedElement?.id + '"]'
         );
         if (node != null) {
+            // get new position
+            const xNew = DiagramUtils.getFormattedValue(mousePosition.x);
+            const yNew = DiagramUtils.getFormattedValue(mousePosition.y);
             // save original position, for the callback
-            const xOrig = node.getAttribute('x') ?? 0;
-            const yOrig = node.getAttribute('y') ?? 0;
+            const xOrig = node.getAttribute('x') ?? '0';
+            const yOrig = node.getAttribute('y') ?? '0';
             // update node position in metadata
-            node.setAttribute(
-                'x',
-                DiagramUtils.getFormattedValue(mousePosition.x)
-            );
-            node.setAttribute(
-                'y',
-                DiagramUtils.getFormattedValue(mousePosition.y)
-            );
+            node.setAttribute('x', xNew);
+            node.setAttribute('y', yNew);
             // call the callback, if defined
             if (this.onNodeCallback != null) {
                 this.onNodeCallback(
                     node.getAttribute('equipmentid') ?? '',
                     node.getAttribute('svgid') ?? '',
-                    DiagramUtils.round(mousePosition.x, 2),
-                    DiagramUtils.round(mousePosition.y, 2),
+                    +xNew,
+                    +yNew,
                     +xOrig,
                     +yOrig
                 );