Edge name not displayed by default (#504)

* name on line not displayed by default + refactoring * update test references Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
powsybl · May 4, 2023 · 66918c4 · 66918c4
1 parent dcbc531
commit 66918c4
Show file tree

Hide file tree

Showing 34 changed files with 20 additions and 3,042 deletions.
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgParameters.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgParameters.java
@@ -39,7 +39,7 @@ public class SvgParameters {
     private double loopEdgesAperture = Math.toRadians(60);
     private double loopControlDistance = 40;
     private boolean edgeInfoAlongEdge = true;
-    private boolean edgeNameDisplayed = true;
+    private boolean edgeNameDisplayed = false;
     private double interAnnulusSpace = 5;
     private String svgPrefix = "";
     private boolean idDisplayed = false;

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
@@ -183,23 +183,25 @@ private void drawEdgeCenter(XMLStreamWriter writer, BranchEdge edge) throws XMLS
         if (BranchEdge.DANGLING_LINE_EDGE.equals(edge.getType())) {
             return;
         }
-        writer.writeStartElement(GROUP_ELEMENT_NAME);
-        writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.GLUED_CENTER_CLASS);
-        switch (edge.getType()) {
-            case BranchEdge.PST_EDGE:
-            case BranchEdge.TWO_WT_EDGE:
-                draw2Wt(writer, edge);
-                break;
-            case BranchEdge.HVDC_LINE_EDGE:
-                drawConverterStation(writer, edge);
-                break;
-            default:
-                break;
-        }
-        if (svgParameters.isEdgeNameDisplayed()) {
-            drawEdgeLabel(writer, edge);
+        if (!BranchEdge.LINE_EDGE.equals(edge.getType()) || svgParameters.isEdgeNameDisplayed()) {
+            writer.writeStartElement(GROUP_ELEMENT_NAME);
+            writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.GLUED_CENTER_CLASS);
+            switch (edge.getType()) {
+                case BranchEdge.PST_EDGE:
+                case BranchEdge.TWO_WT_EDGE:
+                    draw2Wt(writer, edge);
+                    break;
+                case BranchEdge.HVDC_LINE_EDGE:
+                    drawConverterStation(writer, edge);
+                    break;
+                default:
+                    break;
+            }
+            if (svgParameters.isEdgeNameDisplayed()) {
+                drawEdgeLabel(writer, edge);
+            }
+            writer.writeEndElement();
         }
-        writer.writeEndElement();
     }
 
     private void draw2Wt(XMLStreamWriter writer, BranchEdge edge) throws XMLStreamException {