Skip to content

[WIP] Addition of nominal voltage when available in returned equipment data #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Addition of nominal voltage when available in returned equipment data #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/main/java/org/gridsuite/network/map/NetworkMapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ private static LineMapData toMapData(Line line) {
.terminal1Connected(terminal1.isConnected())
.terminal2Connected(terminal2.isConnected())
.voltageLevelId1(terminal1.getVoltageLevel().getId())
.voltageLevelId2(terminal2.getVoltageLevel().getId());
.voltageLevelId2(terminal2.getVoltageLevel().getId())
.nominalVoltage1(terminal1.getVoltageLevel().getNominalV())
.nominalVoltage2(terminal2.getVoltageLevel().getNominalV());
if (!Double.isNaN(terminal1.getP())) {
builder.p1(terminal1.getP());
}
Expand Down Expand Up @@ -108,6 +110,7 @@ private static GeneratorMapData toMapData(Generator generator) {
.id(generator.getId())
.terminalConnected(terminal.isConnected())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.targetP(generator.getTargetP())
.minP(generator.getMinP())
.maxP(generator.getMaxP());
Expand All @@ -130,6 +133,8 @@ private static TwoWindingsTransformerMapData toMapData(TwoWindingsTransformer tr
.terminal2Connected(terminal2.isConnected())
.voltageLevelId1(terminal1.getVoltageLevel().getId())
.voltageLevelId2(terminal2.getVoltageLevel().getId())
.nominalVoltage1(terminal1.getVoltageLevel().getNominalV())
.nominalVoltage2(terminal2.getVoltageLevel().getNominalV())
.phaseTapChanger(toMapData(transformer.getPhaseTapChanger()))
.ratioTapChanger(toMapData(transformer.getRatioTapChanger()));
if (!Double.isNaN(terminal1.getP())) {
Expand Down Expand Up @@ -193,7 +198,10 @@ private static ThreeWindingsTransformerMapData toMapData(ThreeWindingsTransforme
.terminal3Connected(terminal3.isConnected())
.voltageLevelId1(terminal1.getVoltageLevel().getId())
.voltageLevelId2(terminal2.getVoltageLevel().getId())
.voltageLevelId3(terminal3.getVoltageLevel().getId());
.voltageLevelId3(terminal3.getVoltageLevel().getId())
.nominalVoltage1(terminal1.getVoltageLevel().getNominalV())
.nominalVoltage2(terminal2.getVoltageLevel().getNominalV())
.nominalVoltage3(terminal3.getVoltageLevel().getNominalV());
if (!Double.isNaN(terminal1.getP())) {
builder.p1(terminal1.getP());
}
Expand Down Expand Up @@ -272,6 +280,7 @@ private static BatteryMapData toMapData(Battery battery) {
.id(battery.getId())
.terminalConnected(terminal.isConnected())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.p0(battery.getP0())
.q0(battery.getQ0());
if (!Double.isNaN(terminal.getP())) {
Expand All @@ -290,6 +299,7 @@ private static DanglingLineMapData toMapData(DanglingLine danglingLine) {
.id(danglingLine.getId())
.terminalConnected(terminal.isConnected())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.ucteXnodeCode(danglingLine.getUcteXnodeCode())
.p0(danglingLine.getP0())
.q0(danglingLine.getQ0());
Expand Down Expand Up @@ -319,6 +329,7 @@ private static LccConverterStationMapData toMapData(LccConverterStation lccConve
.name(lccConverterStation.getNameOrId())
.id(lccConverterStation.getId())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.terminalConnected(terminal.isConnected())
.lossFactor(lccConverterStation.getLossFactor())
.powerFactor(lccConverterStation.getPowerFactor());
Expand All @@ -340,6 +351,7 @@ private static VscConverterStationMapData toMapData(VscConverterStation vscConve
.name(vscConverterStation.getNameOrId())
.id(vscConverterStation.getId())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.terminalConnected(terminal.isConnected())
.lossFactor(vscConverterStation.getLossFactor());
if (vscConverterStation.getHvdcLine() != null) {
Expand All @@ -362,6 +374,7 @@ private static LoadMapData toMapData(Load load) {
.type(load.getLoadType())
.terminalConnected(terminal.isConnected())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.p0(load.getP0())
.q0(load.getQ0());
if (!Double.isNaN(terminal.getP())) {
Expand All @@ -379,7 +392,8 @@ private static ShuntCompensatorMapData toMapData(ShuntCompensator shuntCompensat
.name(shuntCompensator.getNameOrId())
.id(shuntCompensator.getId())
.terminalConnected(terminal.isConnected())
.voltageLevelId(terminal.getVoltageLevel().getId());
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV());
if (!Double.isNaN(terminal.getQ())) {
builder.q(terminal.getQ());
}
Expand All @@ -399,6 +413,7 @@ private static StaticVarCompensatorMapData toMapData(StaticVarCompensator static
.id(staticVarCompensator.getId())
.terminalConnected(terminal.isConnected())
.voltageLevelId(terminal.getVoltageLevel().getId())
.nominalVoltage(terminal.getVoltageLevel().getNominalV())
.regulationMode(staticVarCompensator.getRegulationMode());
if (!Double.isNaN(terminal.getP())) {
builder.p(terminal.getP());
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/AbstractHvdcConverterStationMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ public abstract class AbstractHvdcConverterStationMapData {

private String hvdcLineId;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/BatteryMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public class BatteryMapData {

private Boolean terminalConnected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p0;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/DanglingLineMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public class DanglingLineMapData {

private Boolean terminalConnected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private String ucteXnodeCode;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/GeneratorMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public class GeneratorMapData {

private Boolean terminalConnected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p;

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/LineMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ public class LineMapData {

private Boolean terminal2Connected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage1;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage2;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p1;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/LoadMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public class LoadMapData {

private Boolean terminalConnected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/ShuntCompensatorMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public class ShuntCompensatorMapData {

private Boolean terminalConnected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double q;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/StaticVarCompensatorMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public class StaticVarCompensatorMapData {

private StaticVarCompensator.RegulationMode regulationMode;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p;

Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/ThreeWindingsTransformerMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ public class ThreeWindingsTransformerMapData {

private Boolean terminal3Connected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage1;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage2;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage3;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p1;

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/gridsuite/network/map/model/TwoWindingsTransformerMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ public class TwoWindingsTransformerMapData {

private Boolean terminal2Connected;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage1;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double nominalVoltage2;

@JsonInclude(JsonInclude.Include.NON_NULL)
private Double p1;

Expand Down
4 changes: 4 additions & 0 deletions src/test/resources/2-windings-transformers-map-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"id": "NGEN_NHV1",
"voltageLevelId1": "VLGEN",
"voltageLevelId2": "VLHV1",
"nominalVoltage1": 24.0,
"nominalVoltage2": 380.0,
"name": "NGEN_NHV1",
"terminal1Connected": true,
"terminal2Connected": true,
Expand All @@ -22,6 +24,8 @@
"id": "NHV2_NLOAD",
"voltageLevelId1": "VLHV2",
"voltageLevelId2": "VLLOAD",
"nominalVoltage1": 380.0,
"nominalVoltage2": 150.0,
"name": "NHV2_NLOAD",
"terminal1Connected": true,
"terminal2Connected": true,
Expand Down
9 changes: 9 additions & 0 deletions src/test/resources/3-windings-transformers-map-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"voltageLevelId1": "VLHV1",
"voltageLevelId2": "VLNEW2",
"voltageLevelId3": "VLGEN",
"nominalVoltage1": 380.0,
"nominalVoltage2": 225.0,
"nominalVoltage3": 24.0,
"name": "TWT",
"terminal1Connected": true,
"terminal2Connected": true,
Expand Down Expand Up @@ -32,6 +35,9 @@
"voltageLevelId1": "VLHV1",
"voltageLevelId2": "VLNEW2",
"voltageLevelId3": "VLGEN",
"nominalVoltage1": 380.0,
"nominalVoltage2": 225.0,
"nominalVoltage3": 24.0,
"name": "TWT21",
"terminal1Connected": true,
"terminal2Connected": true,
Expand Down Expand Up @@ -60,6 +66,9 @@
"voltageLevelId1": "VLHV1",
"voltageLevelId2": "VLNEW2",
"voltageLevelId3": "VLGEN",
"nominalVoltage1": 380.0,
"nominalVoltage2": 225.0,
"nominalVoltage3": 24.0,
"name": "TWT32",
"terminal1Connected": true,
"terminal2Connected": true,
Expand Down
Loading