Fix merge

flo-dup · flo-dup · commit d75aaaca5a25 · 2025-03-25T12:59:31.000+01:00
Signed-off-by: Florian Dupuy &lt;florian.dupuy@rte-france.com&gt;
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java
@@ -377,7 +377,8 @@ private void drawPstArrow(XMLStreamWriter writer, ThreeWtNode threeWtNode, Three
         writer.writeEmptyElement(PATH_ELEMENT_NAME);
         writer.writeAttribute(PATH_D_ATTRIBUTE, getPstArrowPath(arrowSize));
         writer.writeAttribute(TRANSFORM_ATTRIBUTE, getMatrixString(matrix));
-        writeStyleClasses(writer, styleProvider.getThreeWtNodeStyle(threeWtNode, edge.getSide()), StyleProvider.WINDING_CLASS);
+        writeStyleClasses(writer, styleProvider.getThreeWtEdgeStyleClasses(edge), StyleProvider.WINDING_CLASS);
+        writeStyleAttribute(writer, styleProvider.getThreeWtEdgeStyle(edge));
     }
 
     private void drawLoopEdgeInfo(XMLStreamWriter writer, BranchEdge edge, BranchEdge.Side side, EdgeInfo edgeInfo) throws XMLStreamException {
diff --git a/network-area-diagram/src/test/resources/3wt_pst.svg b/network-area-diagram/src/test/resources/3wt_pst.svg
@@ -54,8 +54,8 @@ path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}
     <g class="nad-3wt-edges">
         <g id="7" class="nad-vl0to30">
             <desc>3WT</desc>
-            <polyline class="nad-edge-path nad-stretchable" points="68.27,-487.11 -14.91,-159.64"/>
-            <g class="nad-glued-1 nad-edge-infos" transform="translate(60.27,-455.61)">
+            <polyline class="nad-edge-path" points="68.27,-487.11 -14.91,-159.64"/>
+            <g class="nad-edge-infos" transform="translate(60.27,-455.61)">
                 <g class="nad-active">
                     <g transform="rotate(-165.75)">
                         <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,8 @@ private void drawPstArrow(XMLStreamWriter writer, ThreeWtNode threeWtNode, Three`
`377`	`377`	`writer.writeEmptyElement(PATH_ELEMENT_NAME);`
`378`	`378`	`writer.writeAttribute(PATH_D_ATTRIBUTE, getPstArrowPath(arrowSize));`
`379`	`379`	`writer.writeAttribute(TRANSFORM_ATTRIBUTE, getMatrixString(matrix));`
`380`		`- writeStyleClasses(writer, styleProvider.getThreeWtNodeStyle(threeWtNode, edge.getSide()), StyleProvider.WINDING_CLASS);`
	`380`	`+ writeStyleClasses(writer, styleProvider.getThreeWtEdgeStyleClasses(edge), StyleProvider.WINDING_CLASS);`
	`381`	`+ writeStyleAttribute(writer, styleProvider.getThreeWtEdgeStyle(edge));`
`381`	`382`	`}`
`382`	`383`
`383`	`384`	`private void drawLoopEdgeInfo(XMLStreamWriter writer, BranchEdge edge, BranchEdge.Side side, EdgeInfo edgeInfo) throws XMLStreamException {`