Spread voltageLevels with missing position information

network-area-diagram/src/main/java/com/powsybl/nad/layout/FixedLayoutFactory.java

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2022, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package com.powsybl.nad.layout;
+
+import com.powsybl.nad.model.Point;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author Luma Zamarreño {@literal <zamarrenolm at aia.es>}
+ */
+public class FixedLayoutFactory implements LayoutFactory {
+
+    private final Map<String, Point> fixedPositions;
+    private final LayoutFactory layoutFactory;
+
+    public FixedLayoutFactory(Map<String, Point> fixedPositions) {
+        this(fixedPositions, BasicFixedLayout::new);
+    }
+
+    public FixedLayoutFactory(Map<String, Point> fixedPositions, LayoutFactory layoutFactory) {
+        this.fixedPositions = Objects.requireNonNull(fixedPositions);
+        this.layoutFactory = Objects.requireNonNull(layoutFactory);
+    }
+
+    @Override
+    public Layout create() {
+        Layout layout = layoutFactory.create();
+        layout.setInitialNodePositions(fixedPositions);
+        layout.setNodesWithFixedPosition(fixedPositions.keySet());
+        return layout;
+    }
+}

network-area-diagram/src/test/java/com/powsybl/nad/layout/FixedLayoutTest.java

@@ -6,16 +6,18 @@
  */
 package com.powsybl.nad.layout;
 
+import com.powsybl.diagram.test.Networks;
+import com.powsybl.ieeecdf.converter.IeeeCdfNetworkFactory;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.nad.build.iidm.NetworkGraphBuilder;
 import com.powsybl.nad.build.iidm.VoltageLevelFilter;
 import com.powsybl.nad.model.Graph;
 import com.powsybl.nad.model.Point;
-import com.powsybl.diagram.test.Networks;
+import org.junit.jupiter.api.Test;
 
+import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -33,7 +35,7 @@ void testCurrentLimits() {
                 "vl1", new Point(1, 0),
                 "vl2", new Point(2, 1));
         Graph graph = new NetworkGraphBuilder(network, VoltageLevelFilter.NO_FILTER).buildGraph();
-        Layout fixedLayout = new BasicFixedLayoutFactory(expected).create();
+        Layout fixedLayout = new FixedLayoutFactory(expected).create();
         fixedLayout.run(graph, new LayoutParameters());
         Map<String, Point> actual = graph.getNodePositions();
 
@@ -46,4 +48,54 @@ void testCurrentLimits() {
             assertEquals(pexpected.getY(), pactual.getY(), 0);
         });
     }
+
+    @Test
+    void testMissingVL8InitialPosition() {
+        Network network = IeeeCdfNetworkFactory.create9();
+        Map<String, Point> initialPositions = new HashMap<>();
+        initialPositions.put("VL1", new Point(900, -900));
+        initialPositions.put("VL2", new Point(-300, 250));
+        initialPositions.put("VL3", new Point(400, 200));
+        initialPositions.put("VL5", new Point(500, 500));
+        initialPositions.put("VL6", new Point(700, 700));
+
+        Graph graph = new NetworkGraphBuilder(network, VoltageLevelFilter.NO_FILTER).buildGraph();
+        Layout forceLayout = new FixedLayoutFactory(initialPositions, new BasicForceLayoutFactory()).create();
+        forceLayout.run(graph, new LayoutParameters());
+        Map<String, Point> actual = graph.getNodePositions();
+
+        assertEquals(initialPositions.get("VL1").getX(), actual.get("VL1").getX());
+        assertEquals(initialPositions.get("VL1").getY(), actual.get("VL1").getY());
+        assertEquals(initialPositions.get("VL2").getX(), actual.get("VL2").getX());
+        assertEquals(initialPositions.get("VL2").getY(), actual.get("VL2").getY());
+        assertEquals(initialPositions.get("VL3").getX(), actual.get("VL3").getX());
+        assertEquals(initialPositions.get("VL3").getY(), actual.get("VL3").getY());
+        assertEquals(initialPositions.get("VL5").getX(), actual.get("VL5").getX());
+        assertEquals(initialPositions.get("VL5").getY(), actual.get("VL5").getY());
+        assertEquals(initialPositions.get("VL6").getX(), actual.get("VL6").getX());
+        assertEquals(initialPositions.get("VL6").getY(), actual.get("VL6").getY());
+    }
+
+    @Test
+    void testBasicFixedLayoutFallback() {
+        Network network = IeeeCdfNetworkFactory.create9();
+        Map<String, Point> initialPositions = new HashMap<>();
+        Graph graph = new NetworkGraphBuilder(network, VoltageLevelFilter.NO_FILTER).buildGraph();
+        Layout forceLayout = new FixedLayoutFactory(initialPositions).create();
+        forceLayout.run(graph, new LayoutParameters());
+        Map<String, Point> actual = graph.getNodePositions();
+
+        assertEquals(0, actual.get("VL1").getX());
+        assertEquals(0, actual.get("VL1").getY());
+        assertEquals(0, actual.get("VL2").getX());
+        assertEquals(0, actual.get("VL2").getY());
+        assertEquals(0, actual.get("VL3").getX());
+        assertEquals(0, actual.get("VL3").getY());
+        assertEquals(0, actual.get("VL5").getX());
+        assertEquals(0, actual.get("VL5").getY());
+        assertEquals(0, actual.get("VL6").getX());
+        assertEquals(0, actual.get("VL6").getY());
+        assertEquals(0, actual.get("VL8").getX());
+        assertEquals(0, actual.get("VL8").getY());
+    }
 }