feat: add current info

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

@@ -9,6 +9,8 @@
 import com.powsybl.commons.config.BaseVoltagesConfig;
 import com.powsybl.nad.model.*;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -22,6 +24,8 @@
  */
 public abstract class AbstractStyleProvider implements StyleProvider {
 
+    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractStyleProvider.class);
+
     private final BaseVoltagesConfig baseVoltagesConfig;
 
     protected AbstractStyleProvider() {
@@ -87,13 +91,22 @@ public List<String> getSideEdgeStyleClasses(BranchEdge edge, BranchEdge.Side sid
     @Override
     public List<String> getEdgeInfoStyles(EdgeInfo info) {
         List<String> styles = new LinkedList<>();
-        if (info.getInfoType().equals(EdgeInfo.ACTIVE_POWER)) {
-            styles.add(CLASSES_PREFIX + "active");
-        } else if (info.getInfoType().equals(EdgeInfo.REACTIVE_POWER)) {
-            styles.add(CLASSES_PREFIX + "reactive");
-        } else if (info.getInfoType().equals(EdgeInfo.CURRENT)) {
-            styles.add(CLASSES_PREFIX + "current");
+        String infoType = info.getInfoType();
+        switch (infoType) {
+            case EdgeInfo.ACTIVE_POWER:
+                styles.add(CLASSES_PREFIX + "active");
+                break;
+            case EdgeInfo.REACTIVE_POWER:
+                styles.add(CLASSES_PREFIX + "reactive");
+                break;
+            case EdgeInfo.CURRENT:
+                styles.add(CLASSES_PREFIX + "current");
+                break;
+            default:
+                LOGGER.warn("The \"{}\" type of information is not handled", infoType);
+                break;
         }
+
         info.getDirection().ifPresent(direction -> styles.add(
                 CLASSES_PREFIX + (direction == EdgeInfo.Direction.IN ? "state-in" : "state-out")));
         return styles;

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

@@ -9,14 +9,15 @@
 import com.powsybl.nad.model.*;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Florian Dupuy <florian.dupuy at rte-france.com>
  */
 public interface LabelProvider {
-    EdgeInfo getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side);
+    Optional<EdgeInfo> getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side);
 
-    EdgeInfo getEdgeInfo(Graph graph, ThreeWtEdge edge);
+    Optional<EdgeInfo> getEdgeInfo(Graph graph, ThreeWtEdge edge);
 
     String getLabel(Edge edge);
 

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

@@ -255,17 +255,21 @@ private void drawHalfEdge(Graph graph, XMLStreamWriter writer, BranchEdge edge,
         writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(edge.getDiagramId() + "." + side.getNum()));
         writeStyleClasses(writer, styleProvider.getSideEdgeStyleClasses(edge, side));
         if (edge.isVisible(side)) {
+            Optional<EdgeInfo> edgeInfo = labelProvider.getEdgeInfo(graph, edge, side);
             if (!graph.isLoop(edge)) {
                 writer.writeEmptyElement(POLYLINE_ELEMENT_NAME);
                 writeStyleClasses(writer, StyleProvider.EDGE_PATH_CLASS, StyleProvider.STRETCHABLE_CLASS, StyleProvider.GLUED_CLASS + "-" + side.getNum());
                 writer.writeAttribute(POINTS_ATTRIBUTE, getPolylinePointsString(edge, side));
-                EdgeInfo edgeInfo = labelProvider.getEdgeInfo(graph, edge, side);
-                drawBranchEdgeInfo(graph, writer, edge, side, edgeInfo);
+                if (edgeInfo.isPresent()) {
+                    drawBranchEdgeInfo(graph, writer, edge, side, edgeInfo.get());
+                }
             } else {
                 writer.writeEmptyElement(PATH_ELEMENT_NAME);
                 writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.EDGE_PATH_CLASS);
                 writer.writeAttribute(PATH_D_ATTRIBUTE, getLoopPathString(edge, side));
-                drawLoopEdgeInfo(writer, edge, side, labelProvider.getEdgeInfo(graph, edge, side));
+                if (edgeInfo.isPresent()) {
+                    drawLoopEdgeInfo(writer, edge, side, edgeInfo.get());
+                }
             }
         }
         writer.writeEndElement();
@@ -303,7 +307,10 @@ private void drawThreeWtEdge(Graph graph, XMLStreamWriter writer, ThreeWtEdge ed
         writeStyleClasses(writer, StyleProvider.EDGE_PATH_CLASS, StyleProvider.STRETCHABLE_CLASS);
         writer.writeAttribute(POINTS_ATTRIBUTE, getPolylinePointsString(edge));
 
-        drawThreeWtEdgeInfo(graph, writer, edge, labelProvider.getEdgeInfo(graph, edge));
+        Optional<EdgeInfo> edgeInfo = labelProvider.getEdgeInfo(graph, edge);
+        if (edgeInfo.isPresent()) {
+            drawThreeWtEdgeInfo(graph, writer, edge, edgeInfo.get());
+        }
 
         writer.writeEndElement();
     }
@@ -363,26 +370,25 @@ private void drawEdgeInfo(XMLStreamWriter writer, EdgeInfo edgeInfo, Point infoC
     }
 
     private void drawEdgeInfo(XMLStreamWriter writer, List<String> additionalStyles, EdgeInfo edgeInfo, Point infoCenter, double edgeAngle) throws XMLStreamException {
-        if (edgeInfo != null) {
-            writer.writeStartElement(GROUP_ELEMENT_NAME);
-            writeStyleClasses(writer, additionalStyles, StyleProvider.EDGE_INFOS_CLASS);
-            writer.writeAttribute(TRANSFORM_ATTRIBUTE, getTranslateString(infoCenter));
 
-            writer.writeStartElement(GROUP_ELEMENT_NAME);
-            writeStyleClasses(writer, styleProvider.getEdgeInfoStyles(edgeInfo));
-            drawInAndOutArrows(writer, edgeAngle);
-            Optional<String> externalLabel = edgeInfo.getExternalLabel();
-            if (externalLabel.isPresent()) {
-                drawLabel(writer, externalLabel.get(), edgeAngle, true);
-            }
-            Optional<String> internalLabel = edgeInfo.getInternalLabel();
-            if (internalLabel.isPresent()) {
-                drawLabel(writer, internalLabel.get(), edgeAngle, false);
-            }
-            writer.writeEndElement();
+        writer.writeStartElement(GROUP_ELEMENT_NAME);
+        writeStyleClasses(writer, additionalStyles, StyleProvider.EDGE_INFOS_CLASS);
+        writer.writeAttribute(TRANSFORM_ATTRIBUTE, getTranslateString(infoCenter));
 
-            writer.writeEndElement();
+        writer.writeStartElement(GROUP_ELEMENT_NAME);
+        writeStyleClasses(writer, styleProvider.getEdgeInfoStyles(edgeInfo));
+        drawInAndOutArrows(writer, edgeAngle);
+        Optional<String> externalLabel = edgeInfo.getExternalLabel();
+        if (externalLabel.isPresent()) {
+            drawLabel(writer, externalLabel.get(), edgeAngle, true);
+        }
+        Optional<String> internalLabel = edgeInfo.getInternalLabel();
+        if (internalLabel.isPresent()) {
+            drawLabel(writer, internalLabel.get(), edgeAngle, false);
         }
+        writer.writeEndElement();
+
+        writer.writeEndElement();
     }
 
     private void drawInAndOutArrows(XMLStreamWriter writer, double edgeAngle) throws XMLStreamException {

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

@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Florian Dupuy <florian.dupuy at rte-france.com>
@@ -34,13 +35,13 @@ public DefaultLabelProvider(Network network, SvgParameters svgParameters) {
     }
 
     @Override
-    public EdgeInfo getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) {
+    public Optional<EdgeInfo> getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) {
         Terminal terminal = IidmUtils.getTerminalFromEdge(network, edge, side);
         return getEdgeInfo(terminal);
     }
 
     @Override
-    public EdgeInfo getEdgeInfo(Graph graph, ThreeWtEdge edge) {
+    public Optional<EdgeInfo> getEdgeInfo(Graph graph, ThreeWtEdge edge) {
         ThreeWindingsTransformer transformer = network.getThreeWindingsTransformer(edge.getEquipmentId());
         if (transformer == null) {
             throw new PowsyblException("Unknown three windings transformer '" + edge.getEquipmentId() + "'");
@@ -54,19 +55,19 @@ public String getLabel(Edge edge) {
         return edge.getEquipmentId();
     }
 
-    private EdgeInfo getEdgeInfo(Terminal terminal) {
+    private Optional<EdgeInfo> getEdgeInfo(Terminal terminal) {
         if (terminal == null) {
-            return null;
+            return Optional.empty();
         }
         switch (svgParameters.getEdgeInfoDisplayed()) {
             case ACTIVE_POWER:
-                return new EdgeInfo(EdgeInfo.ACTIVE_POWER, terminal.getP(), valueFormatter::formatPower);
+                return Optional.of(new EdgeInfo(EdgeInfo.ACTIVE_POWER, terminal.getP(), valueFormatter::formatPower));
             case REACTIVE_POWER:
-                return new EdgeInfo(EdgeInfo.REACTIVE_POWER, terminal.getQ(), valueFormatter::formatPower);
+                return Optional.of(new EdgeInfo(EdgeInfo.REACTIVE_POWER, terminal.getQ(), valueFormatter::formatPower));
             case CURRENT:
-                return new EdgeInfo(EdgeInfo.CURRENT, terminal.getI(), valueFormatter::formatCurrent);
+                return Optional.of(new EdgeInfo(EdgeInfo.CURRENT, terminal.getI(), valueFormatter::formatCurrent));
             default:
-                return null;
+                return Optional.empty();
         }
     }
 

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

@@ -9,11 +9,8 @@
 .nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}
 .nad-state-out .nad-arrow-in {visibility: hidden}
 .nad-state-in .nad-arrow-out {visibility: hidden}
-.nad-active {visibility: visible}
 .nad-active path {stroke: none; fill: #546e7a}
-.nad-reactive {visibility: visible}
 .nad-reactive path {stroke: none; fill: #0277bd}
-.nad-current {visibility: visible}
 .nad-current path {stroke: none; fill: #bd4802}
 .nad-text-background {flood-color: #90a4aeaa}
 .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}

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

@@ -9,11 +9,8 @@
 .nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}
 .nad-state-out .nad-arrow-in {visibility: hidden}
 .nad-state-in .nad-arrow-out {visibility: hidden}
-.nad-active {visibility: visible}
 .nad-active path {stroke: none; fill: #546e7a}
-.nad-reactive {visibility: visible}
 .nad-reactive path {stroke: none; fill: #0277bd}
-.nad-current {visibility: visible}
 .nad-current path {stroke: none; fill: #bd4802}
 .nad-text-background {flood-color: #90a4aeaa}
 .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central}

network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoLabelTest.java

@@ -18,6 +18,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Optional;
+
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -45,13 +47,13 @@ protected StyleProvider getStyleProvider(Network network) {
     protected LabelProvider getLabelProvider(Network network) {
         return new DefaultLabelProvider(network, getSvgParameters()) {
             @Override
-            public EdgeInfo getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) {
-                return new EdgeInfo("test", EdgeInfo.Direction.OUT, internalLabel, externalLabel);
+            public Optional<EdgeInfo> getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) {
+                return Optional.of(new EdgeInfo("test", EdgeInfo.Direction.OUT, internalLabel, externalLabel));
             }
 
             @Override
-            public EdgeInfo getEdgeInfo(Graph graph, ThreeWtEdge edge) {
-                return new EdgeInfo("test", EdgeInfo.Direction.IN, internalLabel, externalLabel);
+            public Optional<EdgeInfo> getEdgeInfo(Graph graph, ThreeWtEdge edge) {
+                return Optional.of(new EdgeInfo("test", EdgeInfo.Direction.IN, internalLabel, externalLabel));
             }
 
             @Override