Skip to content

Commit f6ba471

Browse files
authored
Remove icons strip and lock temporarly on map (#287)
Signed-off-by: Igor PIROG <[email protected]>
1 parent 96171f4 commit f6ba471

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private static LineMapInfos toMapInfos(Identifiable<?> identifiable, Double dcPo
115115
Terminal terminal1 = line.getTerminal1();
116116
Terminal terminal2 = line.getTerminal2();
117117

118-
LineMapInfos.LineMapInfosBuilder<?, ?> builder = LineMapInfos.builder()
118+
return LineMapInfos.builder()
119119
.id(line.getId())
120120
.name(line.getOptionalName().orElse(null))
121121
.terminal1Connected(terminal1.isConnected())
@@ -127,10 +127,10 @@ private static LineMapInfos toMapInfos(Identifiable<?> identifiable, Double dcPo
127127
.p1(nullIfNan(terminal1.getP()))
128128
.p2(nullIfNan(terminal2.getP()))
129129
.i1(nullIfNan(computeIntensity(terminal1, dcPowerFactor)))
130-
.i2(nullIfNan(computeIntensity(terminal2, dcPowerFactor)));
131-
builder.operatingStatus(ExtensionUtils.toOperatingStatus(line));
132-
133-
return builder.build();
130+
.i2(nullIfNan(computeIntensity(terminal2, dcPowerFactor)))
131+
// TODO - lock and strip are hidden on map temporarly
132+
//.operatingStatus(ExtensionUtils.toOperatingStatus(line))
133+
.build();
134134
}
135135

136136
private static LineTabInfos toTabInfos(Identifiable<?> identifiable, Double dcPowerFactor, boolean loadOperationalLimitGroups) {

src/test/resources/lines-map-data.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"terminal1Connected": true,
2424
"terminal2Connected": true,
2525
"p1": 200.0,
26-
"p2": 100.0,
27-
"operatingStatus": "PLANNED_OUTAGE"
26+
"p2": 100.0
2827
},
2928
{
3029
"id": "LINE4",

src/test/resources/partial-lines-map-data.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
"terminal1Connected": true,
88
"terminal2Connected": true,
99
"p1": 200.0,
10-
"p2": 100.0,
11-
"operatingStatus": "PLANNED_OUTAGE"
10+
"p2": 100.0
1211
},
1312
{
1413
"id": "NHV1_NHV2_2",

0 commit comments

Comments
 (0)