Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs
===================================================================
diff -u -r25f8db0ad5e23c84963dd30c32c0275624909d22 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 25f8db0ad5e23c84963dd30c32c0275624909d22)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -105,7 +105,7 @@
if (TryReadCriticalWaveReduction(readCalculation, calculation)
&& TryReadHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocation, calculation)
- && TryReadDikeProfile(readCalculation.DikeProfile, calculation)
+ && TryReadDikeProfile(readCalculation.DikeProfileId, calculation)
&& TryReadOrientation(readCalculation, calculation)
&& TryReadWaveReduction(readCalculation, calculation)
&& TryReadDikeHeight(readCalculation, calculation))
@@ -322,7 +322,7 @@
{
Log.LogCalculationConversionError(string.Format(
Resources.GrassCoverErosionInwardsCalculationConfigurationImporter_ValidateWaveReduction_DikeProfile_0_has_no_geometry_and_cannot_be_used,
- readCalculation.DikeProfile),
+ readCalculation.DikeProfileId),
calculation.Name);
return false;
}
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r6d5e26f9a71e8337b5973cfb20d08b8a6ea37c35 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6d5e26f9a71e8337b5973cfb20d08b8a6ea37c35)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -102,7 +102,7 @@
}
///
- /// Looks up a localized string similar to Het dijkprofiel '{0}' bestaat niet..
+ /// Looks up a localized string similar to Het dijkprofiel met ID '{0}' bestaat niet..
///
internal static string GrassCoverErosionInwardsCalculationConfigurationImporter_ReadDikeProfile_DikeProfile_0_does_not_exist {
get {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Properties/Resources.resx
===================================================================
diff -u -r40c3054d4339ac54e91ee80febe649f387485c6c -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision 40c3054d4339ac54e91ee80febe649f387485c6c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -131,7 +131,7 @@
doorsnede
- Het dijkprofiel '{0}' bestaat niet.
+ Het dijkprofiel met ID '{0}' bestaat niet.
Een waarde van '{0}' als oriƫntatie is ongeldig.
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -85,7 +85,7 @@
{
Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value,
HydraulicBoundaryLocation = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
- DikeProfile = calculationElement.GetStringValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeProfileElement),
+ DikeProfileId = calculationElement.GetStringValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeProfileElement),
Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
DikeHeight = calculationElement.GetDoubleValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightElement),
DikeHeightCalculationType = (ReadHydraulicLoadsCalculationType?) calculationElement.GetConvertedValueFromDescendantStringElement(
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/ReadGrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -r1e0a27337ab38877f8838c3fdbdfbb42544ddc46 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/ReadGrassCoverErosionInwardsCalculation.cs (.../ReadGrassCoverErosionInwardsCalculation.cs) (revision 1e0a27337ab38877f8838c3fdbdfbb42544ddc46)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/ReadGrassCoverErosionInwardsCalculation.cs (.../ReadGrassCoverErosionInwardsCalculation.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -46,7 +46,7 @@
Name = constructionProperties.Name;
HydraulicBoundaryLocation = constructionProperties.HydraulicBoundaryLocation;
- DikeProfile = constructionProperties.DikeProfile;
+ DikeProfileId = constructionProperties.DikeProfileId;
Orientation = constructionProperties.Orientation;
DikeHeight = constructionProperties.DikeHeight;
DikeHeightCalculationType = constructionProperties.DikeHeightCalculationType;
@@ -68,7 +68,7 @@
///
/// Gets the Id of the dike profile of the read grass cover erosion inwards calculation.
///
- public string DikeProfile { get; }
+ public string DikeProfileId { get; }
///
/// Gets the orientation of the grass cover erosion inwards calculation.
@@ -144,9 +144,9 @@
public string HydraulicBoundaryLocation { get; set; }
///
- /// Gets or sets the value for .
+ /// Gets or sets the value for .
///
- public string DikeProfile { get; set; }
+ public string DikeProfileId { get; set; }
///
/// Gets or sets the value for .
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Importers/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r25f8db0ad5e23c84963dd30c32c0275624909d22 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Importers/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision 25f8db0ad5e23c84963dd30c32c0275624909d22)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Importers/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -241,7 +241,7 @@
Action call = () => successful = importer.Import();
// Assert
- const string expectedMessage = "Het dijkprofiel 'Dijkprofiel' bestaat niet. Berekening 'Berekening 1' is overgeslagen.";
+ const string expectedMessage = "Het dijkprofiel met ID 'Dijkprofiel' bestaat niet. Berekening 'Berekening 1' is overgeslagen.";
TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
Assert.IsTrue(successful);
CollectionAssert.IsEmpty(calculationGroup.Children);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -218,7 +218,7 @@
Assert.IsNotNull(calculation);
Assert.AreEqual("Calculation", calculation.Name);
Assert.IsNull(calculation.HydraulicBoundaryLocation);
- Assert.IsNull(calculation.DikeProfile);
+ Assert.IsNull(calculation.DikeProfileId);
Assert.IsNull(calculation.Orientation);
Assert.IsNull(calculation.DikeHeight);
Assert.IsNull(calculation.DikeHeightCalculationType);
@@ -322,7 +322,7 @@
Assert.IsNotNull(calculation);
Assert.AreEqual("Berekening 1", calculation.Name);
Assert.AreEqual("Some_hydraulic_boundary_location", calculation.HydraulicBoundaryLocation);
- Assert.AreEqual("some_dike_profile", calculation.DikeProfile);
+ Assert.AreEqual("some_dike_profile", calculation.DikeProfileId);
Assert.AreEqual(67.1, calculation.Orientation);
Assert.AreEqual(3.45, calculation.DikeHeight);
Assert.AreEqual(ReadHydraulicLoadsCalculationType.CalculateByAssessmentSectionNorm, calculation.DikeHeightCalculationType);
@@ -352,7 +352,7 @@
Assert.IsNotNull(calculation);
Assert.AreEqual("Partial calculation 2", calculation.Name);
Assert.IsNull(calculation.HydraulicBoundaryLocation);
- Assert.AreEqual("name_of_dikeprofile", calculation.DikeProfile);
+ Assert.AreEqual("id_of_dikeprofile", calculation.DikeProfileId);
Assert.IsNull(calculation.Orientation);
Assert.AreEqual(-1.2, calculation.DikeHeight);
Assert.IsNull(calculation.DikeHeightCalculationType);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/ReadGrassCoverErosionInwardsCalculationTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/ReadGrassCoverErosionInwardsCalculationTest.cs (.../ReadGrassCoverErosionInwardsCalculationTest.cs) (revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/ReadGrassCoverErosionInwardsCalculationTest.cs (.../ReadGrassCoverErosionInwardsCalculationTest.cs) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -51,7 +51,7 @@
Assert.IsInstanceOf(readCalculation);
Assert.IsNull(readCalculation.Name);
Assert.IsNull(readCalculation.HydraulicBoundaryLocation);
- Assert.IsNull(readCalculation.DikeProfile);
+ Assert.IsNull(readCalculation.DikeProfileId);
Assert.IsNull(readCalculation.Orientation);
Assert.IsNull(readCalculation.DikeHeight);
Assert.IsNull(readCalculation.DikeHeightCalculationType);
@@ -70,7 +70,7 @@
// Setup
const string calculationName = "Name of the calculation";
const string hydraulicBoundaryLocationName = "name of the hydraulic boundary location";
- const string dikeProfileName = "name of the dike profile";
+ const string dikeProfileId = "id of the dike profile";
const double orientation = 1.1;
const double dikeHeight = 2.2;
const ReadHydraulicLoadsCalculationType dikeHeightCalculationType = ReadHydraulicLoadsCalculationType.CalculateByAssessmentSectionNorm;
@@ -86,7 +86,7 @@
{
Name = calculationName,
HydraulicBoundaryLocation = hydraulicBoundaryLocationName,
- DikeProfile = dikeProfileName,
+ DikeProfileId = dikeProfileId,
Orientation = orientation,
DikeHeight = dikeHeight,
DikeHeightCalculationType = dikeHeightCalculationType,
@@ -105,7 +105,7 @@
// Assert
Assert.AreEqual(calculationName, readCalculation.Name);
Assert.AreEqual(hydraulicBoundaryLocationName, readCalculation.HydraulicBoundaryLocation);
- Assert.AreEqual(dikeProfileName, constructionProperties.DikeProfile);
+ Assert.AreEqual(dikeProfileId, constructionProperties.DikeProfileId);
Assert.AreEqual(orientation, readCalculation.Orientation);
Assert.AreEqual(dikeHeight, readCalculation.DikeHeight);
Assert.AreEqual(dikeHeightCalculationType, readCalculation.DikeHeightCalculationType);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml
===================================================================
diff -u -r8c5c030b39552a24fad4ca710d5a9e0eaada0df2 -rc7f3fcfb9b6a70d76b386a810dc2d31906dadeb4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision 8c5c030b39552a24fad4ca710d5a9e0eaada0df2)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision c7f3fcfb9b6a70d76b386a810dc2d31906dadeb4)
@@ -1,7 +1,7 @@
- name_of_dikeprofile
+ id_of_dikeprofile
-1.2
false