Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions demo/java/network-viewer-demo-data/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2026, RTE (http://www.rte-france.com)
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<!--~
~ Copyright (c) 2026, RTE (https://www.rte-france.com)
~ This Source Code Form is subject to the terms of the Mozilla Public
~ License, v. 2.0. If a copy of the MPL was not distributed with this
~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
~ SPDX-License-Identifier: MPL-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Expand All @@ -22,9 +23,9 @@

<properties>
<java.version>21</java.version>
<core.version>7.2.0</core.version>
<diagram.version>5.3.0</diagram.version>
<olf.version>2.2.0</olf.version>
<core.version>7.3.0</core.version>
<diagram.version>5.5.0</diagram.version>
<olf.version>2.3.0</olf.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void main(String[] args) {
NadDemoFiles.drawNetworkWithSvcVscScDlDoubleArrows(demoResources);
NadDemoFiles.drawNetworkWithTwoVoltageLevelsAndComponents(demoResources);

SldDemoFiles.drawSldExample(demoResources);
SldDemoFiles.drawSldSubExample(demoResources);
SldDemoFiles.drawSldExample(demoResources.resolve("sld"));
SldDemoFiles.drawSldSubExample(demoResources.resolve("sld"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public static void drawNetworkWithSvcVscScDlDoubleArrows(Path demoResourcesDirec
getNadParametersWithDoubleArrows(),
VoltageLevelFilter.NO_FILTER);
}

private static NadParameters getNadParametersWithComponents() {
SvgParameters svgParameters = new SvgParameters()
.setCssLocation(SvgParameters.CssLocation.EXTERNAL_NO_IMPORT);
Expand All @@ -384,7 +384,7 @@ public Optional<EdgeInfo> getThreeWindingTransformerEdgeInfo(String threeWinding
);
return nadParameters;
}

public static void drawNetworkWithTwoVoltageLevelsAndComponents(Path demoResourcesDirectory) {
Network network = Networks.createTwoVoltageLevels();
NetworkAreaDiagram.draw(network, demoResourcesDirectory.resolve("nad-edge-info-components"),
Expand Down
6 changes: 5 additions & 1 deletion demo/src/diagram-viewers/data/case1354pegase_metadata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -53110,5 +53111,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "case1354pegase",
"networkName" : "case1354pegase",
"networkDate" : "2026-07-21T09:56:34.591541824+02:00[Europe/Paris]"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -129,7 +130,8 @@
"labelB" : "100"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-boundary-line-edge" ]
}, {
"svgId" : "12",
"equipmentId" : "hvdc",
Expand Down Expand Up @@ -166,7 +168,8 @@
"labelB" : "100"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-hvdc-edge" ]
} ],
"textNodes" : [ {
"svgId" : "1",
Expand All @@ -184,5 +187,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "testCase1",
"networkName" : "testCase1",
"networkDate" : "2023-05-31T10:41+02:00[CET]"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -166,7 +167,8 @@
"componentType" : "FLASH"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-boundary-line-edge" ]
} ],
"textNodes" : [ {
"svgId" : "1",
Expand All @@ -184,5 +186,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "dl",
"networkName" : "dl",
"networkDate" : "2026-07-21T07:56:48.917368076Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -239,5 +240,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "sim1",
"networkName" : "sim1",
"networkDate" : "2026-07-21T07:56:47.656756394Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -213,7 +214,8 @@
"labelA" : "LCC1"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-hvdc-edge" ]
}, {
"svgId" : "28",
"equipmentId" : "HVDC1",
Expand Down Expand Up @@ -249,7 +251,8 @@
"labelB" : "739"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-hvdc-edge" ]
}, {
"svgId" : "32",
"equipmentId" : "LINE_S2S3",
Expand Down Expand Up @@ -363,5 +366,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "fourSubstations",
"networkName" : "fourSubstations",
"networkDate" : "2017-06-25T17:43+01:00"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -208,7 +209,8 @@
"direction" : "OUT",
"labelA" : "c5",
"labelB" : "d5"
}
},
"classes" : [ "nad-hvdc-edge" ]
}, {
"svgId" : "28",
"equipmentId" : "HVDC1",
Expand Down Expand Up @@ -240,7 +242,8 @@
"direction" : "OUT",
"labelA" : "c4",
"labelB" : "d4"
}
},
"classes" : [ "nad-hvdc-edge" ]
}, {
"svgId" : "32",
"equipmentId" : "LINE_S2S3",
Expand Down Expand Up @@ -350,5 +353,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "fourSubstations",
"networkName" : "fourSubstations",
"networkDate" : "2017-06-25T17:43+01:00"
}
12 changes: 9 additions & 3 deletions demo/src/diagram-viewers/data/nad-four-substations_metadata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -191,7 +192,8 @@
"labelB" : "-79"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-hvdc-edge" ]
}, {
"svgId" : "26",
"equipmentId" : "HVDC1",
Expand All @@ -213,7 +215,8 @@
"labelB" : "-10"
},
"classes1" : [ "nad-vl300to500" ],
"classes2" : [ "nad-vl300to500" ]
"classes2" : [ "nad-vl300to500" ],
"classes" : [ "nad-hvdc-edge" ]
}, {
"svgId" : "29",
"equipmentId" : "LINE_S2S3",
Expand Down Expand Up @@ -299,5 +302,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "fourSubstations",
"networkName" : "fourSubstations",
"networkDate" : "2017-06-25T17:43+01:00"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -563,5 +564,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "ieee14cdf-solved",
"networkName" : "ieee14cdf-solved",
"networkDate" : "1993-08-19T00:00Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -1310,5 +1311,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "ieee300cdf",
"networkName" : "ieee300cdf",
"networkDate" : "1991-05-13T00:00Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -266,7 +267,8 @@
"labelB" : "257 %"
},
"classes1" : [ "nad-vl70to120" ],
"classes2" : [ "nad-vl70to120" ]
"classes2" : [ "nad-vl70to120" ],
"classes" : [ "nad-overload" ]
}, {
"svgId" : "36",
"equipmentId" : "T7-2-0",
Expand Down Expand Up @@ -406,5 +408,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "ieee9zeroimpedancecdf",
"networkName" : "ieee9zeroimpedancecdf",
"networkDate" : "2009-04-26T00:00Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -419,5 +420,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "ieee9zeroimpedancecdf",
"networkName" : "ieee9zeroimpedancecdf",
"networkDate" : "2009-04-26T00:00Z"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"metadataVersion" : "1.0",
"layoutParameters" : {
"textNodesForceLayout" : false,
"textNodeFixedShift" : {
Expand Down Expand Up @@ -314,5 +315,8 @@
"shiftY" : -40.0,
"connectionShiftX" : 100.0,
"connectionShiftY" : -15.0
} ]
} ],
"networkId" : "ieee9zeroimpedancecdf",
"networkName" : "ieee9zeroimpedancecdf",
"networkDate" : "2009-04-26T00:00Z"
}
Loading
Loading