[NAD] Fix removed HVDC lines (#788)

* Fix: removed HVDC lines
* Add and manage icons for LCC and VSC in NADs
* Fix unit test
* Merge paths in svg components

---------

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Co-authored-by: Nicolas Rol <nicolas.rol@rte-france.com>

Author: flo-dup

network-area-diagram/src/main/java/com/powsybl/nad/build/iidm/NetworkGraphBuilder.java

@@ -104,6 +104,16 @@ private void fillInjectionsMap(VoltageLevel vl, Graph graph, Map<String, List<In
         vl.getShuntCompensators().forEach(sc -> addInjection(graph, sc, injectionsMap));
         vl.getBatteries().forEach(b -> addInjection(graph, b, injectionsMap));
         vl.getStaticVarCompensators().forEach(svc -> addInjection(graph, svc, injectionsMap));
+        vl.getVscConverterStations().forEach(vsc -> {
+            if (vsc.getHvdcLine() == null) {
+                addInjection(graph, vsc, injectionsMap);
+            }
+        });
+        vl.getLccConverterStations().forEach(lcc -> {
+            if (lcc.getHvdcLine() == null) {
+                addInjection(graph, lcc, injectionsMap);
+            }
+        });
     }
 
     private void addInjection(Graph graph, com.powsybl.iidm.network.Injection<?> inj, Map<String, List<Injection>> injectionsMap) {
@@ -129,10 +139,18 @@ private static Injection.Type getInjectionType(com.powsybl.iidm.network.Injectio
             case LOAD -> Injection.Type.LOAD;
             case SHUNT_COMPENSATOR -> getShuntCompensatorType((ShuntCompensator) inj);
             case STATIC_VAR_COMPENSATOR -> Injection.Type.STATIC_VAR_COMPENSATOR;
+            case HVDC_CONVERTER_STATION -> getInjectionTypeForHvdcConverterStation((HvdcConverterStation<?>) inj);
             default -> throw new AssertionError("Unexpected injection type: " + inj.getType());
         };
     }
 
+    private static Injection.Type getInjectionTypeForHvdcConverterStation(HvdcConverterStation<?> hvdcConverterStation) {
+        return switch (hvdcConverterStation.getHvdcType()) {
+            case LCC -> Injection.Type.LCC;
+            case VSC -> Injection.Type.VSC;
+        };
+    }
+
     private static Injection.Type getShuntCompensatorType(ShuntCompensator shuntCompensator) {
         return IidmUtil.isCapacitor(shuntCompensator) ? Injection.Type.SHUNT_COMPENSATOR_CAPACITOR : Injection.Type.SHUNT_COMPENSATOR_INDUCTOR;
     }
@@ -191,7 +209,7 @@ private void visitTieLine(TieLine tieLine, DanglingLine dl, Graph graph) {
     private void visitHvdcConverterStation(HvdcConverterStation<?> converterStation, Graph graph) {
         // check if the hvdc line was not already added (at the other side of the line)
         HvdcLine hvdcLine = converterStation.getHvdcLine();
-        if (graph.containsEdge(hvdcLine.getId())) {
+        if (hvdcLine == null || graph.containsEdge(hvdcLine.getId())) {
             return;
         }
 

network-area-diagram/src/main/java/com/powsybl/nad/model/Injection.java

@@ -25,7 +25,9 @@ public enum Type {
         SHUNT_COMPENSATOR_INDUCTOR,
         STATIC_VAR_COMPENSATOR,
         GENERATOR,
-        BATTERY
+        BATTERY,
+        LCC,
+        VSC
     }
 
     private final Type type;

network-area-diagram/src/main/resources/DefaultLibrary/components.css

@@ -4,6 +4,8 @@
 .nad-capacitor {stroke: var(--nad-vl-color, lightgrey); stroke-width: 3; fill: none}
 .nad-inductor {stroke: var(--nad-vl-color, lightgrey); stroke-width: 3; stroke-linejoin: round; stroke-linecap: round; fill: none}
 .nad-svc {stroke: var(--nad-vl-color, lightgrey); stroke-width: 3; stroke-linejoin:round; fill: none}
+.nad-lcc {stroke: var(--nad-vl-color, lightgrey); stroke-width: 3; stroke-linecap:round; fill: none}
+.nad-vsc {stroke: var(--nad-vl-color, lightgrey); stroke-width: 3; stroke-linecap:round; fill: none}
 .nad-disconnected .nad-load {stroke: lightgrey}
 .nad-disconnected .nad-battery {stroke: lightgrey}
 .nad-disconnected .nad-generator {stroke: lightgrey}

network-area-diagram/src/main/resources/DefaultLibrary/components.json

@@ -83,6 +83,34 @@
     ],
     "styleClass": "nad-svc"
   },
+  {
+    "type": "LCC",
+    "size": {
+      "width": 50.0,
+      "height": 50.0
+    },
+    "subComponents": [
+      {
+        "name": "LCC",
+        "fileName": "lcc.svg"
+      }
+    ],
+    "styleClass": "nad-lcc"
+  },
+  {
+    "type": "VSC",
+    "size": {
+      "width": 50.0,
+      "height": 50.0
+    },
+    "subComponents": [
+      {
+        "name": "VSC",
+        "fileName": "vsc.svg"
+      }
+    ],
+    "styleClass": "nad-vsc"
+  },
   {
     "type": "LOCK",
     "size": {

network-area-diagram/src/main/resources/DefaultLibrary/lcc.svg

@@ -6,7 +6,9 @@
  */
 package com.powsybl.nad.svg;
 
+import com.powsybl.iidm.network.HvdcLine;
 import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.test.FourSubstationsNodeBreakerFactory;
 import com.powsybl.iidm.network.test.HvdcTestNetwork;
 import com.powsybl.nad.AbstractTest;
 import com.powsybl.nad.build.iidm.VoltageLevelFilter;
@@ -46,4 +48,16 @@ void testHvdcVL1Depth1() {
         VoltageLevelFilter filter = VoltageLevelFilter.createVoltageLevelDepthFilter(network, network.getVoltageLevel("VL1").getId(), 1);
         assertSvgEquals("/hvdc-vl-depth-1.svg", network, filter);
     }
+
+    @Test
+    void testHvdcLineRemoved() {
+        Network network = FourSubstationsNodeBreakerFactory.create();
+        assertSvgEquals("/hvdc_present.svg", network);
+        setLayoutParameters(new LayoutParameters().setInjectionsAdded(true));
+        assertSvgEquals("/hvdc_injections.svg", network);
+        network.getHvdcLineStream().toList().forEach(HvdcLine::remove);
+        assertSvgEquals("/hvdc_line_removed_injections.svg", network);
+        setLayoutParameters(new LayoutParameters().setInjectionsAdded(false));
+        assertSvgEquals("/hvdc_line_removed.svg", network);
+    }
 }