Skip to content

Remove icons strip and lock temporarly on map #287

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

Merged
merged 3 commits into from
Sep 16, 2025
Merged

Remove icons strip and lock temporarly on map #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5afa9b
Remove icons strip and lock temporarly on map
ipirog Sep 9, 2025
ae8716f
Merge branch 'main' into hide_temporarly_lock_and_strip_on_map
ipirog Sep 10, 2025
9f05f74
Merge branch 'main' into hide_temporarly_lock_and_strip_on_map
ipirog Sep 10, 2025
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
10 changes: 5 additions & 5 deletions src/main/java/org/gridsuite/network/map/dto/mapper/LineInfosMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private static LineMapInfos toMapInfos(Identifiable<?> identifiable, Double dcPo
Terminal terminal1 = line.getTerminal1();
Terminal terminal2 = line.getTerminal2();

LineMapInfos.LineMapInfosBuilder<?, ?> builder = LineMapInfos.builder()
return LineMapInfos.builder()
.id(line.getId())
.name(line.getOptionalName().orElse(null))
.terminal1Connected(terminal1.isConnected())
Expand All @@ -127,10 +127,10 @@ private static LineMapInfos toMapInfos(Identifiable<?> identifiable, Double dcPo
.p1(nullIfNan(terminal1.getP()))
.p2(nullIfNan(terminal2.getP()))
.i1(nullIfNan(computeIntensity(terminal1, dcPowerFactor)))
.i2(nullIfNan(computeIntensity(terminal2, dcPowerFactor)));
builder.operatingStatus(ExtensionUtils.toOperatingStatus(line));

return builder.build();
.i2(nullIfNan(computeIntensity(terminal2, dcPowerFactor)))
// TODO - lock and strip are hidden on map temporarly
//.operatingStatus(ExtensionUtils.toOperatingStatus(line))
.build();
}

private static LineTabInfos toTabInfos(Identifiable<?> identifiable, Double dcPowerFactor, boolean loadOperationalLimitGroups) {
Expand Down
3 changes: 1 addition & 2 deletions src/test/resources/lines-map-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"terminal1Connected": true,
"terminal2Connected": true,
"p1": 200.0,
"p2": 100.0,
"operatingStatus": "PLANNED_OUTAGE"
"p2": 100.0
},
{
"id": "LINE4",
Expand Down
3 changes: 1 addition & 2 deletions src/test/resources/partial-lines-map-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"terminal1Connected": true,
"terminal2Connected": true,
"p1": 200.0,
"p2": 100.0,
"operatingStatus": "PLANNED_OUTAGE"
"p2": 100.0
},
{
"id": "NHV1_NHV2_2",
Expand Down