Fix requested changes after review

Signed-off-by: Giovanni Ferrari <giovanni.ferrari@soft.it>

Author: quinarygio

network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java

@@ -354,19 +354,13 @@ private void draw3WtWinding(ThreeWtEdge edge, ThreeWtNode threeWtNode, XMLStream
 
     private void drawPstArrow(XMLStreamWriter writer, ThreeWtNode threeWtNode, ThreeWtEdge edge) throws XMLStreamException {
         double arrowSize = 3 * svgParameters.getTransformerCircleRadius();
-        double delta = 0d;
 
-        switch (edge.getSide()) {
-            case ONE:
-                delta = 1.5 * Math.PI;
-                break;
-            case TWO:
-                delta = 0.75 * Math.PI;
-                break;
-            case THREE:
-                delta = Math.PI;
-                break;
-        }
+        double delta = switch (edge.getSide()) {
+            case ONE -> 1.5 * Math.PI;
+            case TWO -> 0.75 * Math.PI;
+            case THREE -> Math.PI;
+        };
+
         double rotationAngle = edge.getEdgeAngle() + delta;
 
         double radius = svgParameters.getTransformerCircleRadius();

single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/library/ComponentTypeName.java

@@ -6,6 +6,8 @@
  */
 package com.powsybl.sld.library;
 
+import java.util.Set;
+
 /**
  * @author Franck Lecuyer {@literal <franck.lecuyer at rte-france.com>}
  */
@@ -39,6 +41,10 @@ public final class ComponentTypeName {
     public static final String THREE_WINDINGS_TRANSFORMER_PST_1 = "THREE_WINDINGS_TRANSFORMER_PST_1";
     public static final String THREE_WINDINGS_TRANSFORMER_PST_2 = "THREE_WINDINGS_TRANSFORMER_PST_2";
     public static final String THREE_WINDINGS_TRANSFORMER_PST_3 = "THREE_WINDINGS_TRANSFORMER_PST_3";
+    public static final Set<String> THREE_WINDINGS_TRANSFORMER_COMPONENTS = Set.of(THREE_WINDINGS_TRANSFORMER,
+            THREE_WINDINGS_TRANSFORMER_PST_1_2_3, THREE_WINDINGS_TRANSFORMER_PST_1_2,
+            THREE_WINDINGS_TRANSFORMER_PST_1_3, THREE_WINDINGS_TRANSFORMER_PST_2_3, THREE_WINDINGS_TRANSFORMER_PST_1,
+            THREE_WINDINGS_TRANSFORMER_PST_2, THREE_WINDINGS_TRANSFORMER_PST_3);
     public static final String VSC_CONVERTER_STATION = "VSC_CONVERTER_STATION";
     public static final String LCC_CONVERTER_STATION = "LCC_CONVERTER_STATION";
     public static final String DANGLING_LINE = "DANGLING_LINE";

single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/VoltageLevelGraph.java

@@ -380,14 +380,7 @@ private boolean isInternal3wtFeederNode(FeederNode feederNode) {
     }
 
     private boolean is3wtComponent(String componentName) {
-        return componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_1)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_2)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_3)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_1_2)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_1_3)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_2_3)
-                || componentName.equals(ComponentTypeName.THREE_WINDINGS_TRANSFORMER_PST_1_2_3);
+        return ComponentTypeName.THREE_WINDINGS_TRANSFORMER_COMPONENTS.contains(componentName);
     }
 
     private void insertFeederHookNode(Node feederNode) {

single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/Test3WTPhaseTapChanger.java

@@ -33,31 +33,57 @@ public void setUp() {
     }
 
     @Test
-    void testVoltageLevelGraph3wtWithPhaseTagChanger() {
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnLeg1() {
         ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
-
         addPhaseTapChanger(twt.getLeg1());
         testSvg("/Test3WTPhaseTapChangerVoltageLevel1Leg.svg");
+    }
 
+    @Test
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnLeg2() {
+        ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
         addPhaseTapChanger(twt.getLeg2());
-        testSvg("/Test3WTPhaseTapChangerVoltageLevel2Legs.svg");
+        testSvg("/Test3WTPhaseTapChangerVoltageLevel1Leg2.svg");
+    }
 
+    @Test
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnLeg3() {
+        ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
         addPhaseTapChanger(twt.getLeg3());
-        testSvg("/Test3WTPhaseTapChangerVoltageLevel3Legs.svg");
+        testSvg("/Test3WTPhaseTapChangerVoltageLevel1Leg3.svg");
+    }
 
-        twt.getLeg1().getPhaseTapChanger().remove();
-        testSvg("/Test3WTPhaseTapChangerVoltageLevel2Legs23.svg");
+    @Test
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnLegs1and2() {
+        ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
+        addPhaseTapChanger(twt.getLeg1());
+        addPhaseTapChanger(twt.getLeg2());
+        testSvg("/Test3WTPhaseTapChangerVoltageLevel2Legs.svg");
+    }
 
-        twt.getLeg2().getPhaseTapChanger().remove();
-        testSvg("/Test3WTPhaseTapChangerVoltageLevel1Leg3.svg");
+    @Test
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnLegs2and3() {
+        ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
+        addPhaseTapChanger(twt.getLeg2());
+        addPhaseTapChanger(twt.getLeg3());
+        testSvg("/Test3WTPhaseTapChangerVoltageLevel2Legs23.svg");
+    }
 
+    @Test
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnLegs1and3() {
+        ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
         addPhaseTapChanger(twt.getLeg1());
+        addPhaseTapChanger(twt.getLeg3());
         testSvg("/Test3WTPhaseTapChangerVoltageLevel2Legs13.svg");
+    }
 
-        twt.getLeg1().getPhaseTapChanger().remove();
-        twt.getLeg3().getPhaseTapChanger().remove();
+    @Test
+    void testVoltageLevelGraph3wtWithPhaseTagChangerOnAllLegs() {
+        ThreeWindingsTransformer twt = network.getThreeWindingsTransformer("3WT");
+        addPhaseTapChanger(twt.getLeg1());
         addPhaseTapChanger(twt.getLeg2());
-        testSvg("/Test3WTPhaseTapChangerVoltageLevel1Leg2.svg");
+        addPhaseTapChanger(twt.getLeg3());
+        testSvg("/Test3WTPhaseTapChangerVoltageLevel3Legs.svg");
     }
 
     private void addPhaseTapChanger(Leg leg) {