Merge branch 'develop' into dependabot/github_actions/whelk-io/maven-…

…settings-xml-action-22
com-pas · Feb 26, 2024 · 34f55d4 · 34f55d4
2 parents 1305b2e + 9f955d8
commit 34f55d4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,8 +26,8 @@ SPDX-License-Identifier: Apache-2.0
         <compas.core.version>0.16.0</compas.core.version>
 
         <quarkus.platform.version>3.7.1</quarkus.platform.version>
-        <log4j2.version>2.22.1</log4j2.version>
-        <powsybl.sld.version>3.3.2</powsybl.sld.version>
+        <log4j2.version>2.23.0</log4j2.version>
+        <powsybl.sld.version>4.0.0</powsybl.sld.version>
         <gson.version>2.10.1</gson.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>

diff --git a/.../org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java b/.../org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java
@@ -16,7 +16,7 @@
 
 import java.util.*;
 
-public class SclAutoAlignmentDiagramLabelProvider implements DiagramLabelProvider {
+public class SclAutoAlignmentDiagramLabelProvider implements LabelProvider {
     private final Map<Node, List<NodeLabel>> busLabels = new HashMap<>();
 
     public SclAutoAlignmentDiagramLabelProvider(SubstationGraph graph) {

diff --git a/...src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/...src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java
@@ -8,6 +8,7 @@
 import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory;
 import com.powsybl.sld.library.ConvergenceComponentLibrary;
 import com.powsybl.sld.model.graphs.SubstationGraph;
+import com.powsybl.sld.svg.SvgParameters;
 import com.powsybl.sld.svg.styles.BasicStyleProvider;
 import com.powsybl.sld.svg.DefaultSVGWriter;
 import org.lfenergy.compas.core.commons.ElementConverter;
@@ -102,17 +103,14 @@ String createSVG(SubstationGraphBuilder substationGraphBuilder) {
         configureLayout(graph, layoutParameters);
 
         var writer = new StringWriter();
-        var svgWriter = new DefaultSVGWriter(new ConvergenceComponentLibrary(), layoutParameters);
-        svgWriter.write("", graph, new SclAutoAlignmentDiagramLabelProvider(graph), new BasicStyleProvider(), writer);
+        var svgWriter = new DefaultSVGWriter(new ConvergenceComponentLibrary(), layoutParameters, new SvgParameters());
+        svgWriter.write(graph, new SclAutoAlignmentDiagramLabelProvider(graph), new BasicStyleProvider(), writer);
         return writer.toString();
     }
 
     private LayoutParameters getLayoutParameters() {
         return new LayoutParameters()
-                .setAdaptCellHeightToContent(true)
-                .setShowInternalNodes(true)
-                .setCssLocation(LayoutParameters.CssLocation.INSERTED_IN_SVG)
-                .setShowInternalNodes(true);
+                .setAdaptCellHeightToContent(true);
     }
 
     private void configureLayout(SubstationGraph graph, LayoutParameters layoutParameters) {