Skip to content

Commit 6be72bd

Browse files
carojeandatcarojeandat
committed
resolve conflicts with main
Signed-off-by: Caroline Jeandat <[email protected]>
1 parent 5e20224 commit 6be72bd

File tree

5 files changed

+44
-90
lines changed

5 files changed

+44
-90
lines changed

‎src/main/java/com/powsybl/sld/server/SingleLineDiagramController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.powsybl.commons.config.BaseVoltageConfig;
1313
import com.powsybl.sld.server.dto.SldRequestInfos;
1414
import com.powsybl.sld.server.dto.SvgAndMetadata;
15-
import com.powsybl.sld.server.dto.SvgGenerationMetadata;
1615
import com.powsybl.sld.server.dto.nad.NadConfigInfos;
1716
import com.powsybl.sld.server.dto.nad.NadRequestInfos;
1817
import com.powsybl.sld.server.utils.SingleLineDiagramParameters;

‎src/main/java/com/powsybl/sld/server/SingleLineDiagramService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ SvgAndMetadata generateSvgAndMetadata(UUID networkUuid, String variantId, String
9898
sldParameters.setLabelProviderFactory(PositionDiagramLabelProvider.newLabelProviderFactory(id));
9999
} else if (diagParams.getSldDisplayMode() == SldDisplayMode.STATE_VARIABLE) {
100100
svgParameters.setBusesLegendAdded(true);
101-
sldParameters.setLabelProviderFactory(CommonLabelProvider.newCommonLabelProviderFactory(svgGenerationMetadata != null ? svgGenerationMetadata.getBusIdToIccValues() : null));
101+
sldParameters.setLabelProviderFactory(CommonLabelProvider.newCommonLabelProviderFactory(sldRequestInfos.getBusIdToIccValues()));
102102
} else {
103103
throw new PowsyblException(String.format("Given sld display mode %s doesn't exist", diagParams.getSldDisplayMode()));
104104
}

‎src/main/java/com/powsybl/sld/server/dto/SldRequestInfos.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.powsybl.sld.server.dto;
88

99
import java.util.List;
10+
import java.util.Map;
1011

1112
import com.powsybl.commons.config.BaseVoltageConfig;
1213

@@ -27,4 +28,9 @@
2728
public class SldRequestInfos {
2829
private List<CurrentLimitViolationInfos> currentLimitViolationsInfos;
2930
private List<BaseVoltageConfig> baseVoltagesConfigInfos;
31+
Map<String, Double> busIdToIccValues;
32+
33+
public SldRequestInfos(List<CurrentLimitViolationInfos> currentLimitViolationsInfos) {
34+
this.currentLimitViolationsInfos = currentLimitViolationsInfos;
35+
}
3036
}

‎src/main/java/com/powsybl/sld/server/dto/SvgGenerationMetadata.java‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/test/java/com/powsybl/sld/server/SingleLineDiagramTest.java‎

Lines changed: 37 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.powsybl.sld.server.dto.IdentifiableAttributes;
3636
import com.powsybl.sld.server.dto.SldRequestInfos;
3737
import com.powsybl.sld.server.dto.SvgAndMetadata;
38-
import com.powsybl.sld.server.dto.SvgGenerationMetadata;
3938
import com.powsybl.sld.server.dto.nad.NadConfigInfos;
4039
import com.powsybl.sld.server.dto.nad.NadGenerationContext;
4140
import com.powsybl.sld.server.dto.nad.NadRequestInfos;
@@ -928,19 +927,19 @@ void testNetworkAreaDiagramWithCustomBaseVoltagesConfig() throws Exception {
928927
UUID testNetworkId = UUID.randomUUID();
929928
given(networkStoreService.getNetwork(testNetworkId, PreloadingStrategy.COLLECTION)).willReturn(createNetwork());
930929

931-
BaseVoltageConfig baseVoltage = new BaseVoltageConfig();
932-
baseVoltage.setName("vl1");
933-
baseVoltage.setMinValue(0.);
934-
baseVoltage.setMaxValue(1000.);
935-
baseVoltage.setProfile("Default");
930+
BaseVoltageConfig baseVoltage1 = new BaseVoltageConfig();
931+
baseVoltage1.setName("vl1");
932+
baseVoltage1.setMinValue(0.);
933+
baseVoltage1.setMaxValue(1000.);
934+
baseVoltage1.setProfile("Default");
936935

937936
BaseVoltageConfig baseVoltage2 = new BaseVoltageConfig();
938937
baseVoltage2.setName("vl2");
939938
baseVoltage2.setMinValue(1000.);
940939
baseVoltage2.setMaxValue(2000.);
941940
baseVoltage2.setProfile("Default");
942941

943-
List<BaseVoltageConfig> baseVoltagesConfigInfos = List.of(baseVoltage, baseVoltage2);
942+
List<BaseVoltageConfig> baseVoltagesConfigInfos = List.of(baseVoltage1, baseVoltage2);
944943

945944
NadRequestInfos nadRequestInfos = NadRequestInfos.builder()
946945
.nadConfigUuid(null)
@@ -961,7 +960,13 @@ void testNetworkAreaDiagramWithCustomBaseVoltagesConfig() throws Exception {
961960
.andExpect(status().isOk())
962961
.andReturn();
963962
String stringResult = result.getResponse().getContentAsString();
963+
964+
/*
965+
* all the equipments should have a voltage level < 1000
966+
* ie all should be associated to baseVoltage1 (vl1) and none to baseVoltage2 (vl2)
967+
*/
964968
assertTrue(stringResult.contains("nad-vl1"));
969+
assertTrue(!stringResult.contains("nad-vl2"));
965970
}
966971

967972
@Test
@@ -985,11 +990,7 @@ void testSingleLineDiagramWithViolationDefaultClass() {
985990
.limitName(null)
986991
.build();
987992

988-
SldRequestInfos sldRequestInfos = SldRequestInfos.builder()
989-
.currentLimitViolationsInfos(List.of(violation))
990-
.build();
991-
992-
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, VARIANT_2_ID, "subFr3", parameters, sldRequestInfos);
993+
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, VARIANT_2_ID, "subFr3", parameters, new SldRequestInfos(List.of(violation)));
993994
String svg = svgAndMetadata.getSvg();
994995
assertNotNull(svg);
995996
assertTrue(svg.contains(OVERLOAD_STYLE_CLASS));
@@ -1011,7 +1012,7 @@ void testSingleLineDiagramNodeBreakerWithExtensions() {
10111012
.language("en")
10121013
.build();
10131014

1014-
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "S1VL1", parameters, new SldRequestInfos());
1015+
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "S1VL1", parameters, new SldRequestInfos(List.of()));
10151016
String svg = svgAndMetadata.getSvg();
10161017
assertNotNull(svg);
10171018
}
@@ -1032,7 +1033,7 @@ void testSingleLineDiagramNodeBreakerWithoutExtensions() {
10321033
.language("en")
10331034
.build();
10341035

1035-
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "S1VL1", parameters, new SldRequestInfos());
1036+
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "S1VL1", parameters, new SldRequestInfos(List.of()));
10361037
String svg = svgAndMetadata.getSvg();
10371038
assertNotNull(svg);
10381039
}
@@ -1058,11 +1059,7 @@ void testSingleLineDiagramWithViolationSanitizedClass() {
10581059
.limitName("IT20")
10591060
.build();
10601061

1061-
SldRequestInfos sldRequestInfos = SldRequestInfos.builder()
1062-
.currentLimitViolationsInfos(List.of(violation))
1063-
.build();
1064-
1065-
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, VARIANT_2_ID, "subFr3", parameters, sldRequestInfos);
1062+
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, VARIANT_2_ID, "subFr3", parameters, new SldRequestInfos(List.of(violation)));
10661063
String svg = svgAndMetadata.getSvg();
10671064
assertNotNull(svg);
10681065
String expected = OVERLOAD_STYLE_CLASS + "-it20";
@@ -1075,45 +1072,23 @@ void testSingleLineDiagramWithIcc() {
10751072
given(networkStoreService.getNetwork(testNetworkId, null)).willReturn(createTwoVoltageLevels());
10761073

10771074
SingleLineDiagramParameters parameters = SingleLineDiagramParameters.builder()
1078-
.useName(false)
1079-
.labelCentered(false)
1080-
.diagonalLabel(false)
1081-
.topologicalColoring(false)
1082-
.componentLibrary(GridSuiteAndConvergenceComponentLibrary.NAME)
1083-
.substationLayout("horizontal")
1084-
.sldDisplayMode(SldDisplayMode.STATE_VARIABLE)
1085-
.language("en")
1086-
.build();
1087-
1088-
Map<String, Double> busIdToIcc = Map.of("vl1_1", 12345.6);
1089-
1090-
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "vl1", parameters, new SvgGenerationMetadata(List.of(), busIdToIcc));
1091-
String svg = svgAndMetadata.getSvg();
1092-
assertNotNull(svg);
1093-
// divided by 1000 then rounded with 1 decimal
1094-
String expected = "ICC = 12.3 kA";
1095-
assertTrue(svg.contains(expected));
1096-
}
1097-
1098-
@Test
1099-
void testSingleLineDiagramWithIcc() {
1100-
UUID testNetworkId = UUID.randomUUID();
1101-
given(networkStoreService.getNetwork(testNetworkId, null)).willReturn(createTwoVoltageLevels());
1102-
1103-
SingleLineDiagramParameters parameters = SingleLineDiagramParameters.builder()
1104-
.useName(false)
1105-
.labelCentered(false)
1106-
.diagonalLabel(false)
1107-
.topologicalColoring(false)
1108-
.componentLibrary(GridSuiteAndConvergenceComponentLibrary.NAME)
1109-
.substationLayout("horizontal")
1110-
.sldDisplayMode(SldDisplayMode.STATE_VARIABLE)
1111-
.language("en")
1112-
.build();
1075+
.useName(false)
1076+
.labelCentered(false)
1077+
.diagonalLabel(false)
1078+
.topologicalColoring(false)
1079+
.componentLibrary(GridSuiteAndConvergenceComponentLibrary.NAME)
1080+
.substationLayout("horizontal")
1081+
.sldDisplayMode(SldDisplayMode.STATE_VARIABLE)
1082+
.language("en")
1083+
.build();
11131084

11141085
Map<String, Double> busIdToIcc = Map.of("vl1_1", 12345.6);
1086+
SldRequestInfos sldRequestInfos = SldRequestInfos.builder()
1087+
.busIdToIccValues(busIdToIcc)
1088+
.currentLimitViolationsInfos(List.of())
1089+
.build();
11151090

1116-
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "vl1", parameters, new SvgGenerationMetadata(List.of(), busIdToIcc));
1091+
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, null, "vl1", parameters, sldRequestInfos);
11171092
String svg = svgAndMetadata.getSvg();
11181093
assertNotNull(svg);
11191094
// divided by 1000 then rounded with 1 decimal
@@ -1167,8 +1142,13 @@ private void testSingleLineDiagramWithCustomBaseVoltagesConfig(boolean isTopolog
11671142
SvgAndMetadata svgAndMetadata = singleLineDiagramService.generateSvgAndMetadata(testNetworkId, VARIANT_2_ID, "subFr3", parameters, sldRequestInfos);
11681143
String svg = svgAndMetadata.getSvg();
11691144
assertNotNull(svg);
1170-
String expected = STYLE_PREFIX + "vl1";
1171-
assertTrue(svg.contains(expected));
1145+
1146+
/*
1147+
* all the equipments should have a voltage level < 1000
1148+
* ie all should be associated to baseVoltage1 (vl1) and none to baseVoltage2 (vl2)
1149+
*/
1150+
assertTrue(svg.contains(STYLE_PREFIX + "vl1"));
1151+
assertTrue(!svg.contains(STYLE_PREFIX + "vl2"));
11721152
}
11731153

11741154
@Test

0 commit comments

Comments
 (0)