Changes after review

Signed-off-by: Giovanni Ferrari <giovanni.ferrari@soft.it>

Author: quinarygio

network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java

@@ -636,8 +636,6 @@ private void drawHighlightedNode(XMLStreamWriter writer, VoltageLevelNode vlNode
     }
 
     private void drawTextNodes(Graph graph, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeStartElement(GROUP_ELEMENT_NAME);
-        writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.TEXT_NODES_CLASS);
         List<Pair<VoltageLevelNode, TextNode>> simpleTextNodes = new ArrayList<>();
         List<Pair<VoltageLevelNode, TextNode>> detailedTextNodes = new ArrayList<>();
         graph.getVoltageLevelTextPairs().stream()
@@ -653,14 +651,15 @@ private void drawTextNodes(Graph graph, XMLStreamWriter writer) throws XMLStream
             writeSimpleTextNode(writer, nodePair.getSecond(), labelProvider.getVoltageLevelDescription(nodePair.getFirst()));
         }
         if (!detailedTextNodes.isEmpty()) {
-            TextNode firstNode = detailedTextNodes.get(0).getSecond();
-            writeForeignObject(writer, firstNode);
+            writeForeignObject(writer);
+            writer.writeStartElement("", DIV_ELEMENT_NAME, XHTML_NAMESPACE_URI);
+            writer.writeDefaultNamespace(XHTML_NAMESPACE_URI);
             for (Pair<VoltageLevelNode, TextNode> nodePair : detailedTextNodes) {
-                writeDetailedTextNode(writer, firstNode, nodePair.getSecond(), nodePair.getFirst(), labelProvider.getVoltageLevelDescription(nodePair.getFirst()));
+                writeDetailedTextNode(writer, nodePair.getSecond(), nodePair.getFirst(), labelProvider.getVoltageLevelDescription(nodePair.getFirst()));
             }
             writer.writeEndElement();
+            writer.writeEndElement();
         }
-        writer.writeEndElement();
     }
 
     private String getTranslateString(Node node) {
@@ -679,21 +678,18 @@ private boolean isDetailedTextNode(List<String> content) {
         return content.size() > 1 || svgParameters.isBusLegend() || svgParameters.isVoltageLevelDetails();
     }
 
-    private void writeForeignObject(XMLStreamWriter writer, TextNode textNode) throws XMLStreamException {
+    private void writeForeignObject(XMLStreamWriter writer) throws XMLStreamException {
         writer.writeStartElement(FOREIGN_OBJECT_ELEMENT_NAME);
-        writeId(writer, textNode);
-        writer.writeAttribute(Y_ATTRIBUTE, getFormattedValue(textNode.getY()));
-        writer.writeAttribute(X_ATTRIBUTE, getFormattedValue(textNode.getX()));
         writer.writeAttribute(HEIGHT_ATTRIBUTE, "1");
         writer.writeAttribute(WIDTH_ATTRIBUTE, "1");
+        writeStyleClasses(writer, StyleProvider.TEXT_NODES_CLASS);
     }
 
-    private void writeDetailedTextNode(XMLStreamWriter writer, TextNode firstNode, TextNode textNode, VoltageLevelNode vlNode, List<String> content) throws XMLStreamException {
+    private void writeDetailedTextNode(XMLStreamWriter writer, TextNode textNode, VoltageLevelNode vlNode, List<String> content) throws XMLStreamException {
         writer.writeStartElement("", DIV_ELEMENT_NAME, XHTML_NAMESPACE_URI);
-        writer.writeDefaultNamespace(XHTML_NAMESPACE_URI);
         writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.LABEL_BOX_CLASS);
-        long top = Math.round(textNode.getY() - firstNode.getY());
-        long left = Math.round(textNode.getX() - firstNode.getX());
+        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);

network-area-diagram/src/main/resources/customStyle.css

@@ -10,7 +10,7 @@ path.nad-arrow-out:not(.nad-state-out .nad-arrow-out) {visibility: hidden}
 path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}
 .nad-text-background {flood-color: #90a4aeaa}
 .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}
-.nad-text-nodes foreignObject {overflow: visible; color: black}
+foreignObject.nad-text-nodes {overflow: visible; color: black}
 .nad-label-box {background-color: #6c6c6c20; width: max-content; padding: 10px; border-radius: 10px;}
 .nad-legend-square {width: 20px; height: 20px; background: var(--nad-vl-color, lightgrey);}
 .nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}

network-area-diagram/src/main/resources/nominalStyle.css

@@ -14,7 +14,7 @@ path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}
 .nad-current {fill: #bd4802}
 .nad-text-background {flood-color: #90a4aeaa}
 .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}
-.nad-text-nodes foreignObject {overflow: visible; color: black}
+foreignObject.nad-text-nodes {overflow: visible; color: black}
 .nad-label-box {background-color: #6c6c6c20; width: max-content; padding: 10px; border-radius: 10px;}
 .nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}
 .nad-vl0to30 {--nad-vl-color: #AFB42B}

network-area-diagram/src/main/resources/topologicalStyle.css

@@ -14,7 +14,7 @@ path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}
 .nad-current {fill: #bd4802}
 .nad-text-background {flood-color: #90a4aeaa}
 .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}
-.nad-text-nodes foreignObject {overflow: visible; color: black}
+foreignObject.nad-text-nodes {overflow: visible; color: black}
 .nad-label-box {background-color: #6c6c6c20; width: max-content; padding: 10px; border-radius: 10px;}
 .nad-legend-square {width: 20px; height: 20px; background: var(--nad-vl-color, black);}
 .nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}