Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs =================================================================== diff -u -r877f0d6830122b89d78bc3e27aa3c61736617276 -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 877f0d6830122b89d78bc3e27aa3c61736617276) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -181,7 +181,7 @@ 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, Categoriegrens, 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, IVv, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; + $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Gras (golfoploop), IVv, 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 -r86594ccd7329d320872573a1d066fe18959d3cea -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -93,7 +93,8 @@ ///(at your option) any later version. /// ///This program is distributed in the hope that it will be useful, - ///but WITHOUT ANY WARRANTY; without even the implied warranty of [rest of string was truncated]";. + ///but WITHOUT ANY WARRANTY; without even the implied warranty of + ///ME [rest of string was truncated]";. /// internal static string BekledingenConfiguratieBasisSchema { get { @@ -113,7 +114,8 @@ ///(at your option) any later version. /// ///This program is distributed in the hope that it will be useful, - ///but WITHOUT ANY WARRANTY; without even the implied warranty of [rest of string was truncated]";. + ///but WITHOUT ANY WARRANTY; without even the implied warranty of + ///ME [rest of string was truncated]";. /// internal static string BekledingenConfiguratieSchema { get { @@ -149,15 +151,24 @@ } /// - /// Looks up a localized string similar to Gras. + /// Looks up a localized string similar to Gras (golfklap). /// - internal static string CoverType_Grass { + internal static string CoverType_GrassWaveImpact { get { - return ResourceManager.GetString("CoverType_Grass", resourceCulture); + return ResourceManager.GetString("CoverType_GrassWaveImpact", resourceCulture); } } /// + /// Looks up a localized string similar to Gras (golfoploop). + /// + internal static string CoverType_GrassWaveRunUp { + get { + return ResourceManager.GetString("CoverType_GrassWaveRunUp", resourceCulture); + } + } + + /// /// Looks up a localized string similar to nee. /// internal static string No { Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -138,8 +138,8 @@ Asfalt - - Gras + + Gras (golfoploop) @@ -160,4 +160,7 @@ ..\resources\BekledingenConfiguratieSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + Gras (golfklap) + \ No newline at end of file Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/CoverType.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/CoverType.cs (.../CoverType.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/CoverType.cs (.../CoverType.cs) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -31,8 +31,9 @@ public static readonly CoverType StoneCoverBlocks = new CoverType(Resources.CoverType_Blocks); public static readonly CoverType StoneCoverColumns = new CoverType(Resources.CoverType_Columns); public static readonly CoverType Asphalt = new CoverType(Resources.CoverType_Asphalt); - public static readonly CoverType Grass = new CoverType(Resources.CoverType_Grass); - + public static readonly CoverType GrassWaveRunUp = new CoverType(Resources.CoverType_GrassWaveRunUp); + public static readonly CoverType GrassWaveImpact = new CoverType(Resources.CoverType_GrassWaveImpact); + private CoverType(string name) { Name = name; Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/ExportableWaveConditionsFactory.cs =================================================================== diff -u -rd3fa590cf6ff6c68787570a0fe206e34fbcbf699 -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/ExportableWaveConditionsFactory.cs (.../ExportableWaveConditionsFactory.cs) (revision d3fa590cf6ff6c68787570a0fe206e34fbcbf699) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/ExportableWaveConditionsFactory.cs (.../ExportableWaveConditionsFactory.cs) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -52,7 +52,7 @@ throw new ArgumentNullException(nameof(waveConditionsInput)); } - return CreateExportableWaveConditionsCollection(name, waveConditionsInput, output, CoverType.Grass, + return CreateExportableWaveConditionsCollection(name, waveConditionsInput, output, CoverType.GrassWaveRunUp, GetCategoryBoundaryName(waveConditionsInput.CategoryType)); } Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/CoverTypeTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/CoverTypeTest.cs (.../CoverTypeTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/CoverTypeTest.cs (.../CoverTypeTest.cs) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -49,10 +49,17 @@ } [Test] - public void Name_Grass_CorrectName() + public void Name_GrassWaveRunUp_CorrectName() { // Assert - Assert.AreEqual("Gras", CoverType.Grass.Name); + Assert.AreEqual("Gras (golfoploop)", CoverType.GrassWaveRunUp.Name); } + + [Test] + public void Name_GrassWaveImpact_CorrectName() + { + // Assert + Assert.AreEqual("Gras (golfklap)", CoverType.GrassWaveImpact.Name); + } } } \ No newline at end of file Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -ra82abcc00c7a2e1b21ebe4cacf97a83344c0ce5c -re7f106928d957ff6a4c163a9d3ab4eee5fd466a4 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision a82abcc00c7a2e1b21ebe4cacf97a83344c0ce5c) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision e7f106928d957ff6a4c163a9d3ab4eee5fd466a4) @@ -110,7 +110,7 @@ Assert.AreEqual("id", exportableWaveConditions.ForeshoreId); Assert.AreEqual(false, exportableWaveConditions.UseBreakWater); Assert.AreEqual(true, exportableWaveConditions.UseForeshore); - Assert.AreEqual(CoverType.Grass, exportableWaveConditions.CoverType); + Assert.AreEqual(CoverType.GrassWaveRunUp, exportableWaveConditions.CoverType); Assert.AreEqual("Iv", exportableWaveConditions.CategoryBoundaryName); Assert.AreEqual(2, exportableWaveConditions.WaterLevel.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); @@ -225,7 +225,8 @@ private static IEnumerable GetCoverTypes() { yield return new TestCaseData(CoverType.Asphalt); - yield return new TestCaseData(CoverType.Grass); + yield return new TestCaseData(CoverType.GrassWaveRunUp); + yield return new TestCaseData(CoverType.GrassWaveImpact); yield return new TestCaseData(CoverType.StoneCoverBlocks); yield return new TestCaseData(CoverType.StoneCoverColumns); }