From 1a87a4b1381797007452f67fa5e11a6f2e6b9bc7 Mon Sep 17 00:00:00 2001 From: Thomas ADAM <52197093+tadam50@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:19:17 +0200 Subject: [PATCH] [SLD] Animate feeder arrows (#500) * Use new AnimatedFeederInfoStyleProvider for animation * Add 2 thresholds in AnimatedFeederInfoStyleProvider constructor * Update svg test reference files * HvdcTest : fix svg generation at any time Signed-off-by: Thomas ADAM --- .../java/com/powsybl/nad/svg/HvdcTest.java | 1 - .../powsybl/sld/svg/BasicStyleProvider.java | 4 +- .../com/powsybl/sld/svg/DiagramStyles.java | 11 + .../sld/svg/DirectionalFeederInfo.java | 11 +- .../util/AnimatedFeederInfoStyleProvider.java | 76 +++++ .../src/main/resources/animations.css | 33 +++ .../com/powsybl/sld/iidm/TestFeederInfos.java | 78 ++++- .../resources/InternalBranchesBusBreaker.svg | 16 +- .../resources/InternalBranchesNodeBreaker.svg | 16 +- .../NodeDecoratorsBranchStatusBusBreaker.svg | 16 +- .../NodeDecoratorsBranchStatusNodeBreaker.svg | 24 +- .../test/resources/NodeDecoratorsSwitches.svg | 16 +- .../resources/TestAnimatedFeederInfos.svg | 272 ++++++++++++++++++ .../src/test/resources/TestCase1.svg | 2 +- .../test/resources/TestCase11FlatDesign.svg | 54 ++-- .../TestCase11SubstationGraphHFirst.svg | 54 ++-- .../TestCase11SubstationGraphHLast.svg | 54 ++-- .../TestCase11SubstationGraphHMiddle.svg | 54 ++-- .../TestCase11SubstationGraphHNone.svg | 54 ++-- ...ase12GraphWithNodesInfosNominalVoltage.svg | 24 +- ...stCase12GraphWithNodesInfosTopological.svg | 24 +- .../TestCase15GraphWithVoltageIndicator.svg | 6 +- ...15GraphWithVoltageIndicatorTopological.svg | 6 +- ...TestCase15GraphWithoutVoltageIndicator.svg | 6 +- .../test/resources/TestCaseFictitiousBus.svg | 6 +- .../TestCaseFictitiousBusTopological.svg | 6 +- .../TestCaseKeepFictitiousSwitchNode.svg | 2 +- .../resources/TestCaseLoadBreakSwitch.svg | 4 +- .../TestCaseRemoveFictitiousSwitchNode.svg | 2 +- .../src/test/resources/TestCheese.svg | 2 +- .../TestComplexParallelLegsInternalPst.svg | 2 +- .../src/test/resources/TestFeederInfos.svg | 2 +- .../src/test/resources/TestFeederOnBus.svg | 2 +- .../resources/TestFeederOnBusDisconnector.svg | 2 +- .../resources/TestFormattingFeederInfos.svg | 2 +- .../test/resources/TestSldClassSubstation.svg | 8 +- .../src/test/resources/TestSldClassVl.svg | 4 +- .../src/test/resources/consecutive_shunts.svg | 20 +- .../src/test/resources/feederInfoTest.svg | 6 +- .../src/test/resources/noComponentsOnBus.svg | 6 +- .../nominal_voltage_style_substation.svg | 12 +- .../resources/nominal_voltage_style_vl2.svg | 4 +- .../resources/nominal_voltage_style_vl3.svg | 2 +- .../src/test/resources/switchesOnBus.svg | 6 +- .../topological_style_substation.svg | 12 +- 45 files changed, 743 insertions(+), 281 deletions(-) create mode 100644 single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AnimatedFeederInfoStyleProvider.java create mode 100644 single-line-diagram/single-line-diagram-core/src/main/resources/animations.css create mode 100644 single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/HvdcTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/HvdcTest.java index 1bdb9c068..482ba4df7 100644 --- a/network-area-diagram/src/test/java/com/powsybl/nad/svg/HvdcTest.java +++ b/network-area-diagram/src/test/java/com/powsybl/nad/svg/HvdcTest.java @@ -45,7 +45,6 @@ protected LabelProvider getLabelProvider(Network network) { @Test public void testHvdcVL1Depth1() { Network network = HvdcTestNetwork.createVsc(); - debugSvg = true; assertEquals( toString("/hvdc-vl-depth-1.svg"), generateSvgString(network, diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/BasicStyleProvider.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/BasicStyleProvider.java index 090b72ef6..f4b1111bf 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/BasicStyleProvider.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/BasicStyleProvider.java @@ -128,10 +128,10 @@ public List getCssUrls() { @Override public List getCellStyles(Cell cell) { if (cell instanceof ExternCell) { - return Collections.singletonList(EXTERN_CELL); + return List.of(EXTERN_CELL, buildStyle(cell.getDirection())); } if (cell instanceof InternCell) { - return List.of(INTERN_CELL, CELL_SHAPE_PREFIX + ((InternCell) cell).getShape().name().toLowerCase()); + return List.of(INTERN_CELL, buildStyle(((InternCell) cell).getShape())); } if (cell instanceof ShuntCell) { return Collections.singletonList(SHUNT_CELL); diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DiagramStyles.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DiagramStyles.java index f365572db..daf6bbe1e 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DiagramStyles.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DiagramStyles.java @@ -6,6 +6,8 @@ */ package com.powsybl.sld.svg; +import com.powsybl.sld.model.cells.InternCell; +import com.powsybl.sld.model.coordinate.Direction; import org.apache.commons.lang3.StringUtils; import java.io.IOException; @@ -41,6 +43,7 @@ public final class DiagramStyles { public static final String INTERN_CELL = STYLE_PREFIX + "intern-cell"; public static final String SHUNT_CELL = STYLE_PREFIX + "shunt-cell"; public static final String CELL_SHAPE_PREFIX = STYLE_PREFIX + "cell-shape-"; + public static final String CELL_DIRECTION_PREFIX = STYLE_PREFIX + "cell-direction-"; public static final String LEGEND = STYLE_PREFIX + "legend"; public static final String VOLTAGE = STYLE_PREFIX + "voltage"; public static final String ANGLE = STYLE_PREFIX + "angle"; @@ -116,4 +119,12 @@ public static String unescape(String input) { } return out.toString(); } + + public static String buildStyle(Direction direction) { + return CELL_DIRECTION_PREFIX + direction.name().toLowerCase(); + } + + public static String buildStyle(InternCell.Shape shape) { + return CELL_SHAPE_PREFIX + shape.name().toLowerCase(); + } } diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java index f1598351e..44fe38124 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java @@ -13,6 +13,8 @@ public class DirectionalFeederInfo extends AbstractFeederInfo { private final DiagramLabelProvider.LabelDirection arrowDirection; + private final double value; + public DirectionalFeederInfo(String componentType, DiagramLabelProvider.LabelDirection arrowDirection, String leftLabel, String rightLabel) { this(componentType, arrowDirection, leftLabel, rightLabel, null); } @@ -20,6 +22,7 @@ public DirectionalFeederInfo(String componentType, DiagramLabelProvider.LabelDir public DirectionalFeederInfo(String componentType, DiagramLabelProvider.LabelDirection arrowDirection, String leftLabel, String rightLabel, String userDefinedId) { super(componentType, leftLabel, rightLabel, userDefinedId); this.arrowDirection = Objects.requireNonNull(arrowDirection); + this.value = Double.NaN; } public DirectionalFeederInfo(String componentType, double value, DoubleFunction formatter) { @@ -27,7 +30,9 @@ public DirectionalFeederInfo(String componentType, double value, DoubleFunction< } public DirectionalFeederInfo(String componentType, double value, DoubleFunction formatter, String userDefinedId) { - this(componentType, getArrowDirection(value), null, formatter.apply(value), userDefinedId); + super(componentType, null, formatter.apply(value), userDefinedId); + this.arrowDirection = Objects.requireNonNull(getArrowDirection(value)); + this.value = value; } private static DiagramLabelProvider.LabelDirection getArrowDirection(double value) { @@ -37,4 +42,8 @@ private static DiagramLabelProvider.LabelDirection getArrowDirection(double valu public DiagramLabelProvider.LabelDirection getDirection() { return arrowDirection; } + + public double getValue() { + return value; + } } diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AnimatedFeederInfoStyleProvider.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AnimatedFeederInfoStyleProvider.java new file mode 100644 index 000000000..c71e2cecc --- /dev/null +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AnimatedFeederInfoStyleProvider.java @@ -0,0 +1,76 @@ +/** + * Copyright (c) 2023, 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/. + * SPDX-License-Identifier: MPL-2.0 + */ +package com.powsybl.sld.util; + +import com.powsybl.iidm.network.*; +import com.powsybl.sld.svg.DirectionalFeederInfo; +import com.powsybl.sld.svg.FeederInfo; + +import java.util.*; + +import static com.powsybl.sld.svg.DiagramStyles.STYLE_PREFIX; + +/** + * @author Thomas Adam + */ +public class AnimatedFeederInfoStyleProvider extends TopologicalStyleProvider { + + private static final String ARROW_ANIMATION = STYLE_PREFIX + "arrow-animation"; + + private static final String ARROW_SPEED = "speed"; + + private static final String ARROW_ANIMATION_NO_SPEED = ARROW_ANIMATION + "-no-" + ARROW_SPEED; + + private static final String ARROW_ANIMATION_LOW_SPEED = ARROW_ANIMATION + "-low-" + ARROW_SPEED; + + private static final String ARROW_ANIMATION_AVERAGE_SPEED = ARROW_ANIMATION + "-average-" + ARROW_SPEED; + + private static final String ARROW_ANIMATION_HIGH_SPEED = ARROW_ANIMATION + "-high-" + ARROW_SPEED; + + private final double threshold1; + + private final double threshold2; + + public AnimatedFeederInfoStyleProvider(Network network, double threshold1, double threshold2) { + super(network); + this.threshold1 = threshold1; + this.threshold2 = threshold2; + } + + @Override + public List getFeederInfoStyles(FeederInfo info) { + List styles = new ArrayList<>(super.getFeederInfoStyles(info)); + if (info instanceof DirectionalFeederInfo) { + DirectionalFeederInfo feederInfo = (DirectionalFeederInfo) info; + feederInfo.getRightLabel().ifPresent(label -> { + double value = Math.abs(feederInfo.getValue()); + if (!Double.isNaN(value) && value > 0) { + if (value > threshold2) { + styles.add(ARROW_ANIMATION_HIGH_SPEED); + } else if (value > threshold1) { + styles.add(ARROW_ANIMATION_AVERAGE_SPEED); + } else { + styles.add(ARROW_ANIMATION_LOW_SPEED); + } + } else { + styles.add(ARROW_ANIMATION_NO_SPEED); + } + }); + } else { + styles.add(ARROW_ANIMATION_NO_SPEED); + } + return styles; + } + + @Override + public List getCssFilenames() { + List styles = new ArrayList<>(super.getCssFilenames()); + styles.add("animations.css"); + return styles; + } +} diff --git a/single-line-diagram/single-line-diagram-core/src/main/resources/animations.css b/single-line-diagram/single-line-diagram-core/src/main/resources/animations.css new file mode 100644 index 000000000..43f9adf39 --- /dev/null +++ b/single-line-diagram/single-line-diagram-core/src/main/resources/animations.css @@ -0,0 +1,33 @@ +/* ----------------------------------------------------------------------- */ +/* File : animations.css ------------------------------------------------- */ +/* feeder info */ +.sld-cell-direction-top :not(.sld-arrow-animation-no-speed) .sld-arrow-in { + offset-rotate: 0deg; + offset-path: path('M 0,-10 0,10'); + animation: move var(--sld-arrow-animation-parameters, 0s); +} +.sld-cell-direction-top :not(.sld-arrow-animation-no-speed) .sld-arrow-out { + offset-rotate: 0deg; + offset-path: path('M 0,10 0,-10'); + animation: move var(--sld-arrow-animation-parameters, 0s); +} +.sld-cell-direction-bottom :not(.sld-arrow-animation-no-speed) .sld-arrow-in { + offset-rotate: 0deg; + offset-path: path('M 0,10 0,-10'); + animation: move var(--sld-arrow-animation-parameters, 0s); +} +.sld-cell-direction-bottom :not(.sld-arrow-animation-no-speed) .sld-arrow-out { + offset-rotate: 0deg; + offset-path: path('M 0,-10 0,10'); + animation: move var(--sld-arrow-animation-parameters, 0s); +} +@keyframes move { + to { + offset-distance: 100%; + } +} + +/* Set arrows animation speeds */ +.sld-arrow-animation-low-speed { --sld-arrow-animation-parameters: 3s infinite linear } +.sld-arrow-animation-average-speed { --sld-arrow-animation-parameters: 2s infinite linear } +.sld-arrow-animation-high-speed { --sld-arrow-animation-parameters: 1s infinite linear } diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java index c2f683b88..9a8a53d44 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java @@ -6,10 +6,7 @@ */ package com.powsybl.sld.iidm; -import com.powsybl.iidm.network.Country; -import com.powsybl.iidm.network.Network; -import com.powsybl.iidm.network.SwitchKind; -import com.powsybl.iidm.network.TopologyKind; +import com.powsybl.iidm.network.*; import com.powsybl.iidm.network.extensions.ConnectablePosition; import com.powsybl.sld.builders.NetworkGraphBuilder; import com.powsybl.sld.model.coordinate.Direction; @@ -17,13 +14,11 @@ import com.powsybl.sld.model.nodes.FeederNode; import com.powsybl.sld.model.nodes.Node; import com.powsybl.sld.svg.*; +import com.powsybl.sld.util.AnimatedFeederInfoStyleProvider; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; import static com.powsybl.sld.library.ComponentTypeName.ARROW_ACTIVE; import static com.powsybl.sld.library.ComponentTypeName.ARROW_REACTIVE; @@ -112,4 +107,71 @@ public void testFrenchFormatting() { // write SVG and compare to reference assertEquals(toString("/TestFormattingFeederInfos.svg"), toSVG(g, "/TestFormattingFeederInfos.svg")); } + + @Test + public void testAnimation() { + // Add load at bottom + createSwitch(vl, "d2", "d2", SwitchKind.DISCONNECTOR, false, false, false, 0, 3); + createLoad(vl, "l2", "l2", "l2", 0, ConnectablePosition.Direction.BOTTOM, 3, 10, 10); + + // Add power values to the load + network.getLoad("l").getTerminal().setP(1200.29); + network.getLoad("l").getTerminal().setQ(-1.0); + + network.getLoad("l2").getTerminal().setP(501.0); + network.getLoad("l2").getTerminal().setQ(0.0); + + layoutParameters.setFeederInfosIntraMargin(20); + + DiagramLabelProvider labelProvider = new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters) { + @Override + public List getFeederInfos(FeederNode node) { + Load l = network.getLoad("l"); + Load l2 = network.getLoad("l2"); + + if (Objects.equals(l.getNameOrId(), node.getEquipmentId())) { + return Arrays.asList( + new DirectionalFeederInfo(ARROW_ACTIVE, l.getTerminal().getP(), valueFormatter::formatPower, null), + new DirectionalFeederInfo(ARROW_REACTIVE, l.getTerminal().getQ(), valueFormatter::formatPower, null)); + } else { + return Arrays.asList( + new DirectionalFeederInfo(ARROW_ACTIVE, l2.getTerminal().getP(), valueFormatter::formatPower, null), + new DirectionalFeederInfo(ARROW_REACTIVE, l2.getTerminal().getQ(), valueFormatter::formatPower, null), + new DirectionalFeederInfo(ARROW_REACTIVE, Double.NaN, valueFormatter::formatPower, null), + new FeederInfo() { + @Override + public String getUserDefinedId() { + return null; + } + + @Override + public String getComponentType() { + return ARROW_ACTIVE; + } + + @Override + public Optional getLeftLabel() { + return Optional.of("Left"); + } + + @Override + public Optional getRightLabel() { + return Optional.of("Right"); + } + }); + } + } + }; + + DiagramStyleProvider styleProvider = new AnimatedFeederInfoStyleProvider(network, 500, 1000); + + // build graph + VoltageLevelGraph g = graphBuilder.buildVoltageLevelGraph(vl.getId()); + + // Run layout + voltageLevelGraphLayout(g); + + // write SVG and compare to reference + assertEquals(toString("/TestAnimatedFeederInfos.svg"), toSVG(g, "/TestAnimatedFeederInfos.svg", labelProvider, styleProvider)); + } } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg index 4286e9625..672b14f1a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg @@ -144,7 +144,7 @@ - + @@ -180,7 +180,7 @@ LD1 - + @@ -213,7 +213,7 @@ L11 - + @@ -246,7 +246,7 @@ L12 - + @@ -297,7 +297,7 @@ T3_12 - + @@ -333,7 +333,7 @@ G - + @@ -366,7 +366,7 @@ L11 - + @@ -401,7 +401,7 @@ T12 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg index 919df0918..bafaea90d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg @@ -225,7 +225,7 @@ - + @@ -269,7 +269,7 @@ L1 - + @@ -310,7 +310,7 @@ L11 - + @@ -351,7 +351,7 @@ L12 - + @@ -410,7 +410,7 @@ T3_12 - + @@ -454,7 +454,7 @@ G - + @@ -495,7 +495,7 @@ L11 - + @@ -538,7 +538,7 @@ T12 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg index 053f411bc..8e0cc9ee0 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg @@ -211,7 +211,7 @@ - + @@ -247,7 +247,7 @@ LD1 - + @@ -283,7 +283,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -373,7 +373,7 @@ T3_12 - + @@ -409,7 +409,7 @@ G - + @@ -445,7 +445,7 @@ - + @@ -483,7 +483,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg index 150fb7f9c..613bd181f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg @@ -231,7 +231,7 @@ - + @@ -275,7 +275,7 @@ L1 - + @@ -319,7 +319,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -407,7 +407,7 @@ - + @@ -451,7 +451,7 @@ G - + @@ -495,7 +495,7 @@ - + @@ -539,7 +539,7 @@ - + @@ -593,7 +593,7 @@ BBS2 - + @@ -637,7 +637,7 @@ L2 - + @@ -681,7 +681,7 @@ - + @@ -725,7 +725,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg index e5741c30e..53498e112 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg @@ -246,7 +246,7 @@ - + @@ -296,7 +296,7 @@ L1 - + @@ -343,7 +343,7 @@ L11 - + @@ -390,7 +390,7 @@ L12 - + @@ -455,7 +455,7 @@ T3_12 - + @@ -505,7 +505,7 @@ G - + @@ -552,7 +552,7 @@ L11 - + @@ -601,7 +601,7 @@ T12 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg new file mode 100644 index 000000000..bca09d7cf --- /dev/null +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg @@ -0,0 +1,272 @@ + + + + + + + + bbs + + + + + + + + + + + + + + + + + + 1,200 + + + + + -1 + + + + + + + + + + + + + + + + + + + + l + + + + + + + + + + + + + + + + 501 + + + + + 0 + + + + + + + + + + Right + Left + + + + + + + + + + + + + + + + l2 + + + + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg index a21c4b985..f9fec8cf2 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg @@ -65,7 +65,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg index 78c7e4662..91451632b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg @@ -206,7 +206,7 @@ - + @@ -247,7 +247,7 @@ load1 - + @@ -287,7 +287,7 @@ trf1 - + @@ -327,7 +327,7 @@ trf5 - + @@ -367,7 +367,7 @@ trf61 - + @@ -407,7 +407,7 @@ line1 - + @@ -448,7 +448,7 @@ load2 - + @@ -488,7 +488,7 @@ trf2 - + @@ -528,7 +528,7 @@ trf81 - + @@ -569,7 +569,7 @@ gen1 - + @@ -609,7 +609,7 @@ trf3 - + @@ -649,7 +649,7 @@ trf71 - + @@ -690,7 +690,7 @@ gen2 - + @@ -771,7 +771,7 @@ - + @@ -812,7 +812,7 @@ load3 - + @@ -852,7 +852,7 @@ trf1 - + @@ -892,7 +892,7 @@ trf4 - + @@ -932,7 +932,7 @@ trf72 - + @@ -973,7 +973,7 @@ gen4 - + @@ -1013,7 +1013,7 @@ trf2 - + @@ -1053,7 +1053,7 @@ trf3 - + @@ -1093,7 +1093,7 @@ trf62 - + @@ -1140,7 +1140,7 @@ bbs7 - + @@ -1181,7 +1181,7 @@ load4 - + @@ -1221,7 +1221,7 @@ trf5 - + @@ -1261,7 +1261,7 @@ trf63 - + @@ -1301,7 +1301,7 @@ trf73 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg index ed566561f..1390bc38a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg @@ -222,7 +222,7 @@ - + @@ -266,7 +266,7 @@ load1 - + @@ -307,7 +307,7 @@ trf1 - + @@ -348,7 +348,7 @@ trf5 - + @@ -389,7 +389,7 @@ trf61 - + @@ -430,7 +430,7 @@ line1 - + @@ -474,7 +474,7 @@ load2 - + @@ -515,7 +515,7 @@ trf2 - + @@ -556,7 +556,7 @@ trf81 - + @@ -600,7 +600,7 @@ gen1 - + @@ -641,7 +641,7 @@ trf3 - + @@ -682,7 +682,7 @@ trf71 - + @@ -726,7 +726,7 @@ gen2 - + @@ -810,7 +810,7 @@ - + @@ -854,7 +854,7 @@ load3 - + @@ -895,7 +895,7 @@ trf1 - + @@ -936,7 +936,7 @@ trf4 - + @@ -977,7 +977,7 @@ trf72 - + @@ -1021,7 +1021,7 @@ gen4 - + @@ -1062,7 +1062,7 @@ trf2 - + @@ -1103,7 +1103,7 @@ trf3 - + @@ -1144,7 +1144,7 @@ trf62 - + @@ -1192,7 +1192,7 @@ bbs7 - + @@ -1236,7 +1236,7 @@ load4 - + @@ -1277,7 +1277,7 @@ trf5 - + @@ -1318,7 +1318,7 @@ trf63 - + @@ -1359,7 +1359,7 @@ trf73 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg index 314858278..c38912783 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg @@ -222,7 +222,7 @@ - + @@ -266,7 +266,7 @@ load1 - + @@ -307,7 +307,7 @@ trf1 - + @@ -348,7 +348,7 @@ trf5 - + @@ -389,7 +389,7 @@ trf61 - + @@ -430,7 +430,7 @@ line1 - + @@ -474,7 +474,7 @@ load2 - + @@ -515,7 +515,7 @@ trf2 - + @@ -556,7 +556,7 @@ trf81 - + @@ -600,7 +600,7 @@ gen1 - + @@ -641,7 +641,7 @@ trf3 - + @@ -682,7 +682,7 @@ trf71 - + @@ -726,7 +726,7 @@ gen2 - + @@ -810,7 +810,7 @@ - + @@ -854,7 +854,7 @@ load3 - + @@ -895,7 +895,7 @@ trf1 - + @@ -936,7 +936,7 @@ trf4 - + @@ -977,7 +977,7 @@ trf72 - + @@ -1021,7 +1021,7 @@ gen4 - + @@ -1062,7 +1062,7 @@ trf2 - + @@ -1103,7 +1103,7 @@ trf3 - + @@ -1144,7 +1144,7 @@ trf62 - + @@ -1192,7 +1192,7 @@ bbs7 - + @@ -1236,7 +1236,7 @@ load4 - + @@ -1277,7 +1277,7 @@ trf5 - + @@ -1318,7 +1318,7 @@ trf63 - + @@ -1359,7 +1359,7 @@ trf73 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg index 970e6d976..a55b809dd 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg @@ -222,7 +222,7 @@ - + @@ -266,7 +266,7 @@ load1 - + @@ -307,7 +307,7 @@ trf1 - + @@ -348,7 +348,7 @@ trf5 - + @@ -389,7 +389,7 @@ trf61 - + @@ -430,7 +430,7 @@ line1 - + @@ -474,7 +474,7 @@ load2 - + @@ -515,7 +515,7 @@ trf2 - + @@ -556,7 +556,7 @@ trf81 - + @@ -600,7 +600,7 @@ gen1 - + @@ -641,7 +641,7 @@ trf3 - + @@ -682,7 +682,7 @@ trf71 - + @@ -726,7 +726,7 @@ gen2 - + @@ -810,7 +810,7 @@ - + @@ -854,7 +854,7 @@ load3 - + @@ -895,7 +895,7 @@ trf1 - + @@ -936,7 +936,7 @@ trf4 - + @@ -977,7 +977,7 @@ trf72 - + @@ -1021,7 +1021,7 @@ gen4 - + @@ -1062,7 +1062,7 @@ trf2 - + @@ -1103,7 +1103,7 @@ trf3 - + @@ -1144,7 +1144,7 @@ trf62 - + @@ -1192,7 +1192,7 @@ bbs7 - + @@ -1236,7 +1236,7 @@ load4 - + @@ -1277,7 +1277,7 @@ trf5 - + @@ -1318,7 +1318,7 @@ trf63 - + @@ -1359,7 +1359,7 @@ trf73 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg index ed566561f..1390bc38a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg @@ -222,7 +222,7 @@ - + @@ -266,7 +266,7 @@ load1 - + @@ -307,7 +307,7 @@ trf1 - + @@ -348,7 +348,7 @@ trf5 - + @@ -389,7 +389,7 @@ trf61 - + @@ -430,7 +430,7 @@ line1 - + @@ -474,7 +474,7 @@ load2 - + @@ -515,7 +515,7 @@ trf2 - + @@ -556,7 +556,7 @@ trf81 - + @@ -600,7 +600,7 @@ gen1 - + @@ -641,7 +641,7 @@ trf3 - + @@ -682,7 +682,7 @@ trf71 - + @@ -726,7 +726,7 @@ gen2 - + @@ -810,7 +810,7 @@ - + @@ -854,7 +854,7 @@ load3 - + @@ -895,7 +895,7 @@ trf1 - + @@ -936,7 +936,7 @@ trf4 - + @@ -977,7 +977,7 @@ trf72 - + @@ -1021,7 +1021,7 @@ gen4 - + @@ -1062,7 +1062,7 @@ trf2 - + @@ -1103,7 +1103,7 @@ trf3 - + @@ -1144,7 +1144,7 @@ trf62 - + @@ -1192,7 +1192,7 @@ bbs7 - + @@ -1236,7 +1236,7 @@ load4 - + @@ -1277,7 +1277,7 @@ trf5 - + @@ -1318,7 +1318,7 @@ trf63 - + @@ -1359,7 +1359,7 @@ trf73 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg index ffc43558f..e22d0e198 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg @@ -155,7 +155,7 @@ - + @@ -199,7 +199,7 @@ load1 - + @@ -242,7 +242,7 @@ trf1 - + @@ -285,7 +285,7 @@ trf5 - + @@ -344,7 +344,7 @@ trf61 - + @@ -388,7 +388,7 @@ load2 - + @@ -431,7 +431,7 @@ trf2 - + @@ -490,7 +490,7 @@ trf81 - + @@ -534,7 +534,7 @@ gen1 - + @@ -577,7 +577,7 @@ trf3 - + @@ -636,7 +636,7 @@ trf71 - + @@ -680,7 +680,7 @@ gen2 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg index d722be6bf..2056bc7b8 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg @@ -219,7 +219,7 @@ - + @@ -263,7 +263,7 @@ load1 - + @@ -306,7 +306,7 @@ trf1 - + @@ -349,7 +349,7 @@ trf5 - + @@ -408,7 +408,7 @@ trf61 - + @@ -452,7 +452,7 @@ load2 - + @@ -495,7 +495,7 @@ trf2 - + @@ -554,7 +554,7 @@ trf81 - + @@ -598,7 +598,7 @@ gen1 - + @@ -641,7 +641,7 @@ trf3 - + @@ -700,7 +700,7 @@ trf71 - + @@ -744,7 +744,7 @@ gen2 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg index bbb72bd21..985fd902c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg @@ -101,7 +101,7 @@ Bottom - + @@ -152,7 +152,7 @@ - + @@ -233,7 +233,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg index 847f2c6b0..8165bb60b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg @@ -189,7 +189,7 @@ Bottom - + @@ -240,7 +240,7 @@ - + @@ -321,7 +321,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg index e3972d0d2..ac4ddcc9d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg @@ -87,7 +87,7 @@ bbs23 - + @@ -138,7 +138,7 @@ - + @@ -219,7 +219,7 @@ - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg index 0e348a82f..24deba57a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg @@ -142,7 +142,7 @@ - + @@ -175,7 +175,7 @@ L1 - + @@ -208,7 +208,7 @@ L2 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg index 0e348a82f..24deba57a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg @@ -142,7 +142,7 @@ - + @@ -175,7 +175,7 @@ L1 - + @@ -208,7 +208,7 @@ L2 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg index 3ed10e799..ad4ef3148 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg @@ -143,7 +143,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg index 0a75778ba..920e5ca9c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg @@ -177,7 +177,7 @@ - + @@ -220,7 +220,7 @@ G - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg index 673dd8c08..d289e9f18 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg @@ -143,7 +143,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg index 54e85c855..eb01f4a6d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg @@ -69,7 +69,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg index c453e60c8..5aee86aa4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg @@ -135,7 +135,7 @@ bbs2 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg index f95556293..050cb4a9e 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg @@ -65,7 +65,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg index e4ec3f693..f62eef90e 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg @@ -65,7 +65,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg index fd8a9d592..485e0032a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg @@ -65,7 +65,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg index d7780bfb2..700bdfc6b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg @@ -143,7 +143,7 @@ bbs - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg index f41f0e908..c6ed56fbe 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg @@ -146,7 +146,7 @@ bbs1 - + @@ -190,7 +190,7 @@ l - + @@ -238,7 +238,7 @@ bbs2 - + @@ -282,7 +282,7 @@ g - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg index 5c6f1d03b..3cbf2b91e 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg @@ -143,7 +143,7 @@ bbs1 - + @@ -187,7 +187,7 @@ l - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg index 8a893d517..6a14ba41e 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg @@ -163,7 +163,7 @@ BF - + @@ -352,7 +352,7 @@ 19 - + @@ -517,7 +517,7 @@ 5 - + @@ -677,7 +677,7 @@ 45 - + @@ -881,7 +881,7 @@ 29 - + @@ -921,7 +921,7 @@ 2 - + @@ -965,7 +965,7 @@ FP - + @@ -1000,7 +1000,7 @@ FX_ONE - + @@ -1043,7 +1043,7 @@ FV_ONE - + @@ -1083,7 +1083,7 @@ 37 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg index e23022f8c..5d39cf9df 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg @@ -177,7 +177,7 @@ - + @@ -243,7 +243,7 @@ Converter1 - + @@ -287,7 +287,7 @@ Filter 1 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg index 1b4acdeb4..7c3eba75b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg @@ -177,7 +177,7 @@ - + @@ -255,7 +255,7 @@ Converter1 - + @@ -299,7 +299,7 @@ Filter 1 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg index 9388c6675..e5c94cb1f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg @@ -82,7 +82,7 @@ bbs1 - + @@ -116,7 +116,7 @@ l - + @@ -147,7 +147,7 @@ 2WT_1 - + @@ -185,7 +185,7 @@ bbs2 - + @@ -216,7 +216,7 @@ 2WT_2 - + @@ -254,7 +254,7 @@ bbs3 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg index 75d60c7b8..b980654a3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg @@ -79,7 +79,7 @@ bbs2 - + @@ -112,7 +112,7 @@ 2WT_2 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg index 29ffaafcc..7daef2f2a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg @@ -79,7 +79,7 @@ bbs3 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg index 81ebf3714..b91a65a1d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg @@ -177,7 +177,7 @@ - + @@ -243,7 +243,7 @@ Converter1 - + @@ -284,7 +284,7 @@ Filter 1 - + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg index 35a9affba..b9827dc4b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg @@ -146,7 +146,7 @@ bbs1 - + @@ -190,7 +190,7 @@ l - + @@ -231,7 +231,7 @@ 2WT_1 - + @@ -279,7 +279,7 @@ bbs2 - + @@ -320,7 +320,7 @@ 2WT_2 - + @@ -368,7 +368,7 @@ bbs3 - +