Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs
===================================================================
diff -u -rcef2c97c6cfd8c14e4e71329fe505fc724935b35 -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision cef2c97c6cfd8c14e4e71329fe505fc724935b35)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
@@ -149,7 +149,7 @@
/// be connected to elements already defined in .
private void InsertSectionWhileMaintainingConnectivityOrder(FailureMechanismSection sectionToInsert)
{
- if (sections[sections.Count - 1].EndPoint.Equals(sectionToInsert.StartPoint))
+ if (sections.Last().EndPoint.Equals(sectionToInsert.StartPoint))
{
sections.Add(sectionToInsert);
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rcada16310abbc84232fb2131ca6639abbccece13 -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cada16310abbc84232fb2131ca6639abbccece13)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
@@ -1418,7 +1418,7 @@
}
///
- /// Looks up a localized string similar to Eindpunt van het vak..
+ /// Looks up a localized string similar to Eindpunt van het vak (X-coördinaat, Y-coördinaat)..
///
public static string FailureMechanismSection_EndPoint_Description {
get {
@@ -1427,7 +1427,7 @@
}
///
- /// Looks up a localized string similar to Eindpunt (X-coördinaat, Y-coördinaat).
+ /// Looks up a localized string similar to Eindpunt.
///
public static string FailureMechanismSection_EndPoint_DisplayName {
get {
@@ -1472,7 +1472,7 @@
}
///
- /// Looks up a localized string similar to Beginpunt van het vak..
+ /// Looks up a localized string similar to Beginpunt van het vak (X-coördinaat, Y-coördinaat)..
///
public static string FailureMechanismSection_StartPoint_Description {
get {
@@ -1481,7 +1481,7 @@
}
///
- /// Looks up a localized string similar to Beginpunt (X-coördinaat, Y-coördinaat).
+ /// Looks up a localized string similar to Beginpunt.
///
public static string FailureMechanismSection_StartPoint_DisplayName {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rcada16310abbc84232fb2131ca6639abbccece13 -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision cada16310abbc84232fb2131ca6639abbccece13)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
@@ -1251,10 +1251,10 @@
Vakindeling waarmee de waterkering voor dit toetsspoor is geschematiseerd ten behoeve van de beoordeling.
- Eindpunt van het vak.
+ Eindpunt van het vak (X-coördinaat, Y-coördinaat).
- Eindpunt (X-coördinaat, Y-coördinaat)
+ Eindpunt
De totale lengte van het vak in meters.
@@ -1269,9 +1269,9 @@
Vaknaam
- Beginpunt van het vak.
+ Beginpunt van het vak (X-coördinaat, Y-coördinaat).
- Beginpunt (X-coördinaat, Y-coördinaat)
+ Beginpunt
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs
===================================================================
diff -u -r6345e3b55a5936423d01349e34940c5c60c7b4e5 -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 6345e3b55a5936423d01349e34940c5c60c7b4e5)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
@@ -269,7 +269,7 @@
var doneGrowingToEnd = false;
while (!doneGrowingToEnd)
{
- Point2D endPointToConnect = resultList[resultList.Count - 1].EndPoint;
+ Point2D endPointToConnect = resultList.Last().EndPoint;
double shortestDistance = double.MaxValue;
FailureMechanismSection closestSectionToConnectWith = null;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs
===================================================================
diff -u -rcada16310abbc84232fb2131ca6639abbccece13 -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs (.../FailureMechanismSectionPropertiesTest.cs) (revision cada16310abbc84232fb2131ca6639abbccece13)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs (.../FailureMechanismSectionPropertiesTest.cs) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
@@ -92,14 +92,14 @@
PropertyDescriptor startPointProperty = dynamicProperties[2];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(startPointProperty,
"Algemeen",
- "Beginpunt (X-coördinaat, Y-coördinaat)",
- "Beginpunt van het vak.",
+ "Beginpunt",
+ "Beginpunt van het vak (X-coördinaat, Y-coördinaat).",
true);
PropertyDescriptor endPointProperty = dynamicProperties[3];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(endPointProperty,
"Algemeen",
- "Eindpunt (X-coördinaat, Y-coördinaat)",
- "Eindpunt van het vak.",
+ "Eindpunt",
+ "Eindpunt van het vak (X-coördinaat, Y-coördinaat).",
true);
}
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs
===================================================================
diff -u -rcef2c97c6cfd8c14e4e71329fe505fc724935b35 -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision cef2c97c6cfd8c14e4e71329fe505fc724935b35)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
@@ -579,7 +579,7 @@
// 1. Start & End coherence:
Assert.AreEqual(referenceLineGeometry[0], sections[0].StartPoint,
"Start of the sections should correspond to the Start of the reference line.");
- Assert.AreEqual(referenceLineGeometry[referenceLineGeometry.Length - 1], sections[sections.Length - 1].EndPoint,
+ Assert.AreEqual(referenceLineGeometry.Last(), sections.Last().EndPoint,
"End of the sections should correspond to the End of the reference line.");
// 2. Total length coherence: