powsybl · marqueslanauja · Jun 14, 2023 · Jun 14, 2023 · Jun 14, 2023 · Jun 15, 2023
diff --git a/...extensions/src/main/java/com/powsybl/cgmes/extensions/CgmesControlAreasXmlSerializer.java b/...extensions/src/main/java/com/powsybl/cgmes/extensions/CgmesControlAreasXmlSerializer.java
@@ -125,7 +125,7 @@ private void readBoundariesAndTerminals(NetworkXmlReaderContext networkContext,
                 case "terminal":
                     id = networkContext.getAnonymizer().deanonymizeString(networkContext.getReader().getAttributeValue(null, "id"));
                     side = networkContext.getReader().getAttributeValue(null, "side");
-                    cgmesControlArea.add(TerminalRefXml.readTerminalRef(network, id, side));
+                    cgmesControlArea.add(TerminalRef.resolve(id, side, network));
                     break;
                 default:
                     throw new PowsyblException("Unknown element name <" + reader.getLocalName() + "> in <controlArea>");

diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:cca="http://www.powsybl.org/schema/iidm/ext/cgmes_control_areas/1_0" id="sim1" caseDate="2021-02-02T09:27:39.856+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:cca="http://www.powsybl.org/schema/iidm/ext/cgmes_control_areas/1_0" id="sim1" caseDate="2021-02-02T09:27:39.856+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:clbn="http://www.powsybl.org/schema/iidm/ext/cgmes_line_boundary_node/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:clbn="http://www.powsybl.org/schema/iidm/ext/cgmes_line_boundary_node/1_0" id="sim1" caseDate="2013-01-15T18:45:00.000+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_ssh_metadata.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_ssh_metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:csshm="http://www.powsybl.org/schema/iidm/ext/cgmes_ssh_metadata/1_0" id="sim1" caseDate="2020-09-07T15:44:10.209+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:csshm="http://www.powsybl.org/schema/iidm/ext/cgmes_ssh_metadata/1_0" id="sim1" caseDate="2020-09-07T15:44:10.209+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_sv_metadata.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_sv_metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:csm="http://www.powsybl.org/schema/iidm/ext/cgmes_sv_metadata/1_0" id="sim1" caseDate="2020-09-07T15:44:10.209+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:csm="http://www.powsybl.org/schema/iidm/ext/cgmes_sv_metadata/1_0" id="sim1" caseDate="2020-09-07T15:44:10.209+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:cc="http://www.powsybl.org/schema/iidm/ext/cim_characteristics/1_0" id="sim1" caseDate="2020-09-08T14:28:13.738+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:cc="http://www.powsybl.org/schema/iidm/ext/cim_characteristics/1_0" id="sim1" caseDate="2020-09-08T14:28:13.738+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="P1" country="FR" tso="RTE" geographicalTags="A">
         <iidm:voltageLevel id="VLGEN" nominalV="24.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/entsoe-util/src/test/resources/entsoeAreaRef.xml b/entsoe-util/src/test/resources/entsoeAreaRef.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S" country="FR"></iidm:substation>
     <iidm:extension id="S">
         <ea:entsoeArea>BE</ea:entsoeArea>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee118cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee118cdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee118cdf" caseDate="1993-08-25T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee118cdf" caseDate="1993-08-25T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="161.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf-solved.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf-solved.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee14cdf-solved" caseDate="1993-08-19T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee14cdf-solved" caseDate="1993-08-19T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="1.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee14cdf" caseDate="1993-08-19T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee14cdf" caseDate="1993-08-19T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="135.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee300cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee300cdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee300cdf" caseDate="1991-05-13T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee300cdf" caseDate="1991-05-13T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="115.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee30cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee30cdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee30cdf" caseDate="1993-08-20T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee30cdf" caseDate="1993-08-20T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="132.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee33.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee33.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee33" caseDate="2022-09-23T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee33" caseDate="2022-09-23T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="12.66" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee57cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee57cdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee57cdf" caseDate="1993-08-25T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee57cdf" caseDate="1993-08-25T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="1.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee69.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee69.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee69" caseDate="2022-09-23T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee69" caseDate="2022-09-23T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="12.66" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9cdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee9cdf" caseDate="2009-04-26T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee9cdf" caseDate="2009-04-26T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="100.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9zeroimpedancecdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9zeroimpedancecdf.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_10" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee9zeroimpedancecdf" caseDate="2009-04-26T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_11" xmlns:slt="http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_5" id="ieee9zeroimpedancecdf" caseDate="2009-04-26T00:00:00.000Z" forecastDistance="0" sourceFormat="IEEE-CDF" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="S1">
         <iidm:voltageLevel id="VL1" nominalV="100.0" topologyKind="BUS_BREAKER">
             <iidm:busBreakerTopology>

diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/LimitType.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/LimitType.java
@@ -13,5 +13,6 @@ public enum LimitType {
     ACTIVE_POWER,
     APPARENT_POWER,
     CURRENT,
-    VOLTAGE
+    VOLTAGE,
+    VOLTAGE_ANGLE
 }
diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/Network.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/Network.java
@@ -11,6 +11,7 @@
 import com.powsybl.commons.reporter.Reporter;
 import com.powsybl.computation.ComputationManager;
 import com.powsybl.computation.local.LocalComputationManager;
+
 import org.joda.time.DateTime;
 
 import java.io.IOException;
@@ -1190,6 +1191,16 @@ default int getConnectableCount() {
      */
     BusView getBusView();
 
+    /**
+     * Get a builder to create a new VoltageAngleLimit.
+     */
+    public VoltageAngleLimitAdder newVoltageAngleLimit();
+
+    /**
+     * Get all voltageAngleLimits.
+     */
+    List<VoltageAngleLimit> getVoltageAngleLimits();
+
     /**
      * Merge with an other network. At the end of the merge the other network
      * is empty.

diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/TerminalRef.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/TerminalRef.java
@@ -0,0 +1,124 @@
+/**
+ * Copyright (c) 2023, 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/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package com.powsybl.iidm.network;
+
+import com.powsybl.commons.PowsyblException;
+
+/**
+ * @author Luma Zamarreño <zamarrenolm at aia.es>
+ * @author José Antonio Marqués <marquesja at aia.es>
+ */
+public final class TerminalRef {
+
+    public enum Side {
+        ONE,
+        TWO,
+        THREE
+    }
+
+    private final String id;
+    private final Side side;
+
+    private TerminalRef(String id, Side side) {
+        this.id = id;
+        this.side = side;
+    }
+
+    public static TerminalRef create(String id) {
+        return new TerminalRef(id, Side.ONE);
+    }
+
+    public static TerminalRef create(String id, Side side) {
+        return new TerminalRef(id, side);
+    }
+
+    public static TerminalRef.Side getConnectableSide(Terminal terminal) {
+        Connectable<?> c = terminal.getConnectable();
+        if (c instanceof Injection) {
+            return TerminalRef.Side.ONE;
+        } else if (c instanceof Branch) {
+            return toSide(((Branch) c).getSide(terminal));
+        } else if (c instanceof ThreeWindingsTransformer) {
+            return toSide(((ThreeWindingsTransformer) c).getSide(terminal));
+        } else {
+            throw new IllegalStateException("Unexpected Connectable instance: " + c.getClass());
+        }
+    }
+
+    // FIXME(Luma) This has been moved from TerminalRefXml,
+    // Makes sense to have it here,
+    // In the future ...
+    // a Terminal ref specified for a switch could be resolved to different terminals depending on the topology
+    // This could also be written as TerminalRef.create(id , side).resolve(network)
+    public static Terminal resolve(String id, String sideText, Network network) {
+        Side side = sideText == null ? Side.ONE : Side.valueOf(sideText);
+        return resolve(id, side, network);
+    }
+
+    public static Terminal resolve(String id, Side side, Network network) {
+        Identifiable<?> identifiable = network.getIdentifiable(id);
+        if (identifiable == null) {
+            throw new PowsyblException("Terminal reference identifiable not found: '" + id + "'");
+        }
+        if (identifiable instanceof Connectable) {
+            return getTerminal((Connectable<?>) identifiable, side);
+        } else {
+            throw new PowsyblException("Unexpected terminal reference identifiable instance: " + identifiable.getClass());
+        }
+    }
+
+    private static Terminal getTerminal(Connectable<?> connectable, Side side) {
+        if (connectable instanceof Injection) {
+            return ((Injection<?>) connectable).getTerminal();
+        } else if (connectable instanceof Branch) {
+            if (side.equals(Side.ONE)) {
+                return ((Branch<?>) connectable).getTerminal1();
+            } else if (side.equals(Side.TWO)) {
+                return ((Branch<?>) connectable).getTerminal2();
+            } else {
+                throw new IllegalStateException("Unexpected Branch side: " + side.name());
+            }
+        } else if (connectable instanceof ThreeWindingsTransformer) {
+            if (side.equals(Side.ONE)) {
+                return ((ThreeWindingsTransformer) connectable).getLeg1().getTerminal();
+            } else if (side.equals(Side.TWO)) {
+                return ((ThreeWindingsTransformer) connectable).getLeg2().getTerminal();
+            } else {
+                return ((ThreeWindingsTransformer) connectable).getLeg3().getTerminal();
+            }
+        } else {
+            throw new PowsyblException("Unexpected terminal reference identifiable instance: " + connectable.getClass());
+        }
+    }
+
+    private static TerminalRef.Side toSide(Branch.Side side) {
+        if (side.equals(Branch.Side.ONE)) {
+            return TerminalRef.Side.ONE;
+        } else {
+            return TerminalRef.Side.TWO;
+        }
+    }
+
+    private static TerminalRef.Side toSide(ThreeWindingsTransformer.Side side) {
+        if (side.equals(ThreeWindingsTransformer.Side.ONE)) {
+            return TerminalRef.Side.ONE;
+        } else if (side.equals(ThreeWindingsTransformer.Side.TWO)) {
+            return TerminalRef.Side.TWO;
+        } else {
+            return TerminalRef.Side.THREE;
+        }
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Side getSide() {
+        return side;
+    }
+}
diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/VoltageAngleLimit.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/VoltageAngleLimit.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2023, 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/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package com.powsybl.iidm.network;
+
+/**
+ * @author Luma Zamarreño <zamarrenolm at aia.es>
+ * @author José Antonio Marqués <marquesja at aia.es>
+ */
+public interface VoltageAngleLimit extends OperationalLimits {
+
+    public enum FlowDirection {
+        FROM_TO,
+        TO_FROM,
+        BOTH_DIRECTIONS
+    }
+
+    @Override
+    default LimitType getLimitType() {
+        return LimitType.VOLTAGE_ANGLE;
+    }
+
+    /**
+     * Get the Terminal from
+     */
+    Terminal getTerminalFrom();
+
+    /**
+     * Get the Terminal to
+     */
+    Terminal getTerminalTo();
+
+    /**
+     * Get the VoltageAngle limit value
+     */
+    double getLimit();
+
+    /**
+     * Get the flow direction
+     */
+    FlowDirection getFlowDirection();
+}