Deal with an empty list of voltage level ids as NAD nominal voltage f…

…ilter input Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
powsybl · Jan 12, 2024 · f80df3a · f80df3a
1 parent 7dbdd97
commit f80df3a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/java/src/main/java/com/powsybl/python/network/NetworkAreaDiagramUtil.java b/java/src/main/java/com/powsybl/python/network/NetworkAreaDiagramUtil.java
@@ -35,7 +35,7 @@ static void writeSvg(Network network, List<String> voltageLevelIds, int depth, W
 
         Predicate<VoltageLevel> filter = !voltageLevelIds.isEmpty()
                 ? getNominalVoltageFilter(network, voltageLevelIds, nominalVoltageLowerBound, nominalVoltageUpperBound, depth)
-                : VoltageLevelFilter.NO_FILTER;
+                : getNominalVoltageFilter(network, nominalVoltageLowerBound, nominalVoltageUpperBound);
         NetworkAreaDiagram.draw(network, writer, nadParameters, filter);
     }
 
@@ -83,6 +83,18 @@ static VoltageLevelFilter getNominalVoltageFilter(Network network, List<String>
         }
     }
 
+    static VoltageLevelFilter getNominalVoltageFilter(Network network, double nominalVoltageLowerBound, double nominalVoltageUpperBound) {
+        if (nominalVoltageLowerBound >= 0 && nominalVoltageUpperBound >= 0) {
+            VoltageLevelFilter.createNominalVoltageFilter(network, nominalVoltageLowerBound, nominalVoltageUpperBound);
+        } else if (nominalVoltageLowerBound < 0 && nominalVoltageUpperBound >= 0) {
+            VoltageLevelFilter.createNominalVoltageUpperBoundFilter(network, nominalVoltageUpperBound);
+        } else if (nominalVoltageLowerBound >= 0 && nominalVoltageUpperBound < 0) {
+            VoltageLevelFilter.createNominalVoltageLowerBoundFilter(network, nominalVoltageLowerBound);
+        } else {
+            return VoltageLevelFilter.NO_FILTER;
+        }
+    }
+
     public static List<String> getDisplayedVoltageLevels(Network network, List<String> voltageLevelIds, int depth) {
         return NetworkAreaDiagram.getDisplayedVoltageLevels(network, voltageLevelIds, depth);
     }

diff --git a/tests/test_network.py b/tests/test_network.py
@@ -869,6 +869,8 @@ def test_nad():
         n.write_network_area_diagram_svg(test_svg, ['VL1', 'VL2'])
         n.write_network_area_diagram_svg(test_svg, high_nominal_voltage_bound=50, low_nominal_voltage_bound=10,
                                          depth=10)
+        n.write_network_area_diagram_svg(test_svg, high_nominal_voltage_bound=50)
+        n.write_network_area_diagram_svg(test_svg, low_nominal_voltage_bound=10)
         n.write_network_area_diagram_svg(test_svg, low_nominal_voltage_bound=10, depth=10)
         n.write_network_area_diagram_svg(test_svg, high_nominal_voltage_bound=50, depth=10)
         n.write_network_area_diagram(test_svg, nad_parameters=NadParameters(edge_name_displayed=True,