Merge remote-tracking branch 'origin/main' into fixing_types

powsybl · Dec 20, 2024 · 718a99a · 718a99a
2 parents 5ad261c + 936ab02
commit 718a99a
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 39 deletions.
diff --git a/demo/src/diagram-viewers/data/nad-ieee14cdf-solved.svg b/demo/src/diagram-viewers/data/nad-ieee14cdf-solved.svg
diff --git a/demo/src/diagram-viewers/data/nad-ieee14cdf-solved_metadata.json b/demo/src/diagram-viewers/data/nad-ieee14cdf-solved_metadata.json
@@ -159,7 +159,8 @@
     "svgId" : "6",
     "equipmentId" : "VL12",
     "x" : 694.18,
-    "y" : 76.12
+    "y" : 76.12,
+    "fictitious" : true
   }, {
     "svgId" : "8",
     "equipmentId" : "VL13",
@@ -174,7 +175,8 @@
     "svgId" : "12",
     "equipmentId" : "VL2",
     "x" : 62.4,
-    "y" : -384.58
+    "y" : -384.58,
+    "fictitious" : true
   }, {
     "svgId" : "14",
     "equipmentId" : "VL3",

diff --git a/src/components/network-area-diagram-viewer/diagram-metadata.ts b/src/components/network-area-diagram-viewer/diagram-metadata.ts
@@ -31,6 +31,7 @@ export interface SvgParametersMetadata {
     nodeHollowWidth: number;
     unknownBusNodeExtraRadius: number;
     edgeNameDisplayed: boolean;
+    fictitiousVoltageLevelCircleRadius: number;
 }
 
 export interface BusNodeMetadata {
@@ -46,6 +47,7 @@ export interface NodeMetadata {
     equipmentId: string;
     x: number;
     y: number;
+    fictitious?: boolean;
 }
 
 export interface EdgeMetadata {

diff --git a/src/components/network-area-diagram-viewer/diagram-utils.test.ts b/src/components/network-area-diagram-viewer/diagram-utils.test.ts
@@ -344,6 +344,26 @@ test('getTextNodeMoves', () => {
     expect(textNodeMove[1].yNew).toBe(-53.76);
 });
 
+test('isVlNodeFictitious', () => {
+    const nodes: NodeMetadata[] = [
+        {
+            svgId: '0',
+            equipmentId: 'vl',
+            x: 189.53,
+            y: 123.47,
+        },
+        {
+            svgId: '2',
+            equipmentId: 'vl2',
+            x: -171.8,
+            y: 131.88,
+            fictitious: true,
+        },
+    ];
+    expect(DiagramUtils.isVlNodeFictitious('0', nodes)).toBe(false);
+    expect(DiagramUtils.isVlNodeFictitious('2', nodes)).toBe(true);
+});
+
 function getSvgNode(): SVGGraphicsElement {
     const nodeSvg =
         '<g class="nad-vl-nodes"><g transform="translate(-452.59,-274.01)" id="0">' +

diff --git a/src/components/network-area-diagram-viewer/diagram-utils.ts b/src/components/network-area-diagram-viewer/diagram-utils.ts
@@ -521,3 +521,8 @@ export function getTextNodeMoves(
         { xOrig: textNode.connectionShiftX, yOrig: textNode.connectionShiftY, xNew: connXNew, yNew: connYNew },
     ];
 }
+
+export function isVlNodeFictitious(vlNodeId: string, nodes: NodeMetadata[] | undefined): boolean {
+    const node: NodeMetadata | undefined = nodes?.find((node) => node.svgId == vlNodeId);
+    return node?.fictitious ?? false;
+}