Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Exporters/GrassCoverErosionOutwardsWaveConditionsExporter.cs
===================================================================
diff -u -ra79c1bc928ca6d7dd1765f39421b062eee1461ad -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Exporters/GrassCoverErosionOutwardsWaveConditionsExporter.cs (.../GrassCoverErosionOutwardsWaveConditionsExporter.cs) (revision a79c1bc928ca6d7dd1765f39421b062eee1461ad)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Exporters/GrassCoverErosionOutwardsWaveConditionsExporter.cs (.../GrassCoverErosionOutwardsWaveConditionsExporter.cs) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4)
@@ -94,7 +94,7 @@
{
exportableWaveConditions.AddRange(
ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(
- calculation.Name, calculation.InputParameters, calculation.Output.WaveImpactWithWaveDirectionOutput, CoverType.GrassTailorMadeWaveImpact, getTargetProbabilityFunc));
+ calculation.Name, calculation.InputParameters, calculation.Output.WaveImpactWithWaveDirectionOutput, CoverType.GrassWaveImpactWithWaveDirection, getTargetProbabilityFunc));
}
}
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs
===================================================================
diff -u -ra79c1bc928ca6d7dd1765f39421b062eee1461ad -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision a79c1bc928ca6d7dd1765f39421b062eee1461ad)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4)
@@ -299,7 +299,7 @@
}
[Test]
- public void Export_ValidDataWithCalculationTypeTailorMadeWaveImpact_ValidFile()
+ public void Export_ValidDataWithCalculationTypeWaveImpactWithWaveDirection_ValidFile()
{
// Setup
string folderName = $"{nameof(GrassCoverErosionOutwardsWaveConditionsExporterTest)}.{nameof(Export_ValidDataWithCalculationTypeWaveImpact_ValidFile)}";
@@ -348,13 +348,13 @@
Assert.IsTrue(File.Exists(filePath));
string fileContent = File.ReadAllText(filePath);
string expectedText = $"Naam berekening; Naam HB locatie; X HB locatie (RD) [m]; Y HB locatie (RD) [m]; Naam voorlandprofiel; Dam gebruikt; Voorlandgeometrie gebruikt; Type bekleding; Doelkans [1/jaar]; Waterstand [m+NAP]; Golfhoogte (Hs) [m]; Golfperiode (Tp) [s]; Golfrichting t.o.v. dijknormaal [°]; Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
- $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap voor toets op maat); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}";
+ $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap met golfrichting); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}";
Assert.AreEqual(expectedText, fileContent);
}
}
[Test]
- public void Export_ValidDataWithCalculationTypeWaveRunUpAndTailorMadeWaveImpact_ValidFile()
+ public void Export_ValidDataWithCalculationTypeWaveRunUpAndWaveImpactWithWaveDirection_ValidFile()
{
// Setup
string folderName = $"{nameof(GrassCoverErosionOutwardsWaveConditionsExporterTest)}.{nameof(Export_ValidDataWithCalculationTypeWaveImpact_ValidFile)}";
@@ -404,7 +404,7 @@
string fileContent = File.ReadAllText(filePath);
string expectedText = $"Naam berekening; Naam HB locatie; X HB locatie (RD) [m]; Y HB locatie (RD) [m]; Naam voorlandprofiel; Dam gebruikt; Voorlandgeometrie gebruikt; Type bekleding; Doelkans [1/jaar]; Waterstand [m+NAP]; Golfhoogte (Hs) [m]; Golfperiode (Tp) [s]; Golfrichting t.o.v. dijknormaal [°]; Golfrichting t.o.v. Noord [°]{Environment.NewLine}" +
$"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfoploop); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}" +
- $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap voor toets op maat); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}";
+ $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap met golfrichting); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}";
Assert.AreEqual(expectedText, fileContent);
}
}
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rbe08b797da1787deb6116fc167fc909d441f26b0 -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision be08b797da1787deb6116fc167fc909d441f26b0)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
//
// This file is part of Riskeer.
//
@@ -258,20 +258,20 @@
}
///
- /// Looks up a localized string similar to Gras (golfklap voor toets op maat).
+ /// Looks up a localized string similar to Gras (golfklap).
///
- public static string CoverType_GrassTailorMadeWaveImpact {
+ public static string CoverType_GrassWaveImpact {
get {
- return ResourceManager.GetString("CoverType_GrassTailorMadeWaveImpact", resourceCulture);
+ return ResourceManager.GetString("CoverType_GrassWaveImpact", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Gras (golfklap).
+ /// Looks up a localized string similar to Gras (golfklap met golfrichting).
///
- public static string CoverType_GrassWaveImpact {
+ public static string CoverType_GrassWaveImpactWithWaveDirection {
get {
- return ResourceManager.GetString("CoverType_GrassWaveImpact", resourceCulture);
+ return ResourceManager.GetString("CoverType_GrassWaveImpactWithWaveDirection", resourceCulture);
}
}
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx
===================================================================
diff -u -rbe08b797da1787deb6116fc167fc909d441f26b0 -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision be08b797da1787deb6116fc167fc909d441f26b0)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4)
@@ -175,9 +175,9 @@
Gras (golfklap)
-
- Gras (golfklap voor toets op maat)
-
+
+ Gras (golfklap met golfrichting)
+
..\resources\bekledingenconfiguratiebasisschema0to1.xslt;System.String, mscorlib, Version=4.0.0.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/CoverType.cs
===================================================================
diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/CoverType.cs (.../CoverType.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/CoverType.cs (.../CoverType.cs) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4)
@@ -33,7 +33,7 @@
public static readonly CoverType Asphalt = new CoverType(Resources.CoverType_Asphalt);
public static readonly CoverType GrassWaveRunUp = new CoverType(Resources.CoverType_GrassWaveRunUp);
public static readonly CoverType GrassWaveImpact = new CoverType(Resources.CoverType_GrassWaveImpact);
- public static readonly CoverType GrassTailorMadeWaveImpact = new CoverType(Resources.CoverType_GrassTailorMadeWaveImpact);
+ public static readonly CoverType GrassWaveImpactWithWaveDirection = new CoverType(Resources.CoverType_GrassWaveImpactWithWaveDirection);
private CoverType(string name)
{
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/CoverTypeTest.cs
===================================================================
diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/CoverTypeTest.cs (.../CoverTypeTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/CoverTypeTest.cs (.../CoverTypeTest.cs) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4)
@@ -63,10 +63,10 @@
}
[Test]
- public void Name_GrassTailorMadeWaveImpact_CorrectName()
+ public void Name_GrassWaveImpactWithWaveDirection_CorrectName()
{
// Assert
- Assert.AreEqual("Gras (golfklap voor toets op maat)", CoverType.GrassTailorMadeWaveImpact.Name);
+ Assert.AreEqual("Gras (golfklap met golfrichting)", CoverType.GrassWaveImpactWithWaveDirection.Name);
}
}
}
\ No newline at end of file