Merge branch 'main' into 684-nad-single-foreignobject

quinarygio · quinarygio · commit 16f33934520a · 2025-04-17T15:35:04.000+02:00
Signed-off-by: Giovanni Ferrari &lt;giovanni.ferrari@soft.it&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
@@ -39,7 +39,6 @@ public class SvgWriter {
     private static final String PATH_ELEMENT_NAME = "path";
     private static final String CIRCLE_ELEMENT_NAME = "circle";
     private static final String TEXT_ELEMENT_NAME = "text";
-    private static final String TSPAN_ELEMENT_NAME = "tspan";
     private static final String FOREIGN_OBJECT_ELEMENT_NAME = "foreignObject";
     private static final String DIV_ELEMENT_NAME = "div";
     private static final String TABLE_ELEMENT_NAME = "table";
@@ -58,7 +57,6 @@ public class SvgWriter {
     private static final String PATH_D_ATTRIBUTE = "d";
     private static final String X_ATTRIBUTE = "x";
     private static final String Y_ATTRIBUTE = "y";
-    private static final String DY_ATTRIBUTE = "dy";
     private static final String POINTS_ATTRIBUTE = "points";
     private static final String HREF_ATTRIBUTE = "href";
 
@@ -158,9 +156,7 @@ private void drawHighlightBranchEdges(Graph graph, XMLStreamWriter writer) throw
         writer.writeEndElement();
     }
 
-    private void drawEdgeLabel(XMLStreamWriter writer, BranchEdge edge) throws XMLStreamException {
-
-        String edgeLabel = labelProvider.getLabel(edge);
+    private void drawEdgeLabel(XMLStreamWriter writer, BranchEdge edge, String edgeLabel) throws XMLStreamException {
 
         if (edgeLabel == null || edgeLabel.isEmpty()) {
             return;
@@ -204,11 +200,11 @@ private void drawEdgeCenter(XMLStreamWriter writer, BranchEdge edge) throws XMLS
         if (BranchEdge.DANGLING_LINE_EDGE.equals(edge.getType())) {
             return;
         }
-        if (!BranchEdge.LINE_EDGE.equals(edge.getType()) || svgParameters.isEdgeNameDisplayed()) {
+        String edgeLabel = labelProvider.getLabel(edge);
+        if (!BranchEdge.LINE_EDGE.equals(edge.getType()) || !StringUtils.isEmpty(edgeLabel)) {
             writer.writeStartElement(GROUP_ELEMENT_NAME);
             switch (edge.getType()) {
-                case BranchEdge.PST_EDGE:
-                case BranchEdge.TWO_WT_EDGE:
+                case BranchEdge.PST_EDGE, BranchEdge.TWO_WT_EDGE:
                     draw2Wt(writer, edge);
                     break;
                 case BranchEdge.HVDC_LINE_EDGE:
@@ -217,9 +213,7 @@ private void drawEdgeCenter(XMLStreamWriter writer, BranchEdge edge) throws XMLS
                 default:
                     break;
             }
-            if (svgParameters.isEdgeNameDisplayed()) {
-                drawEdgeLabel(writer, edge);
-            }
+            drawEdgeLabel(writer, edge, edgeLabel);
             writer.writeEndElement();
         }
     }
@@ -636,26 +630,16 @@ private void drawHighlightedNode(XMLStreamWriter writer, VoltageLevelNode vlNode
     }
 
     private void drawTextNodes(Graph graph, XMLStreamWriter writer) throws XMLStreamException {
-        List<Pair<VoltageLevelNode, TextNode>> simpleTextNodes = new ArrayList<>();
-        List<Pair<VoltageLevelNode, TextNode>> detailedTextNodes = new ArrayList<>();
-        graph.getVoltageLevelTextPairs().stream()
+        List<Pair<VoltageLevelNode, TextNode>> textNodes = graph.getVoltageLevelTextPairs().stream()
                 .filter(nodePair -> nodePair.getSecond() != null)
-                .forEach(nodePair -> {
-                    if (isDetailedTextNode(labelProvider.getVoltageLevelDescription(nodePair.getFirst()))) {
-                        detailedTextNodes.add(nodePair);
-                    } else {
-                        simpleTextNodes.add(nodePair);
-                    }
-                });
-        for (Pair<VoltageLevelNode, TextNode> nodePair : simpleTextNodes) {
-            writeSimpleTextNode(writer, nodePair.getSecond(), labelProvider.getVoltageLevelDescription(nodePair.getFirst()));
-        }
-        if (!detailedTextNodes.isEmpty()) {
+                .toList();
+
+        if (!textNodes.isEmpty()) {
             writeForeignObject(writer);
             writer.writeStartElement("", DIV_ELEMENT_NAME, XHTML_NAMESPACE_URI);
             writer.writeDefaultNamespace(XHTML_NAMESPACE_URI);
-            for (Pair<VoltageLevelNode, TextNode> nodePair : detailedTextNodes) {
-                writeDetailedTextNode(writer, nodePair.getSecond(), nodePair.getFirst(), labelProvider.getVoltageLevelDescription(nodePair.getFirst()));
+            for (Pair<VoltageLevelNode, TextNode> nodePair : textNodes) {
+                writeDetailedTextNode(writer, nodePair.getSecond(), nodePair.getFirst());
             }
             writer.writeEndElement();
             writer.writeEndElement();
@@ -674,33 +658,28 @@ private String getTranslateString(double x, double y) {
         return "translate(" + getFormattedValue(x) + "," + getFormattedValue(y) + ")";
     }
 
-    private boolean isDetailedTextNode(List<String> content) {
-        return content.size() > 1 || svgParameters.isBusLegend() || svgParameters.isVoltageLevelDetails();
-    }
-
     private void writeForeignObject(XMLStreamWriter writer) throws XMLStreamException {
         writer.writeStartElement(FOREIGN_OBJECT_ELEMENT_NAME);
         writer.writeAttribute(HEIGHT_ATTRIBUTE, "1");
         writer.writeAttribute(WIDTH_ATTRIBUTE, "1");
         writeStyleClasses(writer, StyleProvider.TEXT_NODES_CLASS);
     }
 
-    private void writeDetailedTextNode(XMLStreamWriter writer, TextNode textNode, VoltageLevelNode vlNode, List<String> content) throws XMLStreamException {
+    private void writeDetailedTextNode(XMLStreamWriter writer, TextNode textNode, VoltageLevelNode vlNode) throws XMLStreamException {
         writer.writeStartElement("", DIV_ELEMENT_NAME, XHTML_NAMESPACE_URI);
         writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.LABEL_BOX_CLASS);
         long top = Math.round(textNode.getY());
         long left = Math.round(textNode.getX());
         writeStyleAttribute(writer, String.format("position: absolute; top: %spx; left: %spx", top, left));
         writeId(writer, textNode);
-        writeLines(content, writer);
 
-        if (svgParameters.isBusLegend()) {
-            writeBusNodeLegend(writer, vlNode);
-        }
+        List<String> vlDescription = labelProvider.getVoltageLevelDescription(vlNode);
+        writeLines(vlDescription, writer);
 
-        if (svgParameters.isVoltageLevelDetails()) {
-            writeLines(labelProvider.getVoltageLevelDetails(vlNode), writer);
-        }
+        writeBusNodeLegend(writer, vlNode);
+
+        List<String> vlDetails = labelProvider.getVoltageLevelDetails(vlNode);
+        writeLines(vlDetails, writer);
 
         writer.writeEndElement();
     }
@@ -714,43 +693,26 @@ private void writeLines(List<String> lines, XMLStreamWriter writer) throws XMLSt
     }
 
     private void writeBusNodeLegend(XMLStreamWriter writer, VoltageLevelNode vlNode) throws XMLStreamException {
-        writer.writeStartElement(TABLE_ELEMENT_NAME);
-
-        for (BusNode busNode : vlNode.getBusNodes()) {
-            writer.writeStartElement(TABLE_ROW_ELEMENT_NAME);
-            writer.writeStartElement(TABLE_DATA_ELEMENT_NAME);
-            writer.writeEmptyElement(DIV_ELEMENT_NAME);
-            writeStyleClasses(writer, styleProvider.getBusNodeStyleClasses(busNode), StyleProvider.LEGEND_SQUARE_CLASS);
-            writeStyleAttribute(writer, styleProvider.getBusNodeStyle(busNode));
-            writer.writeEndElement();
-            writer.writeStartElement(TABLE_DATA_ELEMENT_NAME);
-            writer.writeCharacters(labelProvider.getBusDescription(busNode));
-            writer.writeEndElement();
-            writer.writeEndElement();
-        }
-        writer.writeEndElement();
-    }
-
-    private void writeSimpleTextNode(XMLStreamWriter writer, TextNode textNode, List<String> content) throws XMLStreamException {
-        writer.writeStartElement(TEXT_ELEMENT_NAME);
-        writeId(writer, textNode);
-        writer.writeAttribute(Y_ATTRIBUTE, getFormattedValue(textNode.getEdgeConnection().getY()));
-        if (content.size() == 1) {
-            writer.writeAttribute(X_ATTRIBUTE, getFormattedValue(textNode.getEdgeConnection().getX()));
-            writer.writeCharacters(content.get(0));
-        } else {
-            for (int i = 0; i < content.size(); i++) {
-                String line = content.get(i);
-                writer.writeStartElement(TSPAN_ELEMENT_NAME);
-                writer.writeAttribute(X_ATTRIBUTE, getFormattedValue(textNode.getEdgeConnection().getX()));
-                if (i > 0) {
-                    writer.writeAttribute(DY_ATTRIBUTE, "1.1em");
-                }
-                writer.writeCharacters(line);
+        List<BusNode> notEmptyDescrBusNodes = vlNode.getBusNodeStream()
+                .filter(busNode -> StringUtils.isNotEmpty(labelProvider.getBusDescription(busNode)))
+                .toList();
+
+        if (!notEmptyDescrBusNodes.isEmpty()) {
+            writer.writeStartElement(TABLE_ELEMENT_NAME);
+            for (BusNode busNode : notEmptyDescrBusNodes) {
+                writer.writeStartElement(TABLE_ROW_ELEMENT_NAME);
+                writer.writeStartElement(TABLE_DATA_ELEMENT_NAME);
+                writer.writeEmptyElement(DIV_ELEMENT_NAME);
+                writeStyleClasses(writer, styleProvider.getBusNodeStyleClasses(busNode), StyleProvider.LEGEND_SQUARE_CLASS);
+                writeStyleAttribute(writer, styleProvider.getBusNodeStyle(busNode));
+                writer.writeEndElement();
+                writer.writeStartElement(TABLE_DATA_ELEMENT_NAME);
+                writer.writeCharacters(labelProvider.getBusDescription(busNode));
+                writer.writeEndElement();
                 writer.writeEndElement();
             }
+            writer.writeEndElement();
         }
-        writer.writeEndElement();
     }
 
     private void drawNode(Graph graph, XMLStreamWriter writer, VoltageLevelNode vlNode) throws XMLStreamException {
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/DefaultLabelProvider.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/DefaultLabelProvider.java
@@ -52,7 +52,7 @@ public Optional<EdgeInfo> getEdgeInfo(Graph graph, ThreeWtEdge edge) {
 
     @Override
     public String getLabel(Edge edge) {
-        return edge.getEquipmentId();
+        return svgParameters.isEdgeNameDisplayed() ? edge.getEquipmentId() : null;
     }
 
     private Optional<EdgeInfo> getEdgeInfo(Terminal terminal) {
@@ -86,35 +86,41 @@ public List<String> getVoltageLevelDescription(VoltageLevelNode voltageLevelNode
 
     @Override
     public String getBusDescription(BusNode busNode) {
-        Bus b = network.getBusView().getBus(busNode.getEquipmentId());
-        String voltage = valueFormatter.formatVoltage(b.getV(), "kV");
-        String angle = valueFormatter.formatAngleInDegrees(b.getAngle());
-        return voltage + " / " + angle;
+        if (svgParameters.isBusLegend()) {
+            Bus b = network.getBusView().getBus(busNode.getEquipmentId());
+            String voltage = valueFormatter.formatVoltage(b.getV(), "kV");
+            String angle = valueFormatter.formatAngleInDegrees(b.getAngle());
+            return voltage + " / " + angle;
+        }
+        return null;
     }
 
     @Override
     public List<String> getVoltageLevelDetails(VoltageLevelNode vlNode) {
         List<String> voltageLevelDetails = new ArrayList<>();
-        VoltageLevel voltageLevel = network.getVoltageLevel(vlNode.getEquipmentId());
 
-        double activeProductionValue = voltageLevel.getGeneratorStream().mapToDouble(generator -> -generator.getTerminal().getP()).filter(p -> !Double.isNaN(p)).sum();
-        String activeProduction = activeProductionValue == 0 ? "" : valueFormatter.formatPower(activeProductionValue, "MW");
+        if (svgParameters.isVoltageLevelDetails()) {
+            VoltageLevel voltageLevel = network.getVoltageLevel(vlNode.getEquipmentId());
 
-        double reactiveProductionValue = voltageLevel.getGeneratorStream().mapToDouble(generator -> -generator.getTerminal().getQ()).filter(q -> !Double.isNaN(q)).sum();
-        String reactiveProduction = reactiveProductionValue == 0 ? "" : valueFormatter.formatPower(reactiveProductionValue, "MVAR");
+            double activeProductionValue = voltageLevel.getGeneratorStream().mapToDouble(generator -> -generator.getTerminal().getP()).filter(p -> !Double.isNaN(p)).sum();
+            String activeProduction = activeProductionValue == 0 ? "" : valueFormatter.formatPower(activeProductionValue, "MW");
 
-        double activeConsumptionValue = voltageLevel.getLoadStream().mapToDouble(load -> load.getTerminal().getP()).filter(p -> !Double.isNaN(p)).sum();
-        String activeConsumption = activeConsumptionValue == 0 ? "" : valueFormatter.formatPower(activeConsumptionValue, "MW");
+            double reactiveProductionValue = voltageLevel.getGeneratorStream().mapToDouble(generator -> -generator.getTerminal().getQ()).filter(q -> !Double.isNaN(q)).sum();
+            String reactiveProduction = reactiveProductionValue == 0 ? "" : valueFormatter.formatPower(reactiveProductionValue, "MVAR");
 
-        double reactiveConsumptionValue = voltageLevel.getLoadStream().mapToDouble(load -> load.getTerminal().getQ()).filter(q -> !Double.isNaN(q)).sum();
-        String reactiveConsumption = reactiveConsumptionValue == 0 ? "" : valueFormatter.formatPower(reactiveConsumptionValue, "MVAR");
+            double activeConsumptionValue = voltageLevel.getLoadStream().mapToDouble(load -> load.getTerminal().getP()).filter(p -> !Double.isNaN(p)).sum();
+            String activeConsumption = activeConsumptionValue == 0 ? "" : valueFormatter.formatPower(activeConsumptionValue, "MW");
 
-        if (!activeProduction.isEmpty() || !reactiveProduction.isEmpty()) {
-            voltageLevelDetails.add(String.format("~ %s / %s", activeProduction, reactiveProduction));
-        }
+            double reactiveConsumptionValue = voltageLevel.getLoadStream().mapToDouble(load -> load.getTerminal().getQ()).filter(q -> !Double.isNaN(q)).sum();
+            String reactiveConsumption = reactiveConsumptionValue == 0 ? "" : valueFormatter.formatPower(reactiveConsumptionValue, "MVAR");
+
+            if (!activeProduction.isEmpty() || !reactiveProduction.isEmpty()) {
+                voltageLevelDetails.add(String.format("~ %s / %s", activeProduction, reactiveProduction));
+            }
 
-        if (!activeConsumption.isEmpty() || !reactiveConsumption.isEmpty()) {
-            voltageLevelDetails.add(String.format("⌂ %s / %s", activeConsumption, reactiveConsumption));
+            if (!activeConsumption.isEmpty() || !reactiveConsumption.isEmpty()) {
+                voltageLevelDetails.add(String.format("⌂ %s / %s", activeConsumption, reactiveConsumption));
+            }
         }
 
         return voltageLevelDetails;
diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/CustomLabelProviderTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/CustomLabelProviderTest.java
@@ -31,14 +31,14 @@ class CustomLabelProviderTest extends AbstractTest {
     void setup() {
         setLayoutParameters(new LayoutParameters());
 
-        //Note: SvgParameters EdgeNameDisplayed, VoltageLevelDetails, and BusLegend must be true,
-        // for the edge names, the VL descriptions plus VL details, and bus descriptions to be rendered
+        //Note: sets SvgParameters EdgeNameDisplayed, VoltageLevelDetails, and BusLegend explicitly to false, to demonstrate that
+        // the custom label provider ignores them when rendering edge names, the VL descriptions, and VL details.
         setSvgParameters(new SvgParameters()
                 .setSvgWidthAndHeightAdded(true)
                 .setFixedWidth(800)
-                .setEdgeNameDisplayed(true)
-                .setVoltageLevelDetails(true)
-                .setBusLegend(true));
+                .setEdgeNameDisplayed(false)
+                .setVoltageLevelDetails(false)
+                .setBusLegend(false));
     }
 
     @Override
diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/TextNodeTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/TextNodeTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -47,12 +48,16 @@ protected LabelProvider getLabelProvider(Network network) {
         return new DefaultLabelProvider(network, getSvgParameters()) {
             @Override
             public List<String> getVoltageLevelDetails(VoltageLevelNode vlNode) {
-                VoltageLevel vl = network.getVoltageLevel(vlNode.getEquipmentId());
-                return List.of(
-                        vl.getLoadCount() + " loads",
-                        vl.getGeneratorCount() + " generators",
-                        vl.getBatteryCount() + " batteries",
-                        vl.getDanglingLineCount() + " dangling lines");
+                if (getSvgParameters().isVoltageLevelDetails()) {
+                    VoltageLevel vl = network.getVoltageLevel(vlNode.getEquipmentId());
+                    return List.of(
+                            vl.getLoadCount() + " loads",
+                            vl.getGeneratorCount() + " generators",
+                            vl.getBatteryCount() + " batteries",
+                            vl.getDanglingLineCount() + " dangling lines");
+                } else {
+                    return Collections.emptyList();
+                }
             }
         };
     }
diff --git a/network-area-diagram/src/test/resources/3wt_disconnected.svg b/network-area-diagram/src/test/resources/3wt_disconnected.svg
@@ -143,7 +143,6 @@ foreignObject.nad-text-nodes {overflow: visible; color: black}
             </div>
             <div class="nad-label-box" style="position: absolute; top: 165px; left: 280px" id="4-textnode">
                 <div>VL_33</div>
-                <table></table>
             </div>
         </div>
     </foreignObject>
diff --git a/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg b/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg
@@ -208,7 +208,6 @@ foreignObject.nad-text-nodes {overflow: visible; color: black}
             </div>
             <div class="nad-label-box" style="position: absolute; top: 165px; left: 280px" id="4-textnode">
                 <div>VL_33</div>
-                <table></table>
             </div>
         </div>
     </foreignObject>
diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg
@@ -724,7 +724,6 @@ foreignObject.nad-text-nodes {overflow: visible; color: black}
             </div>
             <div class="nad-label-box" style="position: absolute; top: 379px; left: 212px" id="10-textnode">
                 <div>VL14</div>
-                <table></table>
             </div>
             <div class="nad-label-box" style="position: absolute; top: -425px; left: 162px" id="11-textnode">
                 <div>VL2</div>
diff --git a/network-area-diagram/src/test/resources/vl_description_id.svg b/network-area-diagram/src/test/resources/vl_description_id.svg
@@ -174,6 +174,14 @@ foreignObject.nad-text-nodes {overflow: visible; color: black}
         <polyline id="0-textedge" points="-26.39,-323.15 43.94,-333.70"/>
         <polyline id="2-textedge" points="-200.75,-3.27 -130.42,-13.82"/>
     </g>
-    <text id="0-textnode" y="-333.70" x="43.94">vl1</text>
-    <text id="2-textnode" y="-13.82" x="-130.42">vl2</text>
+    <foreignObject height="1" width="1" class="nad-text-nodes">
+        <div xmlns="http://www.w3.org/1999/xhtml">
+            <div class="nad-label-box" style="position: absolute; top: -359px; left: 44px" id="0-textnode">
+                <div>vl1</div>
+            </div>
+            <div class="nad-label-box" style="position: absolute; top: -39px; left: -130px" id="2-textnode">
+                <div>vl2</div>
+            </div>
+        </div>
+    </foreignObject>
 </svg>
