Skip to content

Commit c73e020

Browse files
authored
Remove lineFlowColorMode and lineFlowAlertThreshold from the network visualization parameters. (#43)
Signed-off-by: AAJELLAL <[email protected]>
1 parent 880f5ad commit c73e020

File tree

7 files changed

+14
-20
lines changed

7 files changed

+14
-20
lines changed

src/main/java/org/gridsuite/studyconfig/server/dto/MapParamInfos.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ public record MapParamInfos(
2323
@Schema(description = "Line flow mode")
2424
String lineFlowMode,
2525

26-
@Schema(description = "Line color mode")
27-
String lineFlowColorMode,
28-
29-
@Schema(description = "Line overloads warning threshold")
30-
Integer lineFlowAlertThreshold,
31-
3226
@Schema(description = "Manual update of geographical view")
3327
Boolean mapManualRefresh,
3428

src/main/java/org/gridsuite/studyconfig/server/entities/NetworkVisualizationParamEntity.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ public class NetworkVisualizationParamEntity {
4040
@Column(name = "line_flow_mode")
4141
private String lineFlowMode = "feeders";
4242

43-
@Column(name = "line_flow_color_mode")
44-
private String lineFlowColorMode = "nominalVoltage";
45-
46-
@Column(name = "line_flow_alert_threshold")
47-
private Integer lineFlowAlertThreshold = 100;
48-
4943
@Column(name = "map_manual_refresh")
5044
private Boolean mapManualRefresh = true;
5145

src/main/java/org/gridsuite/studyconfig/server/mapper/NetworkVisualizationParamMapper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public static NetworkVisualizationParamInfos toDto(NetworkVisualizationParamEnti
2727
entity.getLineFullPath(),
2828
entity.getLineParallelPath(),
2929
entity.getLineFlowMode(),
30-
entity.getLineFlowColorMode(),
31-
entity.getLineFlowAlertThreshold(),
3230
entity.getMapManualRefresh(),
3331
entity.getMapBaseMap()),
3432
new SingleLineDiagramParamInfos(
@@ -52,8 +50,6 @@ public static void updateEntity(NetworkVisualizationParamEntity entity, NetworkV
5250
entity.setLineFullPath(dto.mapParameters().lineFullPath());
5351
entity.setLineParallelPath(dto.mapParameters().lineParallelPath());
5452
entity.setLineFlowMode(dto.mapParameters().lineFlowMode());
55-
entity.setLineFlowColorMode(dto.mapParameters().lineFlowColorMode());
56-
entity.setLineFlowAlertThreshold(dto.mapParameters().lineFlowAlertThreshold());
5753
entity.setMapManualRefresh(dto.mapParameters().mapManualRefresh());
5854
entity.setMapBaseMap(dto.mapParameters().mapBaseMap());
5955
// SLD

src/main/java/org/gridsuite/studyconfig/server/service/NetworkVisualizationsParamService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public UUID duplicateParameters(UUID id) {
4646
.lineFullPath(entity.getLineFullPath())
4747
.lineParallelPath(entity.getLineParallelPath())
4848
.lineFlowMode(entity.getLineFlowMode())
49-
.lineFlowColorMode(entity.getLineFlowColorMode())
50-
.lineFlowAlertThreshold(entity.getLineFlowAlertThreshold())
5149
.mapManualRefresh(entity.getMapManualRefresh())
5250
.mapBaseMap(entity.getMapBaseMap())
5351
// SLD
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
3+
<changeSet author="ajellalali (generated)" id="1742980696304-1">
4+
<dropColumn columnName="line_flow_alert_threshold" tableName="network_visualization_params"/>
5+
</changeSet>
6+
<changeSet author="ajellalali (generated)" id="1742980696304-2">
7+
<dropColumn columnName="line_flow_color_mode" tableName="network_visualization_params"/>
8+
</changeSet>
9+
</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ databaseChangeLog:
2929
- include:
3030
file: changesets/changelog_20250319T134629Z.xml
3131
relativeToChangelogFile: true
32+
- include:
33+
file: changesets/changelog_20250326T091806Z.xml
34+
relativeToChangelogFile: true
3235
- include:
3336
file: changesets/changelog_20250317T082711Z.xml
3437
relativeToChangelogFile: true

src/test/java/org/gridsuite/studyconfig/server/NetworkVisualizationParamsIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ private UUID postCreateParams(NetworkVisualizationParamInfos paramsToCreate) thr
154154

155155
private NetworkVisualizationParamInfos createDto() {
156156
return new NetworkVisualizationParamInfos(null,
157-
new MapParamInfos(true, false, "flow", "color", 80, true, "base"),
157+
new MapParamInfos(true, false, "flow", true, "base"),
158158
new SingleLineDiagramParamInfos(false, false, "layout", "lib"),
159159
new NetworkAreaDiagramParamInfos(true));
160160
}
161161

162162
private NetworkVisualizationParamInfos createDtoForUpdate(UUID id) {
163163
return new NetworkVisualizationParamInfos(id,
164-
new MapParamInfos(false, true, "flow2", "color2", 99, false, "base2"),
164+
new MapParamInfos(false, true, "flow2", false, "base2"),
165165
new SingleLineDiagramParamInfos(true, true, "layout2", "lib2"),
166166
new NetworkAreaDiagramParamInfos(false));
167167
}

0 commit comments

Comments
 (0)