From f0a08ba90588cb48561b9464fe8fcd272f018ea6 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Sat, 7 Feb 2026 20:07:46 +0100 Subject: [PATCH 1/3] add regulationTypeText to GeneratorTabInfos --- .../map/dto/definition/generator/GeneratorTabInfos.java | 3 +++ .../network/map/dto/mapper/GeneratorInfosMapper.java | 2 ++ .../org/gridsuite/network/map/dto/utils/ElementUtils.java | 5 +++++ src/test/resources/all-data-in-variant.json | 2 ++ src/test/resources/all-data.json | 2 ++ src/test/resources/generators-tab-data.json | 2 ++ 6 files changed, 16 insertions(+) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java index b528f19a..02917b40 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java @@ -85,6 +85,9 @@ public class GeneratorTabInfos extends ElementInfosWithProperties { @JsonInclude(JsonInclude.Include.NON_NULL) private String regulatingTerminalVlId; + @JsonInclude(JsonInclude.Include.NON_NULL) + private String regulationTypeText; + private CoordinatedReactiveControlInfos coordinatedReactiveControl; @JsonInclude(JsonInclude.Include.NON_ABSENT) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java index 70b7c433..6092cfb7 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java @@ -93,12 +93,14 @@ private static GeneratorTabInfos toTabInfos(Identifiable identifiable, boolea if (loadRegulatingTerminals) { Terminal regulatingTerminal = generator.getRegulatingTerminal(); + builder.regulationTypeText(VoltageRegulationType.LOCAL.name()); //If there is no regulating terminal in file, regulating terminal voltage level is equal to generator voltage level if (regulatingTerminal != null && !regulatingTerminal.getVoltageLevel().equals(terminal.getVoltageLevel())) { builder.regulatingTerminalVlName(regulatingTerminal.getVoltageLevel().getOptionalName().orElse(null)); builder.regulatingTerminalConnectableId(regulatingTerminal.getConnectable().getId()); builder.regulatingTerminalConnectableType(regulatingTerminal.getConnectable().getType().name()); builder.regulatingTerminalVlId(regulatingTerminal.getVoltageLevel().getId()); + builder.regulationTypeText(VoltageRegulationType.DISTANT.name()); } } diff --git a/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java b/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java index 01c4bc59..876af703 100644 --- a/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java +++ b/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java @@ -216,4 +216,9 @@ public static UnsupportedOperationException handleUnsupportedInfoType(@NonNull f "InfoType '" + infoType + "' is not supported for " + elementTypeName + " elements" ); } + + public enum VoltageRegulationType { + LOCAL, + DISTANT + } } diff --git a/src/test/resources/all-data-in-variant.json b/src/test/resources/all-data-in-variant.json index a3fccb6b..cfe7eb76 100644 --- a/src/test/resources/all-data-in-variant.json +++ b/src/test/resources/all-data-in-variant.json @@ -1750,6 +1750,7 @@ "minQ": -500.0, "maxQ": 500.0 }, + "regulationTypeText": "DISTANT", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", @@ -1819,6 +1820,7 @@ "maxP": 9999.99, "energySource": "OTHER", "voltageRegulatorOn": true, + "regulationTypeText": "LOCAL", "reactiveCapabilityCurvePoints": [ { "p": 0.0, diff --git a/src/test/resources/all-data.json b/src/test/resources/all-data.json index 959b6c1e..3cc1fc72 100644 --- a/src/test/resources/all-data.json +++ b/src/test/resources/all-data.json @@ -1750,6 +1750,7 @@ "minQ": -500.0, "maxQ": 500.0 }, + "regulationTypeText": "DISTANT", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", @@ -1819,6 +1820,7 @@ "maxP": 9999.99, "energySource": "OTHER", "voltageRegulatorOn": true, + "regulationTypeText": "LOCAL", "reactiveCapabilityCurvePoints": [ { "p": 0.0, diff --git a/src/test/resources/generators-tab-data.json b/src/test/resources/generators-tab-data.json index c65b6ee7..e29f63e8 100644 --- a/src/test/resources/generators-tab-data.json +++ b/src/test/resources/generators-tab-data.json @@ -25,6 +25,7 @@ "minQ": -500.0, "maxQ": 500.0 }, + "regulationTypeText": "DISTANT", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", @@ -94,6 +95,7 @@ "maxP": 9999.99, "energySource": "OTHER", "voltageRegulatorOn": true, + "regulationTypeText": "LOCAL", "reactiveCapabilityCurvePoints": [ { "p": 0.0, From 8bdaa93aec2799d3a7d7769a201222d21fbd609d Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Wed, 11 Feb 2026 08:54:01 +0100 Subject: [PATCH 2/3] rename to regulationType --- .../map/dto/definition/generator/GeneratorTabInfos.java | 2 +- .../network/map/dto/mapper/GeneratorInfosMapper.java | 4 ++-- src/test/resources/all-data-in-variant.json | 4 ++-- src/test/resources/all-data.json | 4 ++-- src/test/resources/generators-tab-data.json | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java b/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java index 02917b40..087dc109 100644 --- a/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java +++ b/src/main/java/org/gridsuite/network/map/dto/definition/generator/GeneratorTabInfos.java @@ -86,7 +86,7 @@ public class GeneratorTabInfos extends ElementInfosWithProperties { private String regulatingTerminalVlId; @JsonInclude(JsonInclude.Include.NON_NULL) - private String regulationTypeText; + private String regulationType; private CoordinatedReactiveControlInfos coordinatedReactiveControl; diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java index 6092cfb7..4996c9ec 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java @@ -93,14 +93,14 @@ private static GeneratorTabInfos toTabInfos(Identifiable identifiable, boolea if (loadRegulatingTerminals) { Terminal regulatingTerminal = generator.getRegulatingTerminal(); - builder.regulationTypeText(VoltageRegulationType.LOCAL.name()); + builder.regulationType(VoltageRegulationType.LOCAL.name()); //If there is no regulating terminal in file, regulating terminal voltage level is equal to generator voltage level if (regulatingTerminal != null && !regulatingTerminal.getVoltageLevel().equals(terminal.getVoltageLevel())) { builder.regulatingTerminalVlName(regulatingTerminal.getVoltageLevel().getOptionalName().orElse(null)); builder.regulatingTerminalConnectableId(regulatingTerminal.getConnectable().getId()); builder.regulatingTerminalConnectableType(regulatingTerminal.getConnectable().getType().name()); builder.regulatingTerminalVlId(regulatingTerminal.getVoltageLevel().getId()); - builder.regulationTypeText(VoltageRegulationType.DISTANT.name()); + builder.regulationType(VoltageRegulationType.DISTANT.name()); } } diff --git a/src/test/resources/all-data-in-variant.json b/src/test/resources/all-data-in-variant.json index cfe7eb76..90009621 100644 --- a/src/test/resources/all-data-in-variant.json +++ b/src/test/resources/all-data-in-variant.json @@ -1750,7 +1750,7 @@ "minQ": -500.0, "maxQ": 500.0 }, - "regulationTypeText": "DISTANT", + "regulationType": "DISTANT", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", @@ -1820,7 +1820,7 @@ "maxP": 9999.99, "energySource": "OTHER", "voltageRegulatorOn": true, - "regulationTypeText": "LOCAL", + "regulationType": "LOCAL", "reactiveCapabilityCurvePoints": [ { "p": 0.0, diff --git a/src/test/resources/all-data.json b/src/test/resources/all-data.json index 3cc1fc72..32e35b4a 100644 --- a/src/test/resources/all-data.json +++ b/src/test/resources/all-data.json @@ -1750,7 +1750,7 @@ "minQ": -500.0, "maxQ": 500.0 }, - "regulationTypeText": "DISTANT", + "regulationType": "DISTANT", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", @@ -1820,7 +1820,7 @@ "maxP": 9999.99, "energySource": "OTHER", "voltageRegulatorOn": true, - "regulationTypeText": "LOCAL", + "regulationType": "LOCAL", "reactiveCapabilityCurvePoints": [ { "p": 0.0, diff --git a/src/test/resources/generators-tab-data.json b/src/test/resources/generators-tab-data.json index e29f63e8..895483cf 100644 --- a/src/test/resources/generators-tab-data.json +++ b/src/test/resources/generators-tab-data.json @@ -25,7 +25,7 @@ "minQ": -500.0, "maxQ": 500.0 }, - "regulationTypeText": "DISTANT", + "regulationType": "DISTANT", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", @@ -95,7 +95,7 @@ "maxP": 9999.99, "energySource": "OTHER", "voltageRegulatorOn": true, - "regulationTypeText": "LOCAL", + "regulationType": "LOCAL", "reactiveCapabilityCurvePoints": [ { "p": 0.0, From b7e2322a4597ff8e63da9936da4f6a275d789529 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Wed, 11 Feb 2026 09:59:14 +0100 Subject: [PATCH 3/3] rename DISTANT to REMOTE --- .../network/map/dto/mapper/GeneratorInfosMapper.java | 4 ++-- .../org/gridsuite/network/map/dto/utils/ElementUtils.java | 4 ++-- src/test/resources/all-data-in-variant.json | 2 +- src/test/resources/all-data.json | 2 +- src/test/resources/generators-tab-data.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java index 4996c9ec..8a097416 100644 --- a/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java +++ b/src/main/java/org/gridsuite/network/map/dto/mapper/GeneratorInfosMapper.java @@ -93,14 +93,14 @@ private static GeneratorTabInfos toTabInfos(Identifiable identifiable, boolea if (loadRegulatingTerminals) { Terminal regulatingTerminal = generator.getRegulatingTerminal(); - builder.regulationType(VoltageRegulationType.LOCAL.name()); + builder.regulationType(RegulationType.LOCAL.name()); //If there is no regulating terminal in file, regulating terminal voltage level is equal to generator voltage level if (regulatingTerminal != null && !regulatingTerminal.getVoltageLevel().equals(terminal.getVoltageLevel())) { builder.regulatingTerminalVlName(regulatingTerminal.getVoltageLevel().getOptionalName().orElse(null)); builder.regulatingTerminalConnectableId(regulatingTerminal.getConnectable().getId()); builder.regulatingTerminalConnectableType(regulatingTerminal.getConnectable().getType().name()); builder.regulatingTerminalVlId(regulatingTerminal.getVoltageLevel().getId()); - builder.regulationType(VoltageRegulationType.DISTANT.name()); + builder.regulationType(RegulationType.REMOTE.name()); } } diff --git a/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java b/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java index 876af703..293ac10a 100644 --- a/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java +++ b/src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java @@ -217,8 +217,8 @@ public static UnsupportedOperationException handleUnsupportedInfoType(@NonNull f ); } - public enum VoltageRegulationType { + public enum RegulationType { LOCAL, - DISTANT + REMOTE } } diff --git a/src/test/resources/all-data-in-variant.json b/src/test/resources/all-data-in-variant.json index 90009621..a47868b4 100644 --- a/src/test/resources/all-data-in-variant.json +++ b/src/test/resources/all-data-in-variant.json @@ -1750,7 +1750,7 @@ "minQ": -500.0, "maxQ": 500.0 }, - "regulationType": "DISTANT", + "regulationType": "REMOTE", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", diff --git a/src/test/resources/all-data.json b/src/test/resources/all-data.json index 32e35b4a..d50b4cd9 100644 --- a/src/test/resources/all-data.json +++ b/src/test/resources/all-data.json @@ -1750,7 +1750,7 @@ "minQ": -500.0, "maxQ": 500.0 }, - "regulationType": "DISTANT", + "regulationType": "REMOTE", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1", diff --git a/src/test/resources/generators-tab-data.json b/src/test/resources/generators-tab-data.json index 895483cf..f77047d6 100644 --- a/src/test/resources/generators-tab-data.json +++ b/src/test/resources/generators-tab-data.json @@ -25,7 +25,7 @@ "minQ": -500.0, "maxQ": 500.0 }, - "regulationType": "DISTANT", + "regulationType": "REMOTE", "regulatingTerminalConnectableId": "NHV1_NHV2_1", "regulatingTerminalConnectableType": "LINE", "regulatingTerminalVlId": "VLHV1",