[SLD] Add label on all nodes if requested

single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/AbstractLabelProvider.java

@@ -50,10 +50,12 @@ public List<NodeLabel> getNodeLabels(Node node, Direction direction) {
         Objects.requireNonNull(node);
 
         List<NodeLabel> nodeLabels = new ArrayList<>();
-        if (node instanceof FeederNode) {
-            getLabelOrNameOrId(node).ifPresent(label -> nodeLabels.add(new NodeLabel(label, getFeederLabelPosition(node, direction), null)));
-        } else if (node instanceof BusNode) {
+        if (node instanceof BusNode) {
             getLabelOrNameOrId(node).ifPresent(label -> nodeLabels.add(new NodeLabel(label, getBusLabelPosition(), null)));
+        } else if (node instanceof FeederNode || svgParameters.isDisplayEquipmentNodesLabel() && node instanceof EquipmentNode) {
+            getLabelOrNameOrId(node).ifPresent(label -> nodeLabels.add(new NodeLabel(label, getLabelPosition(node, direction), null)));
+        } else if (svgParameters.isDisplayConnectivityNodesId() && node instanceof ConnectivityNode) {
+            nodeLabels.add(new NodeLabel(node.getId(), getLabelPosition(node, direction), null));
         }
 
         return nodeLabels;
@@ -93,7 +95,7 @@ protected LabelPosition getMiddle3WTDecoratorPosition(Middle3WTNode node, Direct
                 0, yShift, true, 0);
     }
 
-    protected LabelPosition getFeederLabelPosition(Node node, Direction direction) {
+    protected LabelPosition getLabelPosition(Node node, Direction direction) {
         double yShift = -LABEL_OFFSET;
         String positionName = "";
         double angle = 0;

single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/SvgParameters.java

@@ -39,13 +39,15 @@ public class SvgParameters {
     private boolean labelDiagonal = false;
     private boolean tooltipEnabled = false;
     private boolean svgWidthAndHeightAdded = false;
-    private SvgParameters.CssLocation cssLocation = SvgParameters.CssLocation.INSERTED_IN_SVG;
+    private CssLocation cssLocation = CssLocation.INSERTED_IN_SVG;
     private boolean avoidSVGComponentsDuplication = false;
     private String diagramName = null;
     private boolean drawStraightWires = false;
     private boolean showGrid = false;
     private boolean showInternalNodes = false;
     private boolean displayCurrentFeederInfo = false;
+    private boolean displayEquipmentNodesLabel;
+    private boolean displayConnectivityNodesId;
 
     public SvgParameters() {
     }
@@ -84,6 +86,8 @@ public SvgParameters(SvgParameters other) {
         this.showGrid = other.showGrid;
         this.showInternalNodes = other.showInternalNodes;
         this.displayCurrentFeederInfo = other.displayCurrentFeederInfo;
+        this.displayEquipmentNodesLabel = other.displayEquipmentNodesLabel;
+        this.displayConnectivityNodesId = other.displayConnectivityNodesId;
     }
 
     public ValueFormatter createValueFormatter() {
@@ -349,4 +353,22 @@ public SvgParameters setDisplayCurrentFeederInfo(boolean displayCurrentFeederInf
         this.displayCurrentFeederInfo = displayCurrentFeederInfo;
         return this;
     }
+
+    public boolean isDisplayEquipmentNodesLabel() {
+        return displayEquipmentNodesLabel;
+    }
+
+    public SvgParameters setDisplayEquipmentNodesLabel(boolean displayEquipmentNodesLabel) {
+        this.displayEquipmentNodesLabel = displayEquipmentNodesLabel;
+        return this;
+    }
+
+    public boolean isDisplayConnectivityNodesId() {
+        return displayConnectivityNodesId;
+    }
+
+    public SvgParameters setDisplayConnectivityNodesId(boolean displayConnectivityNodesId) {
+        this.displayConnectivityNodesId = displayConnectivityNodesId;
+        return this;
+    }
 }

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

@@ -35,7 +35,7 @@ public abstract class AbstractTestCase {
     private static final Pattern SVG_FIX_PATTERN = Pattern.compile(">\\s*(<\\!\\[CDATA\\[.*?]]>)\\s*</", Pattern.DOTALL);
 
     protected boolean debugJsonFiles = false;
-    protected boolean debugSvgFiles = false;
+    protected boolean debugSvgFiles = true;
     protected boolean overrideTestReferences = false;
 
     protected final ResourcesComponentLibrary componentLibrary = getResourcesComponentLibrary();

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

@@ -51,13 +51,24 @@ public void setUp() {
 
     @Test
     void test() {
-        // build graph
         VoltageLevelGraph g = graphBuilder.buildVoltageLevelGraph(vl.getId());
+        voltageLevelGraphLayout(g);
+        assertEquals(toString("/TestCase1.json"), toJson(g, "/TestCase1.json"));
+    }
 
-        // Run layout
+    @Test
+    void testDisplayEquipmentNodesLabel() {
+        VoltageLevelGraph g = graphBuilder.buildVoltageLevelGraph(vl.getId());
         voltageLevelGraphLayout(g);
+        svgParameters.setDisplayEquipmentNodesLabel(true);
+        assertEquals(toString("/TestCase1_equipmentLabels.svg"), toSVG(g, "/TestCase1_equipmentLabels.svg"));
+    }
 
-        // write Json and compare to reference
-        assertEquals(toString("/TestCase1.json"), toJson(g, "/TestCase1.json"));
+    @Test
+    void testDisplayConnectivityNodes() {
+        VoltageLevelGraph g = graphBuilder.buildVoltageLevelGraph(vl.getId());
+        voltageLevelGraphLayout(g);
+        svgParameters.setDisplayConnectivityNodesId(true).setShowInternalNodes(true);
+        assertEquals(toString("/TestCase1_connectivityLabels.svg"), toSVG(g, "/TestCase1_connectivityLabels.svg"));
     }
 }

single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/svg/SvgParametersTest.java

@@ -46,7 +46,9 @@ void test() {
                 .setDrawStraightWires(true)
                 .setShowGrid(true)
                 .setShowInternalNodes(true)
-                .setDisplayCurrentFeederInfo(true);
+                .setDisplayCurrentFeederInfo(true)
+                .setDisplayEquipmentNodesLabel(true)
+                .setDisplayConnectivityNodesId(true);
 
         SvgParameters svgParameters1 = new SvgParameters(svgParameters0);
 
@@ -78,5 +80,7 @@ void test() {
         assertEquals(svgParameters0.isShowGrid(), svgParameters1.isShowGrid());
         assertEquals(svgParameters0.isShowInternalNodes(), svgParameters1.isShowInternalNodes());
         assertEquals(svgParameters0.isDisplayCurrentFeederInfo(), svgParameters1.isDisplayCurrentFeederInfo());
+        assertEquals(svgParameters0.isDisplayEquipmentNodesLabel(), svgParameters1.isDisplayEquipmentNodesLabel());
+        assertEquals(svgParameters0.isDisplayConnectivityNodesId(), svgParameters1.isDisplayConnectivityNodesId());
     }
 }