diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/branch/line/LineFormInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/branch/line/LineFormInfos.java index 829ec972..e53c5fb2 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/branch/line/LineFormInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/branch/line/LineFormInfos.java @@ -58,14 +58,6 @@ public class LineFormInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_EMPTY) private List currentLimits; - //TODO : remove when modification is done - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List currentLimits1; - - //TODO : remove when modification is done - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List currentLimits2; - @JsonInclude(JsonInclude.Include.NON_NULL) private String selectedOperationalLimitsGroup1; diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/branch/twowindingstransformer/TwoWindingsTransformerFormInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/branch/twowindingstransformer/TwoWindingsTransformerFormInfos.java index e4722503..c4f17040 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/branch/twowindingstransformer/TwoWindingsTransformerFormInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/branch/twowindingstransformer/TwoWindingsTransformerFormInfos.java @@ -57,13 +57,6 @@ public class TwoWindingsTransformerFormInfos extends ElementInfosWithProperties @JsonInclude(JsonInclude.Include.NON_NULL) private Double i2; - // TODO : remove currentLimits1 and 2 to leave only currentLimits when modification is done - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List currentLimits1; - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List currentLimits2; - @JsonInclude(JsonInclude.Include.NON_EMPTY) private List currentLimits; 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 38935896..9cf6ba33 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 @@ -76,9 +76,6 @@ private static LineFormInfos toFormInfos(Identifiable identifiable) { .selectedOperationalLimitsGroup1(line.getSelectedOperationalLimitsGroupId1().orElse(null)) .selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null)); - buildCurrentLimits(line.getOperationalLimitsGroups1(), builder::currentLimits1); - buildCurrentLimits(line.getOperationalLimitsGroups2(), builder::currentLimits2); - builder.busOrBusbarSectionId1(getBusOrBusbarSection(terminal1)) .busOrBusbarSectionId2(getBusOrBusbarSection(terminal2)); 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 6b1da2a8..9218bb0e 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 @@ -91,9 +91,6 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable ident builder.selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null)); builder.selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null)); - buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), builder::currentLimits1); - buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), builder::currentLimits2); - builder.operatingStatus(ExtensionUtils.toOperatingStatus(twoWT)); builder.connectablePosition1(ExtensionUtils.toMapConnectablePosition(twoWT, 1)) .connectablePosition2(ExtensionUtils.toMapConnectablePosition(twoWT, 2)); diff --git a/src/test/resources/2-windings-transformer-map-data.json b/src/test/resources/2-windings-transformer-map-data.json index c9c68f2b..98e4a905 100644 --- a/src/test/resources/2-windings-transformer-map-data.json +++ b/src/test/resources/2-windings-transformer-map-data.json @@ -11,22 +11,6 @@ "q1": 12.2, "p2": 13.33, "q2": 14.44, - "currentLimits1": [ - { - "id" : "limit set 1", - "permanentLimit":750.4, - "temporaryLimits":[{"name":"IT5","acceptableDuration":2087,"value":300}], - "applicability": null - } - ], - "currentLimits2": [ - { - "id" : "limit set 1", - "permanentLimit":780.6, - "temporaryLimits":[{"name":"N/A","acceptableDuration":664,"value":2147483647},{"name":"IT20","acceptableDuration":961,"value":1200}], - "applicability": null - } - ], "currentLimits": [ { "id" : "limit set 1", diff --git a/src/test/resources/line-form-data.json b/src/test/resources/line-form-data.json index bf2c16ef..624c3132 100644 --- a/src/test/resources/line-form-data.json +++ b/src/test/resources/line-form-data.json @@ -8,22 +8,6 @@ "q1": 2.2, "p2": 3.33, "q2": 4.44, - "currentLimits1": [ - { - "id" : "limit set 1", - "permanentLimit":700.4, - "temporaryLimits":[{"name":"IT5","acceptableDuration":300,"value":250.0}], - "applicability": null - } - ], - "currentLimits2": [ - { - "id" : "limit set 1", - "permanentLimit":800.8, - "temporaryLimits":[{"name":"IT20","acceptableDuration":1200,"value":300.0},{"name":"IT10","acceptableDuration":600,"value":200.0}], - "applicability": null - } - ], "currentLimits": [ { "id" : "limit set 1", diff --git a/src/test/resources/lines-form-data.json b/src/test/resources/lines-form-data.json index 45906df5..8f43e350 100644 --- a/src/test/resources/lines-form-data.json +++ b/src/test/resources/lines-form-data.json @@ -9,39 +9,6 @@ "q1": 2.2, "p2": 3.33, "q2": 4.44, - "currentLimits1": [ - { - "id": "limit set 1", - "permanentLimit": 700.4, - "temporaryLimits": [ - { - "name": "IT5", - "value": 250.0, - "acceptableDuration": 300 - } - ], - "applicability": null - } - ], - "currentLimits2": [ - { - "id": "limit set 1", - "permanentLimit": 800.8, - "temporaryLimits": [ - { - "name": "IT20", - "value": 300.0, - "acceptableDuration": 1200 - }, - { - "name": "IT10", - "value": 200.0, - "acceptableDuration": 600 - } - ], - "applicability": null - } - ], "currentLimits": [ { "id": "limit set 1", @@ -100,63 +67,6 @@ "voltageLevelId2": "VLHV2", "terminal1Connected": true, "terminal2Connected": true, - "currentLimits1": [ - { - "id": "group2", - "permanentLimit": 250.0, - "temporaryLimits": [ - { - "name": "temporary1", - "value": 90.0, - "acceptableDuration": 200 - } - ], - "applicability": null - }, - { - "id": "group1", - "permanentLimit": 220.0, - "temporaryLimits": [ - { - "name": "temporary2", - "value": 70.0, - "acceptableDuration": 150 - }, - { - "name": "temporary1", - "value": 50.0, - "acceptableDuration": 100 - } - ], - "applicability": null - } - ], - "currentLimits2": [ - { - "id": "group4", - "permanentLimit": 320.0, - "temporaryLimits": [ - { - "name": "temporary1", - "value": 130.0, - "acceptableDuration": 200 - } - ], - "applicability": null - }, - { - "id": "group3", - "permanentLimit": 300.0, - "temporaryLimits": [ - { - "name": "temporary1", - "value": 110.0, - "acceptableDuration": 150 - } - ], - "applicability": null - } - ], "currentLimits": [ { "id": "group2", @@ -212,7 +122,6 @@ "applicability": "SIDE2" } ], - "selectedOperationalLimitsGroup1": "group1", "selectedOperationalLimitsGroup2": "group4", "r": 3.0, @@ -237,25 +146,6 @@ "voltageLevelId2": "VLGEN3", "terminal1Connected": true, "terminal2Connected": true, - "currentLimits1": [ - { - "id": "group1", - "permanentLimit": 220.0, - "temporaryLimits": [ - { - "name": "temporary2", - "value": 70.0, - "acceptableDuration": 150 - }, - { - "name": "temporary1", - "value": 50.0, - "acceptableDuration": 100 - } - ], - "applicability": null - } - ], "currentLimits": [ { "id": "group1", @@ -316,25 +206,6 @@ "voltageLevelId2": "VLGEN3", "terminal1Connected": true, "terminal2Connected": true, - "currentLimits2": [ - { - "id": "group1", - "permanentLimit": 220.0, - "temporaryLimits": [ - { - "name": "temporary2", - "value": 70.0, - "acceptableDuration": 150 - }, - { - "name": "temporary1", - "value": 50.0, - "acceptableDuration": 100 - } - ], - "applicability": null - } - ], "currentLimits": [ { "id": "group1", diff --git a/src/test/resources/partial-lines-form-data.json b/src/test/resources/partial-lines-form-data.json index 8597b401..117e0775 100644 --- a/src/test/resources/partial-lines-form-data.json +++ b/src/test/resources/partial-lines-form-data.json @@ -5,25 +5,6 @@ "voltageLevelId2": "VLGEN3", "terminal1Connected": true, "terminal2Connected": true, - "currentLimits2": [ - { - "id": "group1", - "permanentLimit": 220.0, - "temporaryLimits": [ - { - "name": "temporary2", - "value": 70.0, - "acceptableDuration": 150 - }, - { - "name": "temporary1", - "value": 50.0, - "acceptableDuration": 100 - } - ], - "applicability": null - } - ], "currentLimits": [ { "id": "group1", @@ -66,25 +47,6 @@ "voltageLevelId2": "VLGEN3", "terminal1Connected": true, "terminal2Connected": true, - "currentLimits1": [ - { - "id": "group1", - "permanentLimit": 220.0, - "temporaryLimits": [ - { - "name": "temporary2", - "value": 70.0, - "acceptableDuration": 150 - }, - { - "name": "temporary1", - "value": 50.0, - "acceptableDuration": 100 - } - ], - "applicability": null - } - ], "currentLimits": [ { "id": "group1",