From dda94a6d205e29b0800fb9601ec4e3fd286bd27a Mon Sep 17 00:00:00 2001 From: Franck LECUYER Date: Fri, 23 May 2025 15:57:45 +0200 Subject: [PATCH] Add substationId on all equipments TAB view Signed-off-by: Franck LECUYER --- .../definition/battery/BatteryTabInfos.java | 3 + .../map/dto/definition/bus/BusTabInfos.java | 3 + .../busbarsection/BusBarSectionTabInfos.java | 3 + .../danglingline/DanglingLineTabInfos.java | 3 + .../map/dto/definition/hvdc/HvdcTabInfos.java | 6 + .../LccConverterStationTabInfos.java | 3 + .../map/dto/definition/line/LineTabInfos.java | 6 + .../map/dto/definition/load/LoadTabInfos.java | 3 + .../ShuntCompensatorTabInfos.java | 3 + .../StaticVarCompensatorTabInfos.java | 3 + .../ThreeWindingsTransformerTabInfos.java | 3 + .../definition/tieline/TieLineTabInfos.java | 6 + .../TwoWindingsTransformerTabInfos.java | 3 + .../VscConverterStationTabInfos.java | 3 + .../map/dto/mapper/BatteryInfosMapper.java | 1 + .../dto/mapper/BusBarSectionInfosMapper.java | 1 + .../map/dto/mapper/BusInfosMapper.java | 2 + .../dto/mapper/DanglingLineInfosMapper.java | 2 + .../map/dto/mapper/HvdcInfosMapper.java | 2 + .../LccConverterStationInfosMapper.java | 2 + .../map/dto/mapper/LineInfosMapper.java | 2 + .../map/dto/mapper/LoadInfosMapper.java | 2 + .../dto/mapper/ShuntCompensatorMapper.java | 3 +- .../StaticVarCompensatorInfosMapper.java | 2 + .../ThreeWindingsTransformerInfosMapper.java | 4 +- .../map/dto/mapper/TieLineInfosMapper.java | 3 + .../TwoWindingsTransformerInfosMapper.java | 1 + .../VscConverterStationInfosMapper.java | 1 + .../2-windings-transformers-tab-data.json | 3 + .../3-windings-transformers-tab-data.json | 3 + src/test/resources/all-data-in-variant.json | 125 ++++++--- src/test/resources/all-data.json | 147 ++++++++--- src/test/resources/batteries-tab-data.json | 2 + src/test/resources/buses-tab-data.json | 3 +- .../resources/dangling-lines-tab-data.json | 6 +- .../dangling-lines-variant-tab-data.json | 6 +- src/test/resources/hvdc-lines-tab-data.json | 246 +++++++++--------- .../hvdc-lines-variant-tab-data.json | 234 +++++++++-------- .../lcc-converter-stations-tab-data.json | 2 + .../partial-all-data-in-variant.json | 22 +- src/test/resources/partial-all-data.json | 21 +- ...rtial-all-map-data-no-redundant-lines.json | 29 ++- .../resources/partial-batteries-tab-data.json | 1 + ...hunt-compensators-tab-data-in-variant.json | 5 + .../shunt-compensators-tab-data.json | 4 + .../static-var-compensators-tab-data.json | 2 + src/test/resources/tie-line-tab-data-dc.json | 64 ++--- src/test/resources/tie-lines-tab-data.json | 14 +- .../vsc-converter-stations-tab-data.json | 6 + 49 files changed, 667 insertions(+), 357 deletions(-) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/battery/BatteryTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/battery/BatteryTabInfos.java index 7a991db3..eb226b3d 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/battery/BatteryTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/battery/BatteryTabInfos.java @@ -67,6 +67,9 @@ public class BatteryTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + @JsonInclude(JsonInclude.Include.NON_ABSENT) private Optional measurementP; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java index e5493ec1..da87fdcc 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java @@ -36,6 +36,9 @@ public class BusTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + @JsonInclude(JsonInclude.Include.NON_NULL) private Map substationProperties; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/busbarsection/BusBarSectionTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/busbarsection/BusBarSectionTabInfos.java index 47afe8fe..64802336 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/busbarsection/BusBarSectionTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/busbarsection/BusBarSectionTabInfos.java @@ -34,4 +34,7 @@ public class BusBarSectionTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Map voltageLevelProperties; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; } diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/danglingline/DanglingLineTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/danglingline/DanglingLineTabInfos.java index da4e9863..8e397666 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/danglingline/DanglingLineTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/danglingline/DanglingLineTabInfos.java @@ -32,6 +32,9 @@ public class DanglingLineTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminalConnected; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/hvdc/HvdcTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/hvdc/HvdcTabInfos.java index aaef32ad..994d0014 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/hvdc/HvdcTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/hvdc/HvdcTabInfos.java @@ -47,6 +47,12 @@ public class HvdcTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country2; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId1; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId2; + @JsonInclude(JsonInclude.Include.NON_NULL) private Double activePowerSetpoint; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/lccconverterstation/LccConverterStationTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/lccconverterstation/LccConverterStationTabInfos.java index 2ceb2ea6..a66cc115 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/lccconverterstation/LccConverterStationTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/lccconverterstation/LccConverterStationTabInfos.java @@ -36,6 +36,9 @@ public class LccConverterStationTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminalConnected; private String hvdcLineId; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/line/LineTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/line/LineTabInfos.java index 166fb057..6ae73f90 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/line/LineTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/line/LineTabInfos.java @@ -46,6 +46,12 @@ public class LineTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country2; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId1; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId2; + private Boolean terminal1Connected; private Boolean terminal2Connected; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/load/LoadTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/load/LoadTabInfos.java index 280369d9..a3f63477 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/load/LoadTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/load/LoadTabInfos.java @@ -33,6 +33,9 @@ public class LoadTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Double nominalVoltage; private Boolean terminalConnected; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorTabInfos.java index 85b6453b..3510cc6a 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/shuntcompensator/ShuntCompensatorTabInfos.java @@ -31,6 +31,9 @@ public class ShuntCompensatorTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminalConnected; @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorTabInfos.java index b36d3659..416fce5a 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/staticvarcompensator/StaticVarCompensatorTabInfos.java @@ -32,6 +32,9 @@ public class StaticVarCompensatorTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminalConnected; private StaticVarCompensator.RegulationMode regulationMode; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/threewindingstransformer/ThreeWindingsTransformerTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/threewindingstransformer/ThreeWindingsTransformerTabInfos.java index 84fc8336..4f06cceb 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/threewindingstransformer/ThreeWindingsTransformerTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/threewindingstransformer/ThreeWindingsTransformerTabInfos.java @@ -40,6 +40,9 @@ public class ThreeWindingsTransformerTabInfos extends ElementInfosWithProperties @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminal1Connected; private Boolean terminal2Connected; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/tieline/TieLineTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/tieline/TieLineTabInfos.java index 90174a73..16a08861 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/tieline/TieLineTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/tieline/TieLineTabInfos.java @@ -42,6 +42,12 @@ public class TieLineTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country2; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId1; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId2; + private Boolean terminal1Connected; private Boolean terminal2Connected; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/twowindingstransformer/TwoWindingsTransformerTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/twowindingstransformer/TwoWindingsTransformerTabInfos.java index 11b23e7f..709d2d3f 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/twowindingstransformer/TwoWindingsTransformerTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/twowindingstransformer/TwoWindingsTransformerTabInfos.java @@ -46,6 +46,9 @@ public class TwoWindingsTransformerTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminal1Connected; private Boolean terminal2Connected; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/vscconverterstation/VscConverterStationTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/vscconverterstation/VscConverterStationTabInfos.java index 9dc96d77..7c9fe181 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/vscconverterstation/VscConverterStationTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/vscconverterstation/VscConverterStationTabInfos.java @@ -42,6 +42,9 @@ public class VscConverterStationTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private Country country; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String substationId; + private Boolean terminalConnected; private String hvdcLineId; diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/BatteryInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/BatteryInfosMapper.java index d774a73c..92cf39c1 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/BatteryInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/BatteryInfosMapper.java @@ -99,6 +99,7 @@ private static BatteryTabInfos toTabInfos(Identifiable identifiable) { .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .targetP(battery.getTargetP()) .targetQ(nullIfNan(battery.getTargetQ())) .minP(battery.getMinP()) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/BusBarSectionInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/BusBarSectionInfosMapper.java index 88fca8df..e0611342 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/BusBarSectionInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/BusBarSectionInfosMapper.java @@ -59,6 +59,7 @@ public static BusBarSectionTabInfos toTabInfos(Identifiable identifiable) { .name(busbarSection.getOptionalName().orElse(null)) .properties(getProperties(busbarSection)) .voltageLevelId(busbarSection.getTerminal().getVoltageLevel().getId()) + .substationId(busbarSection.getTerminal().getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .measurementV(toMeasurement(busbarSection, Measurement.Type.VOLTAGE, 0)) .measurementAngle(toMeasurement(busbarSection, Measurement.Type.ANGLE, 0)) .voltageLevelProperties(getProperties(terminal.getVoltageLevel())) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/BusInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/BusInfosMapper.java index a37a351a..d08b981a 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/BusInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/BusInfosMapper.java @@ -8,6 +8,7 @@ import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.Identifiable; +import com.powsybl.iidm.network.Substation; import org.gridsuite.network.map.dto.ElementInfos; import org.gridsuite.network.map.dto.InfoTypeParameters; import org.gridsuite.network.map.dto.definition.bus.BusTabInfos; @@ -43,6 +44,7 @@ public static BusTabInfos toTabInfos(Identifiable identifiable) { .voltageLevelId(bus.getVoltageLevel().getId()) .nominalVoltage(bus.getVoltageLevel().getNominalV()) .country(mapCountry(bus.getVoltageLevel().getSubstation().orElse(null))) + .substationId(bus.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .synchronousComponentNum(bus.getSynchronousComponent().getNum()) .properties(getProperties(bus)) .connectedComponentNum(bus.getConnectedComponent().getNum()) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/DanglingLineInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/DanglingLineInfosMapper.java index aff5169c..c14d6e5a 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/DanglingLineInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/DanglingLineInfosMapper.java @@ -8,6 +8,7 @@ import com.powsybl.iidm.network.DanglingLine; import com.powsybl.iidm.network.Identifiable; +import com.powsybl.iidm.network.Substation; import com.powsybl.iidm.network.Terminal; import com.powsybl.iidm.network.extensions.Measurement; import org.gridsuite.network.map.dto.ElementInfos; @@ -45,6 +46,7 @@ private static DanglingLineTabInfos toTabInfos(Identifiable identifiable) { .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalV(terminal.getVoltageLevel().getNominalV()) .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .pairingKey(danglingLine.getPairingKey()) .p0(danglingLine.getP0()) .properties(getProperties(danglingLine)) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/HvdcInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/HvdcInfosMapper.java index 4d580238..bc0880a4 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/HvdcInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/HvdcInfosMapper.java @@ -86,6 +86,8 @@ protected static HvdcTabInfos toHvdcTabInfos(Identifiable identifiable) { .voltageLevelId2(terminal2.getVoltageLevel().getId()) .country1(mapCountry(terminal1.getVoltageLevel().getSubstation().orElse(null))) .country2(mapCountry(terminal2.getVoltageLevel().getSubstation().orElse(null))) + .substationId1(terminal1.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) + .substationId2(terminal2.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .i1(nullIfNan(terminal1.getI())) .i2(nullIfNan(terminal2.getI())); diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/LccConverterStationInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/LccConverterStationInfosMapper.java index 1d6b406d..49471a76 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/LccConverterStationInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/LccConverterStationInfosMapper.java @@ -8,6 +8,7 @@ import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.LccConverterStation; +import com.powsybl.iidm.network.Substation; import com.powsybl.iidm.network.Terminal; import com.powsybl.iidm.network.extensions.Measurement; import org.gridsuite.network.map.dto.ElementInfos; @@ -50,6 +51,7 @@ private static LccConverterStationTabInfos toTabInfos(Identifiable identifiab .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalV(terminal.getVoltageLevel().getNominalV()) .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .terminalConnected(terminal.isConnected()) .lossFactor(lccConverterStation.getLossFactor()) .properties(getProperties(lccConverterStation)) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java index 23cb2414..3a7fcdf0 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java @@ -149,6 +149,8 @@ private static LineTabInfos toTabInfos(Identifiable identifiable, Double dcPo .nominalVoltage2(terminal2.getVoltageLevel().getNominalV()) .country1(mapCountry(terminal1.getVoltageLevel().getSubstation().orElse(null))) .country2(mapCountry(terminal2.getVoltageLevel().getSubstation().orElse(null))) + .substationId1(terminal1.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) + .substationId2(terminal2.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .p1(nullIfNan(terminal1.getP())) .q1(nullIfNan(terminal1.getQ())) .i1(nullIfNan(ElementUtils.computeIntensity(terminal1, dcPowerFactor))) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/LoadInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/LoadInfosMapper.java index f989bcb7..a84e9402 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/LoadInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/LoadInfosMapper.java @@ -8,6 +8,7 @@ import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.Load; +import com.powsybl.iidm.network.Substation; import com.powsybl.iidm.network.Terminal; import com.powsybl.iidm.network.extensions.Measurement; import org.gridsuite.network.map.dto.ElementInfos; @@ -79,6 +80,7 @@ private static LoadTabInfos toTabInfos(Identifiable identifiable) { .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .p0(load.getP0()) .properties(getProperties(load)) .q0(load.getQ0()); diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/ShuntCompensatorMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/ShuntCompensatorMapper.java index 04bb8f61..4500e00d 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/ShuntCompensatorMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/ShuntCompensatorMapper.java @@ -92,7 +92,8 @@ private static ShuntCompensatorTabInfos toTabInfos(Identifiable identifiable) .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalVoltage(terminal.getVoltageLevel().getNominalV()) .properties(getProperties(shuntCompensator)) - .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))); + .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)); Double bPerSection = null; if (shuntCompensator.getModel() instanceof ShuntCompensatorLinearModel) { diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/StaticVarCompensatorInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/StaticVarCompensatorInfosMapper.java index e6d43a9c..515bad3d 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/StaticVarCompensatorInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/StaticVarCompensatorInfosMapper.java @@ -8,6 +8,7 @@ import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.StaticVarCompensator; +import com.powsybl.iidm.network.Substation; import com.powsybl.iidm.network.Terminal; import com.powsybl.iidm.network.extensions.Measurement; import org.gridsuite.network.map.dto.ElementInfos; @@ -76,6 +77,7 @@ private static StaticVarCompensatorTabInfos toTabInfos(Identifiable identifia .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalV(terminal.getVoltageLevel().getNominalV()) .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .properties(getProperties(staticVarCompensator)) .regulationMode(staticVarCompensator.getRegulationMode()); diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/ThreeWindingsTransformerInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/ThreeWindingsTransformerInfosMapper.java index 1afa7437..98359ee8 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/ThreeWindingsTransformerInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/ThreeWindingsTransformerInfosMapper.java @@ -19,6 +19,7 @@ import org.gridsuite.network.map.dto.utils.ElementUtils; import java.util.List; +import java.util.Optional; import static org.gridsuite.network.map.dto.utils.ElementUtils.*; @@ -79,7 +80,8 @@ private static ThreeWindingsTransformerTabInfos toTabInfos(Identifiable ident .nominalV1(terminal1.getVoltageLevel().getNominalV()) .nominalV2(terminal2.getVoltageLevel().getNominalV()) .nominalV3(terminal3.getVoltageLevel().getNominalV()) - .country(mapCountry(firstSubstationFound)); + .country(mapCountry(firstSubstationFound)) + .substationId(Optional.ofNullable(firstSubstationFound).map(Substation::getId).orElse(null)); if (!Double.isNaN(terminal1.getP())) { builder.p1(terminal1.getP()); diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/TieLineInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/TieLineInfosMapper.java index 572fa1a7..5fb891bd 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/TieLineInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/TieLineInfosMapper.java @@ -7,6 +7,7 @@ package org.gridsuite.network.map.dto.mapper; import com.powsybl.iidm.network.Identifiable; +import com.powsybl.iidm.network.Substation; import com.powsybl.iidm.network.Terminal; import com.powsybl.iidm.network.TieLine; import org.gridsuite.network.map.dto.ElementInfos; @@ -79,6 +80,8 @@ private static TieLineTabInfos toTabInfos(Identifiable identifiable, Double d .nominalVoltage2(terminal2.getVoltageLevel().getNominalV()) .country1(mapCountry(terminal1.getVoltageLevel().getSubstation().orElse(null))) .country2(mapCountry(terminal2.getVoltageLevel().getSubstation().orElse(null))) + .substationId1(terminal1.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) + .substationId2(terminal2.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .p1(nullIfNan(terminal1.getP())) .q1(nullIfNan(terminal1.getQ())) .p2(nullIfNan(terminal2.getP())) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java index eeb81eab..b17226a7 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/TwoWindingsTransformerInfosMapper.java @@ -116,6 +116,7 @@ private static TwoWindingsTransformerTabInfos toTabInfos(Identifiable identif .voltageLevelName2(terminal2.getVoltageLevel().getOptionalName().orElse(null)) .nominalVoltage2(terminal2.getVoltageLevel().getNominalV()) .country(mapCountry(firstSubstationFound)) + .substationId(Optional.ofNullable(firstSubstationFound).map(Substation::getId).orElse(null)) .phaseTapChanger(toMapData(twoWT.getPhaseTapChanger())) .ratioTapChanger(toMapData(twoWT.getRatioTapChanger())) .r(twoWT.getR()) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/VscConverterStationInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/VscConverterStationInfosMapper.java index 783be956..0160a9ea 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/VscConverterStationInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/VscConverterStationInfosMapper.java @@ -48,6 +48,7 @@ private static VscConverterStationTabInfos toTabInfos(Identifiable identifiab .voltageLevelId(terminal.getVoltageLevel().getId()) .nominalV(terminal.getVoltageLevel().getNominalV()) .country(mapCountry(terminal.getVoltageLevel().getSubstation().orElse(null))) + .substationId(terminal.getVoltageLevel().getSubstation().map(Substation::getId).orElse(null)) .terminalConnected(terminal.isConnected()) .lossFactor(vscConverterStation.getLossFactor()) .properties(getProperties(vscConverterStation)) diff --git a/src/test/resources/2-windings-transformers-tab-data.json b/src/test/resources/2-windings-transformers-tab-data.json index 890d4ba0..c0b9a59f 100644 --- a/src/test/resources/2-windings-transformers-tab-data.json +++ b/src/test/resources/2-windings-transformers-tab-data.json @@ -8,6 +8,7 @@ "voltageLevelName2": null, "nominalVoltage2": 380.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "p1": 11.1, @@ -118,6 +119,7 @@ "voltageLevelId2": "VLLOAD", "voltageLevelName2": null, "nominalVoltage2": 150.0, + "substationId": "P2", "terminal1Connected": true, "terminal2Connected": true, "p1": 5.5, @@ -189,6 +191,7 @@ "voltageLevelName2": null, "nominalVoltage2": 380.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "operationalLimitsGroup1": { diff --git a/src/test/resources/3-windings-transformers-tab-data.json b/src/test/resources/3-windings-transformers-tab-data.json index fc5be84b..b6e08fd8 100644 --- a/src/test/resources/3-windings-transformers-tab-data.json +++ b/src/test/resources/3-windings-transformers-tab-data.json @@ -9,6 +9,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -171,6 +172,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -333,6 +335,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, diff --git a/src/test/resources/all-data-in-variant.json b/src/test/resources/all-data-in-variant.json index e7c40164..d6dbff9b 100644 --- a/src/test/resources/all-data-in-variant.json +++ b/src/test/resources/all-data-in-variant.json @@ -9,12 +9,12 @@ "voltageLevels": [ { "id": "VLNEW2", - "substationId": "P1", - "nominalV": 225.0, - "country": "FR", "properties": { "Country": "FR" }, + "substationId": "P1", + "nominalV": 225.0, + "country": "FR", "substationProperties": { "Country": "FR" } @@ -172,12 +172,12 @@ }, { "id": "VLNEW2", - "substationId": "P1", - "nominalV": 225.0, - "country": "FR", "properties": { "Country": "FR" }, + "substationId": "P1", + "nominalV": 225.0, + "country": "FR", "substationProperties": { "Country": "FR" } @@ -229,6 +229,8 @@ "voltageLevelId2": "VLHV2", "nominalVoltage2": 380.0, "country1": "FR", + "substationId1": "P1", + "substationId2": "P2", "terminal1Connected": true, "terminal2Connected": true, "p1": 1.1, @@ -289,6 +291,8 @@ "voltageLevelId2": "VLHV2", "nominalVoltage2": 380.0, "country1": "FR", + "substationId1": "P1", + "substationId2": "P2", "terminal1Connected": true, "terminal2Connected": true, "operationalLimitsGroup1": { @@ -369,6 +373,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 200.0, @@ -413,10 +419,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } }, @@ -428,6 +434,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P6", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "r": 3.0, @@ -453,6 +461,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -479,6 +489,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -505,6 +517,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -531,6 +545,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "hvdcAngleDroopActivePowerControl": { @@ -566,6 +582,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -587,6 +605,7 @@ }, "type": "UNDEFINED", "voltageLevelId": "VLLOAD", + "substationId": "P2", "nominalVoltage": 150.0, "terminalConnected": true, "p0": 600.0, @@ -602,6 +621,7 @@ "type": "UNDEFINED", "voltageLevelId": "VLNEW2", "country": "FR", + "substationId": "P1", "nominalVoltage": 225.0, "terminalConnected": true, "p0": 600.0, @@ -645,6 +665,7 @@ "type": "UNDEFINED", "voltageLevelId": "VLNEW2", "country": "FR", + "substationId": "P1", "nominalVoltage": 225.0, "terminalConnected": true, "p0": 600.0, @@ -678,6 +699,7 @@ "voltageLevelName2": null, "nominalVoltage2": 380.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "p1": 11.1, @@ -696,7 +718,9 @@ ] } }, - "operationalLimitsGroup1Names": ["limit set 1"], + "operationalLimitsGroup1Names": [ + "limit set 1" + ], "selectedOperationalLimitsGroup1": "limit set 1", "operationalLimitsGroup2": { "limit set 1": { @@ -709,13 +733,15 @@ }, { "name": "N/A", - "value": 2.147483647e9, + "value": 2.147483647E9, "acceptableDuration": 664 } ] } }, - "operationalLimitsGroup2Names": ["limit set 1"], + "operationalLimitsGroup2Names": [ + "limit set 1" + ], "selectedOperationalLimitsGroup2": "limit set 1", "phaseTapChanger": { "lowTapPosition": 0, @@ -769,10 +795,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } }, @@ -784,6 +810,7 @@ "voltageLevelId2": "VLLOAD", "voltageLevelName2": null, "nominalVoltage2": 150.0, + "substationId": "P2", "terminal1Connected": true, "terminal2Connected": true, "p1": 5.5, @@ -855,6 +882,7 @@ "voltageLevelName2": null, "nominalVoltage2": 380.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "operationalLimitsGroup1": { @@ -869,7 +897,9 @@ ] } }, - "operationalLimitsGroup1Names": ["DEFAULT"], + "operationalLimitsGroup1Names": [ + "DEFAULT" + ], "selectedOperationalLimitsGroup1": "DEFAULT", "operationalLimitsGroup2": { "DEFAULT": { @@ -883,7 +913,9 @@ ] } }, - "operationalLimitsGroup2Names": ["DEFAULT"], + "operationalLimitsGroup2Names": [ + "DEFAULT" + ], "selectedOperationalLimitsGroup2": "DEFAULT", "g": 27.0, "b": 17.0, @@ -947,10 +979,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -966,6 +998,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -1108,10 +1141,10 @@ "substationProperties2": { "Country": "FR" }, - "substationProperties3": { + "voltageLevelProperties2": { "Country": "FR" }, - "voltageLevelProperties2": { + "substationProperties3": { "Country": "FR" }, "voltageLevelProperties3": { @@ -1128,6 +1161,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -1270,10 +1304,10 @@ "substationProperties2": { "Country": "FR" }, - "substationProperties3": { + "voltageLevelProperties2": { "Country": "FR" }, - "voltageLevelProperties2": { + "substationProperties3": { "Country": "FR" }, "voltageLevelProperties3": { @@ -1290,6 +1324,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -1432,10 +1467,10 @@ "substationProperties2": { "Country": "FR" }, - "substationProperties3": { + "voltageLevelProperties2": { "Country": "FR" }, - "voltageLevelProperties2": { + "substationProperties3": { "Country": "FR" }, "voltageLevelProperties3": { @@ -1611,6 +1646,7 @@ "terminalConnected": false, "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "measurementP": { "value": 12.0, "validity": false @@ -1678,6 +1714,7 @@ "terminalConnected": false, "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "measurementP": { "value": 34.0, "validity": true @@ -1698,6 +1735,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -1740,6 +1778,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -1761,6 +1800,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 45.0, @@ -1776,10 +1817,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -1793,6 +1834,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC1", "substationProperties": { @@ -1810,6 +1852,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 110.0, @@ -1852,6 +1895,7 @@ "voltageLevelId": "VLNEW2", "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "q": 90.0, "sectionCount": 4, @@ -1896,6 +1940,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -1917,6 +1962,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": false, "sectionCount": 2, "maxSusceptance": 3.0, @@ -1937,6 +1983,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": false, "sectionCount": 2, "maximumSectionCount": 2, @@ -1951,6 +1998,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "q": 90.0, "sectionCount": 2, @@ -1975,6 +2023,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "regulationMode": "VOLTAGE", "p": 120.0, @@ -2013,6 +2062,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "regulationMode": "VOLTAGE", "voltageSetpoint": 200.0, @@ -2036,6 +2086,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC5", "p": 10.0, @@ -2056,6 +2107,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC3", "p": 10.0, @@ -2076,6 +2128,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC3", "p": 10.0, @@ -2119,6 +2172,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC4", "p": 10.0, @@ -2147,6 +2201,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC4", "p": 10.0, @@ -2168,6 +2223,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "hvdcLineId": "HVDC5", "substationProperties": { @@ -2185,6 +2241,7 @@ "voltageLevelId": "VLGEN", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P1", "substationProperties": { "Country": "FR" }, @@ -2201,6 +2258,7 @@ "voltageLevelId": "VLHV1", "nominalVoltage": 380.0, "country": "FR", + "substationId": "P1", "substationProperties": { "Country": "FR" } @@ -2212,7 +2270,8 @@ "synchronousComponentNum": 0, "connectedComponentNum": 0, "voltageLevelId": "VLHV2", - "nominalVoltage": 380.0 + "nominalVoltage": 380.0, + "substationId": "P2" }, { "id": "VLLOAD_0", @@ -2221,7 +2280,8 @@ "synchronousComponentNum": 0, "connectedComponentNum": 0, "voltageLevelId": "VLLOAD", - "nominalVoltage": 150.0 + "nominalVoltage": 150.0, + "substationId": "P2" }, { "id": "VLNEW2_0", @@ -2232,6 +2292,7 @@ "voltageLevelId": "VLNEW2", "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "substationProperties": { "Country": "FR" }, @@ -2248,6 +2309,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "substationProperties": { "Country": "FR" } @@ -2260,7 +2322,8 @@ "connectedComponentNum": 0, "voltageLevelId": "VLGEN6", "nominalVoltage": 24.0, - "country": "FR" + "country": "FR", + "substationId": "P6" } ], "busbarSections": [ @@ -2275,12 +2338,14 @@ "measurementAngle": { "value": 0.5, "validity": false - } + }, + "substationId": "P4" }, { "id": "NGEN5", "name": "NGEN5", - "voltageLevelId": "VLGEN5" + "voltageLevelId": "VLGEN5", + "substationId": "P5" } ] } \ No newline at end of file diff --git a/src/test/resources/all-data.json b/src/test/resources/all-data.json index 2daaf690..59752898 100644 --- a/src/test/resources/all-data.json +++ b/src/test/resources/all-data.json @@ -37,12 +37,12 @@ }, { "id": "VLNEW2", - "substationId": "P1", - "nominalV": 225.0, - "country": "FR", "properties": { "Country": "FR" }, + "substationId": "P1", + "nominalV": 225.0, + "country": "FR", "substationProperties": { "Country": "FR" } @@ -172,12 +172,12 @@ }, { "id": "VLNEW2", - "substationId": "P1", - "nominalV": 225.0, - "country": "FR", "properties": { "Country": "FR" }, + "substationId": "P1", + "nominalV": 225.0, + "country": "FR", "substationProperties": { "Country": "FR" } @@ -229,6 +229,8 @@ "voltageLevelId2": "VLHV2", "nominalVoltage2": 380.0, "country1": "FR", + "substationId1": "P1", + "substationId2": "P2", "terminal1Connected": true, "terminal2Connected": true, "p1": 1.1, @@ -247,7 +249,9 @@ ] } }, - "operationalLimitsGroup1Names": ["limit set 1"], + "operationalLimitsGroup1Names": [ + "limit set 1" + ], "selectedOperationalLimitsGroup1": "limit set 1", "operationalLimitsGroup2": { "limit set 1": { @@ -266,7 +270,9 @@ ] } }, - "operationalLimitsGroup2Names": ["limit set 1"], + "operationalLimitsGroup2Names": [ + "limit set 1" + ], "selectedOperationalLimitsGroup2": "limit set 1", "r": 9.0, "x": 10.0, @@ -285,6 +291,8 @@ "voltageLevelId2": "VLHV2", "nominalVoltage2": 380.0, "country1": "FR", + "substationId1": "P1", + "substationId2": "P2", "terminal1Connected": true, "terminal2Connected": true, "operationalLimitsGroup1": { @@ -314,7 +322,10 @@ ] } }, - "operationalLimitsGroup1Names": ["group2", "group1"], + "operationalLimitsGroup1Names": [ + "group2", + "group1" + ], "selectedOperationalLimitsGroup1": "group1", "operationalLimitsGroup2": { "group4": { @@ -338,14 +349,17 @@ ] } }, - "operationalLimitsGroup2Names": ["group4", "group3"], + "operationalLimitsGroup2Names": [ + "group4", + "group3" + ], "selectedOperationalLimitsGroup2": "group4", "r": 3.0, "x": 33.0, "g1": 0.0, - "b1": 1.93e-4, + "b1": 1.93E-4, "g2": 0.0, - "b2": 1.93e-4, + "b2": 1.93E-4, "substationProperties1": { "Country": "FR" } @@ -359,6 +373,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 200.0, @@ -366,9 +382,9 @@ "r": 3.0, "x": 33.0, "g1": 0.0, - "b1": 1.93e-4, + "b1": 1.93E-4, "g2": 0.0, - "b2": 1.93e-4, + "b2": 1.93E-4, "measurementP1": { "value": 11.0, "validity": true @@ -403,10 +419,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } }, @@ -418,14 +434,16 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P6", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "r": 3.0, "x": 33.0, "g1": 0.0, - "b1": 1.93e-4, + "b1": 1.93E-4, "g2": 0.0, - "b2": 1.93e-4, + "b2": 1.93E-4, "substationProperties2": { "Country": "FR" } @@ -443,6 +461,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -469,6 +489,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -495,6 +517,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -521,6 +545,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", "activePowerSetpoint": 500.0, "maxP": 100.0, "hvdcAngleDroopActivePowerControl": { @@ -556,6 +582,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -577,6 +605,7 @@ }, "type": "UNDEFINED", "voltageLevelId": "VLLOAD", + "substationId": "P2", "nominalVoltage": 150.0, "terminalConnected": true, "p0": 600.0, @@ -592,6 +621,7 @@ "type": "UNDEFINED", "voltageLevelId": "VLNEW2", "country": "FR", + "substationId": "P1", "nominalVoltage": 225.0, "terminalConnected": true, "p0": 600.0, @@ -635,6 +665,7 @@ "type": "UNDEFINED", "voltageLevelId": "VLNEW2", "country": "FR", + "substationId": "P1", "nominalVoltage": 225.0, "terminalConnected": true, "p0": 600.0, @@ -668,6 +699,7 @@ "voltageLevelName2": null, "nominalVoltage2": 380.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "p1": 11.1, @@ -763,10 +795,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } }, @@ -778,6 +810,7 @@ "voltageLevelId2": "VLLOAD", "voltageLevelName2": null, "nominalVoltage2": 150.0, + "substationId": "P2", "terminal1Connected": true, "terminal2Connected": true, "p1": 5.5, @@ -849,6 +882,7 @@ "voltageLevelName2": null, "nominalVoltage2": 380.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "operationalLimitsGroup1": { @@ -863,7 +897,9 @@ ] } }, - "operationalLimitsGroup1Names": ["DEFAULT"], + "operationalLimitsGroup1Names": [ + "DEFAULT" + ], "selectedOperationalLimitsGroup1": "DEFAULT", "operationalLimitsGroup2": { "DEFAULT": { @@ -877,7 +913,9 @@ ] } }, - "operationalLimitsGroup2Names": ["DEFAULT"], + "operationalLimitsGroup2Names": [ + "DEFAULT" + ], "selectedOperationalLimitsGroup2": "DEFAULT", "g": 27.0, "b": 17.0, @@ -941,10 +979,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -960,6 +998,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -1102,10 +1141,10 @@ "substationProperties2": { "Country": "FR" }, - "substationProperties3": { + "voltageLevelProperties2": { "Country": "FR" }, - "voltageLevelProperties2": { + "substationProperties3": { "Country": "FR" }, "voltageLevelProperties3": { @@ -1122,6 +1161,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -1264,10 +1304,10 @@ "substationProperties2": { "Country": "FR" }, - "substationProperties3": { + "voltageLevelProperties2": { "Country": "FR" }, - "voltageLevelProperties2": { + "substationProperties3": { "Country": "FR" }, "voltageLevelProperties3": { @@ -1284,6 +1324,7 @@ "voltageLevelId3": "VLGEN", "nominalV3": 24.0, "country": "FR", + "substationId": "P1", "terminal1Connected": true, "terminal2Connected": true, "terminal3Connected": true, @@ -1426,10 +1467,10 @@ "substationProperties2": { "Country": "FR" }, - "substationProperties3": { + "voltageLevelProperties2": { "Country": "FR" }, - "voltageLevelProperties2": { + "substationProperties3": { "Country": "FR" }, "voltageLevelProperties3": { @@ -1605,6 +1646,7 @@ "terminalConnected": false, "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "measurementP": { "value": 12.0, "validity": false @@ -1672,6 +1714,7 @@ "terminalConnected": false, "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "measurementP": { "value": 34.0, "validity": true @@ -1692,6 +1735,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -1734,6 +1778,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -1755,6 +1800,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 45.0, @@ -1770,10 +1817,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -1787,6 +1834,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC1", "substationProperties": { @@ -1804,6 +1852,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 110.0, @@ -1846,6 +1895,7 @@ "voltageLevelId": "VLNEW2", "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "q": 90.0, "sectionCount": 4, @@ -1890,6 +1940,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -1911,6 +1962,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -1931,6 +1983,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": false, "sectionCount": 2, "maximumSectionCount": 2, @@ -1947,6 +2000,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "regulationMode": "VOLTAGE", "p": 120.0, @@ -1985,6 +2039,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "regulationMode": "VOLTAGE", "voltageSetpoint": 200.0, @@ -2008,6 +2063,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC5", "p": 10.0, @@ -2028,6 +2084,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC3", "p": 10.0, @@ -2048,6 +2105,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC3", "p": 10.0, @@ -2091,6 +2149,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC4", "p": 10.0, @@ -2119,6 +2178,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC4", "p": 10.0, @@ -2140,6 +2200,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "hvdcLineId": "HVDC5", "substationProperties": { @@ -2157,6 +2218,7 @@ "voltageLevelId": "VLGEN", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P1", "substationProperties": { "Country": "FR" }, @@ -2173,6 +2235,7 @@ "voltageLevelId": "VLHV1", "nominalVoltage": 380.0, "country": "FR", + "substationId": "P1", "substationProperties": { "Country": "FR" } @@ -2184,7 +2247,8 @@ "synchronousComponentNum": 0, "connectedComponentNum": 0, "voltageLevelId": "VLHV2", - "nominalVoltage": 380.0 + "nominalVoltage": 380.0, + "substationId": "P2" }, { "id": "VLLOAD_0", @@ -2193,7 +2257,8 @@ "synchronousComponentNum": 0, "connectedComponentNum": 0, "voltageLevelId": "VLLOAD", - "nominalVoltage": 150.0 + "nominalVoltage": 150.0, + "substationId": "P2" }, { "id": "VLNEW2_0", @@ -2204,6 +2269,7 @@ "voltageLevelId": "VLNEW2", "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "substationProperties": { "Country": "FR" }, @@ -2220,6 +2286,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "substationProperties": { "Country": "FR" } @@ -2232,7 +2299,8 @@ "connectedComponentNum": 0, "voltageLevelId": "VLGEN6", "nominalVoltage": 24.0, - "country": "FR" + "country": "FR", + "substationId": "P6" }, { "id": "VLGEN4_0", @@ -2242,7 +2310,8 @@ "connectedComponentNum": 1, "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, - "country": "FR" + "country": "FR", + "substationId": "P4" } ], "busbarSections": [ @@ -2257,12 +2326,14 @@ "measurementAngle": { "value": 0.5, "validity": false - } + }, + "substationId": "P4" }, { "id": "NGEN5", "name": "NGEN5", - "voltageLevelId": "VLGEN5" + "voltageLevelId": "VLGEN5", + "substationId": "P5" } ] } \ No newline at end of file diff --git a/src/test/resources/batteries-tab-data.json b/src/test/resources/batteries-tab-data.json index b3cbb6f9..7d2dc6ef 100644 --- a/src/test/resources/batteries-tab-data.json +++ b/src/test/resources/batteries-tab-data.json @@ -19,6 +19,7 @@ "terminalConnected": false, "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "measurementP": { "value": 12.0, "validity": false @@ -86,6 +87,7 @@ "terminalConnected": false, "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "measurementP": { "value": 34.0, "validity": true diff --git a/src/test/resources/buses-tab-data.json b/src/test/resources/buses-tab-data.json index 0c8a799d..58ad84b3 100644 --- a/src/test/resources/buses-tab-data.json +++ b/src/test/resources/buses-tab-data.json @@ -7,6 +7,7 @@ "connectedComponentNum": 0, "voltageLevelId": "n9828181c-7977-4592-ba19-008976e4254e_voltageLevel1", "nominalVoltage": 400.0, - "country": "FR" + "country": "FR", + "substationId": "n9828181c-7977-4592-ba19-008976e4254e_substation1" } ] \ No newline at end of file diff --git a/src/test/resources/dangling-lines-tab-data.json b/src/test/resources/dangling-lines-tab-data.json index 22863bb2..2c22a8b7 100644 --- a/src/test/resources/dangling-lines-tab-data.json +++ b/src/test/resources/dangling-lines-tab-data.json @@ -5,6 +5,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -48,10 +49,11 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", - "p": 45, - "q": 75, + "p": 45.0, + "q": 75.0, "p0": 50.0, "q0": 30.0, "substationProperties": { diff --git a/src/test/resources/dangling-lines-variant-tab-data.json b/src/test/resources/dangling-lines-variant-tab-data.json index 470dee60..4a1f2098 100644 --- a/src/test/resources/dangling-lines-variant-tab-data.json +++ b/src/test/resources/dangling-lines-variant-tab-data.json @@ -5,6 +5,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -47,10 +48,11 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", - "p": 45, - "q": 75, + "p": 45.0, + "q": 75.0, "p0": 50.0, "q0": 30.0, "substationProperties": { diff --git a/src/test/resources/hvdc-lines-tab-data.json b/src/test/resources/hvdc-lines-tab-data.json index 7b8b603c..a428b7ed 100644 --- a/src/test/resources/hvdc-lines-tab-data.json +++ b/src/test/resources/hvdc-lines-tab-data.json @@ -1,123 +1,131 @@ [ { - "id": "HVDC1", - "name": "HVDC1", - "voltageLevelId1": "VLGEN", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "LCC1", - "converterStationId2": "LCC2", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "i2": 7033.787423824256, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } - }, - { - "id": "HVDC2", - "name": "HVDC2", - "voltageLevelId1": "VLGEN", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "LCC1", - "converterStationId2": "LCC2", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "i2": 7033.787423824256, - "hvdcAngleDroopActivePowerControl": { - "droop": 180.0, - "isEnabled": true, - "p0": 190.0 - }, - "hvdcOperatorActivePowerRange": { - "oprFromCS1toCS2": 1000, - "oprFromCS2toCS1": 900 - }, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } - }, - { - "id": "HVDC3", - "name": "HVDC3", - "voltageLevelId1": "VLNEW2", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "VSC3", - "converterStationId2": "VSC4", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "i1": 676.2006882779829, - "i2": 676.2006882779829, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } - }, - { - "id": "HVDC4", - "name": "HVDC4", - "voltageLevelId1": "VLNEW2", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "VSC5", - "converterStationId2": "VSC6", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "i1": 676.2006882779829, - "i2": 676.2006882779829, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } + "id": "HVDC1", + "name": "HVDC1", + "voltageLevelId1": "VLGEN", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "LCC1", + "converterStationId2": "LCC2", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "i2": 7033.787423824256, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, + { + "id": "HVDC3", + "name": "HVDC3", + "voltageLevelId1": "VLNEW2", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "VSC3", + "converterStationId2": "VSC4", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "i1": 676.2006882779829, + "i2": 676.2006882779829, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, + { + "id": "HVDC4", + "name": "HVDC4", + "voltageLevelId1": "VLNEW2", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "VSC5", + "converterStationId2": "VSC6", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "i1": 676.2006882779829, + "i2": 676.2006882779829, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, + { + "id": "HVDC2", + "name": "HVDC2", + "voltageLevelId1": "VLGEN", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "LCC1", + "converterStationId2": "LCC2", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "i2": 7033.787423824256, + "hvdcAngleDroopActivePowerControl": { + "droop": 180.0, + "isEnabled": true, + "p0": 190.0 + }, + "hvdcOperatorActivePowerRange": { + "oprFromCS1toCS2": 1000.0, + "oprFromCS2toCS1": 900.0 }, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, { "id": "HVDC5", "name": "HVDC5", @@ -129,6 +137,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "i1": 676.2006882779829, @@ -142,4 +152,4 @@ "Country": "FR" } } -] +] \ No newline at end of file diff --git a/src/test/resources/hvdc-lines-variant-tab-data.json b/src/test/resources/hvdc-lines-variant-tab-data.json index 28deaaa1..6f19c0fc 100644 --- a/src/test/resources/hvdc-lines-variant-tab-data.json +++ b/src/test/resources/hvdc-lines-variant-tab-data.json @@ -1,117 +1,125 @@ [ { - "id": "HVDC1", - "name": "HVDC1", - "voltageLevelId1": "VLGEN", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "LCC1", - "converterStationId2": "LCC2", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } - }, - { - "id": "HVDC2", - "name": "HVDC2", - "voltageLevelId1": "VLGEN", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "LCC1", - "converterStationId2": "LCC2", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "hvdcAngleDroopActivePowerControl": { - "droop": 180.0, - "isEnabled": true, - "p0": 190.0 - }, - "hvdcOperatorActivePowerRange": { - "oprFromCS1toCS2": 1000, - "oprFromCS2toCS1": 900 - }, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } - }, - { - "id": "HVDC3", - "name": "HVDC3", - "voltageLevelId1": "VLNEW2", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "VSC3", - "converterStationId2": "VSC4", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } - }, - { - "id": "HVDC4", - "name": "HVDC4", - "voltageLevelId1": "VLNEW2", - "voltageLevelId2": "VLNEW2", - "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", - "converterStationId1": "VSC5", - "converterStationId2": "VSC6", - "activePowerSetpoint": 500.0, - "r": 1, - "country1": "FR", - "country2": "FR", - "maxP": 100, - "substationProperties1": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties2": { - "Country": "FR" - } + "id": "HVDC1", + "name": "HVDC1", + "voltageLevelId1": "VLGEN", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "LCC1", + "converterStationId2": "LCC2", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, + { + "id": "HVDC3", + "name": "HVDC3", + "voltageLevelId1": "VLNEW2", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "VSC3", + "converterStationId2": "VSC4", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, + { + "id": "HVDC4", + "name": "HVDC4", + "voltageLevelId1": "VLNEW2", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "VSC5", + "converterStationId2": "VSC6", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "substationProperties1": { + "Country": "FR" }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, + { + "id": "HVDC2", + "name": "HVDC2", + "voltageLevelId1": "VLGEN", + "voltageLevelId2": "VLNEW2", + "convertersMode": "SIDE_1_INVERTER_SIDE_2_RECTIFIER", + "converterStationId1": "LCC1", + "converterStationId2": "LCC2", + "r": 1.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P1", + "activePowerSetpoint": 500.0, + "maxP": 100.0, + "hvdcAngleDroopActivePowerControl": { + "droop": 180.0, + "isEnabled": true, + "p0": 190.0 + }, + "hvdcOperatorActivePowerRange": { + "oprFromCS1toCS2": 1000.0, + "oprFromCS2toCS1": 900.0 + }, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + }, + "voltageLevelProperties2": { + "Country": "FR" + } + }, { "id": "HVDC5", "name": "HVDC5", @@ -123,6 +131,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -135,4 +145,4 @@ "Country": "FR" } } -] +] \ No newline at end of file diff --git a/src/test/resources/lcc-converter-stations-tab-data.json b/src/test/resources/lcc-converter-stations-tab-data.json index bdaad71a..93c509d7 100644 --- a/src/test/resources/lcc-converter-stations-tab-data.json +++ b/src/test/resources/lcc-converter-stations-tab-data.json @@ -7,6 +7,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC1", "substationProperties": { @@ -24,6 +25,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC1", "p": 110.0, diff --git a/src/test/resources/partial-all-data-in-variant.json b/src/test/resources/partial-all-data-in-variant.json index cfe8b848..ea197325 100644 --- a/src/test/resources/partial-all-data-in-variant.json +++ b/src/test/resources/partial-all-data-in-variant.json @@ -39,6 +39,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P6", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "r": 3.0, @@ -60,6 +62,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 200.0, @@ -104,10 +108,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -124,6 +128,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -179,6 +185,7 @@ "terminalConnected": false, "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "measurementP": { "value": 34.0, "validity": true @@ -199,6 +206,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -220,6 +228,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 45.0, @@ -235,10 +245,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -251,6 +261,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -272,6 +283,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "q": 90.0, "sectionCount": 2, @@ -301,6 +313,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "hvdcLineId": "HVDC5", "substationProperties": { @@ -318,6 +331,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "substationProperties": { "Country": "FR" } diff --git a/src/test/resources/partial-all-data.json b/src/test/resources/partial-all-data.json index c999a227..1e0a1d2a 100644 --- a/src/test/resources/partial-all-data.json +++ b/src/test/resources/partial-all-data.json @@ -40,6 +40,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 200.0, @@ -84,10 +86,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } }, @@ -99,6 +101,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P6", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "r": 3.0, @@ -124,6 +128,8 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { @@ -179,6 +185,7 @@ "terminalConnected": false, "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "measurementP": { "value": 34.0, "validity": true @@ -199,6 +206,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -220,6 +228,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 45.0, @@ -235,10 +245,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -251,6 +261,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -279,6 +290,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "hvdcLineId": "HVDC5", "substationProperties": { @@ -296,6 +308,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "substationProperties": { "Country": "FR" } diff --git a/src/test/resources/partial-all-map-data-no-redundant-lines.json b/src/test/resources/partial-all-map-data-no-redundant-lines.json index 2926d4a4..9599d16f 100644 --- a/src/test/resources/partial-all-map-data-no-redundant-lines.json +++ b/src/test/resources/partial-all-map-data-no-redundant-lines.json @@ -57,6 +57,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P6", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "r": 3.0, @@ -78,6 +80,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 200.0, @@ -122,10 +126,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -142,15 +146,17 @@ "r": 1.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "activePowerSetpoint": 500.0, "maxP": 100.0, "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -197,6 +203,7 @@ "terminalConnected": false, "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "measurementP": { "value": 34.0, "validity": true @@ -217,6 +224,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "pairingKey": "xnode1", "p": 45.0, @@ -238,6 +246,8 @@ "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, "p1": 45.0, @@ -253,10 +263,10 @@ "substationProperties1": { "Country": "FR" }, - "substationProperties2": { + "voltageLevelProperties1": { "Country": "FR" }, - "voltageLevelProperties1": { + "substationProperties2": { "Country": "FR" } } @@ -269,6 +279,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -290,6 +301,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "q": 90.0, "sectionCount": 2, @@ -319,6 +331,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "hvdcLineId": "HVDC5", "substationProperties": { @@ -336,6 +349,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "substationProperties": { "Country": "FR" } @@ -348,7 +362,8 @@ "connectedComponentNum": 0, "voltageLevelId": "VLGEN6", "nominalVoltage": 24.0, - "country": "FR" + "country": "FR", + "substationId": "P6" } ], "busbarSections": [] diff --git a/src/test/resources/partial-batteries-tab-data.json b/src/test/resources/partial-batteries-tab-data.json index 6a1a7e1a..b8af303d 100644 --- a/src/test/resources/partial-batteries-tab-data.json +++ b/src/test/resources/partial-batteries-tab-data.json @@ -19,6 +19,7 @@ "terminalConnected": false, "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "measurementP": { "value": 12.0, "validity": false diff --git a/src/test/resources/shunt-compensators-tab-data-in-variant.json b/src/test/resources/shunt-compensators-tab-data-in-variant.json index 138f5fd3..f2dc3f0a 100644 --- a/src/test/resources/shunt-compensators-tab-data-in-variant.json +++ b/src/test/resources/shunt-compensators-tab-data-in-variant.json @@ -5,6 +5,7 @@ "voltageLevelId": "VLNEW2", "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "q": 90.0, "sectionCount": 4, @@ -49,6 +50,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -70,6 +72,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": false, "sectionCount": 2, "maxSusceptance": 3.0, @@ -90,6 +93,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": false, "sectionCount": 2, "maximumSectionCount": 2, @@ -104,6 +108,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "q": 90.0, "sectionCount": 2, diff --git a/src/test/resources/shunt-compensators-tab-data.json b/src/test/resources/shunt-compensators-tab-data.json index 5e5eef93..e1ea0326 100644 --- a/src/test/resources/shunt-compensators-tab-data.json +++ b/src/test/resources/shunt-compensators-tab-data.json @@ -5,6 +5,7 @@ "voltageLevelId": "VLNEW2", "nominalVoltage": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "q": 90.0, "sectionCount": 4, @@ -49,6 +50,7 @@ "voltageLevelId": "VLGEN3", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -70,6 +72,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": true, "sectionCount": 2, "maxSusceptance": 3.0, @@ -90,6 +93,7 @@ "voltageLevelId": "VLGEN4", "nominalVoltage": 24.0, "country": "FR", + "substationId": "P4", "terminalConnected": false, "sectionCount": 2, "maximumSectionCount": 2, diff --git a/src/test/resources/static-var-compensators-tab-data.json b/src/test/resources/static-var-compensators-tab-data.json index 1aef81b8..070e5260 100644 --- a/src/test/resources/static-var-compensators-tab-data.json +++ b/src/test/resources/static-var-compensators-tab-data.json @@ -5,6 +5,7 @@ "voltageLevelId": "VLGEN", "nominalV": 24.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "regulationMode": "VOLTAGE", "p": 120.0, @@ -43,6 +44,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "regulationMode": "VOLTAGE", "voltageSetpoint": 200.0, diff --git a/src/test/resources/tie-line-tab-data-dc.json b/src/test/resources/tie-line-tab-data-dc.json index d1401062..cdd77bae 100644 --- a/src/test/resources/tie-line-tab-data-dc.json +++ b/src/test/resources/tie-line-tab-data-dc.json @@ -1,33 +1,35 @@ { - "id": "TL1", - "voltageLevelId1": "VLGEN", - "voltageLevelName1": "VLGEN_Name", - "nominalVoltage1": 24, - "voltageLevelId2": "VLGEN3", - "nominalVoltage2": 24, - "country1": "FR", - "country2": "FR", - "terminal1Connected": true, - "terminal2Connected": true, - "p1": 45, - "q1": 75, - "p2": 45, - "q2": 75, - "i1": 1353.1646934131852, - "i2": 1353.1646934131852, - "r": 1.9999999999999996, - "x": 3.999999999999999, - "g1": 4.000000000000001, - "b1": 3.0000000000000004, - "g2": 4.000000000000001, - "b2": 3.0000000000000004, - "substationProperties1": { - "Country": "FR" - }, - "substationProperties2": { - "Country": "FR" - }, - "voltageLevelProperties1": { - "Country": "FR" - } + "id": "TL1", + "voltageLevelId1": "VLGEN", + "voltageLevelName1": "VLGEN_Name", + "nominalVoltage1": 24.0, + "voltageLevelId2": "VLGEN3", + "nominalVoltage2": 24.0, + "country1": "FR", + "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", + "terminal1Connected": true, + "terminal2Connected": true, + "p1": 45.0, + "q1": 75.0, + "p2": 45.0, + "q2": 75.0, + "i1": 1353.1646934131852, + "i2": 1353.1646934131852, + "r": 1.9999999999999996, + "x": 3.999999999999999, + "g1": 4.000000000000001, + "b1": 3.0000000000000004, + "g2": 4.000000000000001, + "b2": 3.0000000000000004, + "substationProperties1": { + "Country": "FR" + }, + "voltageLevelProperties1": { + "Country": "FR" + }, + "substationProperties2": { + "Country": "FR" + } } \ No newline at end of file diff --git a/src/test/resources/tie-lines-tab-data.json b/src/test/resources/tie-lines-tab-data.json index 7edededb..1bd1a3ca 100644 --- a/src/test/resources/tie-lines-tab-data.json +++ b/src/test/resources/tie-lines-tab-data.json @@ -3,17 +3,19 @@ "id": "TL1", "voltageLevelId1": "VLGEN", "voltageLevelName1": "VLGEN_Name", - "nominalVoltage1": 24, + "nominalVoltage1": 24.0, "voltageLevelId2": "VLGEN3", - "nominalVoltage2": 24, + "nominalVoltage2": 24.0, "country1": "FR", "country2": "FR", + "substationId1": "P1", + "substationId2": "P3", "terminal1Connected": true, "terminal2Connected": true, - "p1": 45, - "q1": 75, - "p2": 45, - "q2": 75, + "p1": 45.0, + "q1": 75.0, + "p2": 45.0, + "q2": 75.0, "r": 1.9999999999999996, "x": 3.999999999999999, "g1": 4.000000000000001, diff --git a/src/test/resources/vsc-converter-stations-tab-data.json b/src/test/resources/vsc-converter-stations-tab-data.json index 069e5f49..7184a064 100644 --- a/src/test/resources/vsc-converter-stations-tab-data.json +++ b/src/test/resources/vsc-converter-stations-tab-data.json @@ -9,6 +9,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC5", "p": 10.0, @@ -29,6 +30,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC3", "p": 10.0, @@ -49,6 +51,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC3", "p": 10.0, @@ -92,6 +95,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC4", "p": 10.0, @@ -120,6 +124,7 @@ "voltageLevelId": "VLNEW2", "nominalV": 225.0, "country": "FR", + "substationId": "P1", "terminalConnected": true, "hvdcLineId": "HVDC4", "p": 10.0, @@ -141,6 +146,7 @@ "voltageLevelId": "VLGEN3", "nominalV": 24.0, "country": "FR", + "substationId": "P3", "terminalConnected": true, "hvdcLineId": "HVDC5", "substationProperties": {