[NAD] Unknown bus corner cases (#619)

* Modify existing unit test for unknown bus corner cases * Fix wrong annulus calculation Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
powsybl · Jun 19, 2024 · a53c42d · a53c42d
1 parent 9988566
commit a53c42d
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 155 deletions.
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
@@ -742,8 +742,11 @@ private List<Double> createSortedTraversingAnglesList(List<Edge> traversingBusEd
     }
 
     private boolean isBusNodeDrawn(Node busGraphNode, BusNode busNodeCurrentlyDrawn) {
-        if (busGraphNode instanceof BusNode) {
-            return ((BusNode) busGraphNode).getIndex() < busNodeCurrentlyDrawn.getIndex();
+        if (busGraphNode == BusNode.UNKNOWN) {
+            return false;
+        }
+        if (busGraphNode instanceof BusNode busGraphBusNode) {
+            return busGraphBusNode.getIndex() < busNodeCurrentlyDrawn.getIndex();
         }
         return true;
     }

diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/NominalVoltageStyleTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/NominalVoltageStyleTest.java
@@ -79,6 +79,10 @@ void testDisconnection() {
         network.getLine("L3-4-1").getTerminal1().disconnect();
         network.getTwoWindingsTransformer("T4-7-1").getTerminal1().disconnect();
         network.getVoltageLevel("VL14").getConnectableStream().map(connectable -> (Connectable<?>) connectable).forEach(connectable -> connectable.getTerminals().forEach(Terminal::disconnect));
+        network.getVoltageLevel("VL5").getBusView().getBusStream().findFirst()
+                .ifPresent(bus -> bus.getConnectedTerminals().forEach(Terminal::disconnect));
+        network.getVoltageLevel("VL4").getBusView().getBusStream().findFirst()
+                .ifPresent(bus -> bus.getConnectedTerminals().forEach(Terminal::disconnect));
         assertEquals(toString("/IEEE_14_bus_disconnection.svg"), generateSvgString(network, "/IEEE_14_bus_disconnection.svg"));
     }