Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs
===================================================================
diff -u -r439d9a38704806fd3c659d37fe4b00e8f0888b5e -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision 439d9a38704806fd3c659d37fe4b00e8f0888b5e)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -75,7 +75,7 @@
{
var pipingFailureMechanism = demoAssessmentSection.PipingFailureMechanism;
- using (var tempPath = new TemporaryImportFile("DR6_surfacelines.csv"))
+ using (var tempPath = new TemporaryImportFile("DR6_surfacelines.csv", "DR6_surfacelines.krp.csv"))
{
var surfaceLinesImporter = new PipingSurfaceLinesCsvImporter();
surfaceLinesImporter.Import(pipingFailureMechanism.SurfaceLines, tempPath.FilePath);
@@ -105,18 +105,30 @@
/// Initializes a new instance of the class.
///
/// Name of the file with build action 'Embedded Resource' within this project.
- public TemporaryImportFile(string embeddedResourceFileName)
+ /// Names of extra files required for importing the .
+ public TemporaryImportFile(string embeddedResourceFileName, params string[] supportFiles)
{
tempTargetFolderPath = Path.Combine(Path.GetTempPath(), "demo_traject");
Directory.CreateDirectory(tempTargetFolderPath);
fullFilePath = Path.Combine(tempTargetFolderPath, embeddedResourceFileName);
+ WriteEmbeddedResourceToTemporaryFile(embeddedResourceFileName, fullFilePath);
+
+ foreach (string supportFile in supportFiles)
+ {
+ var filePath = Path.Combine(tempTargetFolderPath, supportFile);
+ WriteEmbeddedResourceToTemporaryFile(supportFile, filePath);
+ }
+ }
+
+ private void WriteEmbeddedResourceToTemporaryFile(string embeddedResourceFileName, string filePath)
+ {
var stream = GetStreamToFileInResource(embeddedResourceFileName);
var bytes = GetBinaryDataOfStream(stream);
- File.WriteAllBytes(fullFilePath, bytes);
+ File.WriteAllBytes(filePath, bytes);
}
public string FilePath
Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj
===================================================================
diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -155,6 +155,7 @@
+
Index: Demo/Ringtoets/src/Demo.Ringtoets/Resources/DR6_surfacelines.krp.csv
===================================================================
diff -u
--- Demo/Ringtoets/src/Demo.Ringtoets/Resources/DR6_surfacelines.krp.csv (revision 0)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Resources/DR6_surfacelines.krp.csv (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -0,0 +1,5 @@
+LOCATIONID;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Insteek geul;Y_Insteek geul;Z_Insteek geul;X_Teen geul;Y_Teen geul;Z_Teen geul;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts
+PK001_0001;155914.057;569833.308;-0.460;155883.762;569864.416;0.530;155882.067;569866.157;-1.900;155874.184;569874.252;-1.900;155872.224;569876.265;0.910;155864.173;569884.532;0.950;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155846.034;569903.159;9.640;155846.034;569903.159;9.640;155844.290;569904.950;9.620;155844.290;569904.950;9.620;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155797.109;569953.400;-4.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155790.132;569960.564;-4.000
+PK001_0002;155596.565;569560.415;0.120;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155558.754;569618.729;1.450;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155546.240;569638.027;9.500;155545.968;569638.447;9.550;155544.608;569640.545;9.540;155542.160;569644.320;9.680;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155505.259;569701.229;-4.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155499.819;569709.619;-4.000
+PK001_0003;155084.788;569241.272;-0.330;155063.763;569276.113;-0.500;155063.272;569276.926;-1.450;155056.855;569287.560;-1.450;155056.297;569288.485;-0.370;155047.587;569302.917;1.420;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;155034.928;569323.893;9.300;155034.928;569323.893;9.300;155033.637;569326.034;9.460;155033.378;569326.462;9.380;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;154999.006;569383.419;-4.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;154993.839;569391.981;-4.000
+PK001_0004;154745.737;568108.315;0.730;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;154682.383;568112.623;1.550;154671.907;568113.335;6.530;154664.924;568113.810;6.900;154656.942;568114.353;9.190;154656.942;568114.353;9.190;154654.448;568114.522;9.270;154653.450;568114.590;9.150;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;154586.088;568119.170;-4.000;-1.000;-1.000;-1.000;-1.000;-1.000;-1.000;154576.111;568119.849;-4.000
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r1abce3b7d9611e826388ff49f3faf8cb1040f80c -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -215,24 +215,6 @@
}
///
- /// Looks up a localized string similar to Kan intredepunt niet zetten..
- ///
- public static string RingtoetsPipingSurfaceLine_EntryPointL_Cannot_set_entry_point_at_L_0 {
- get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_EntryPointL_Cannot_set_entry_point_at_L_0", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Kan uittredepunt niet zetten..
- ///
- public static string RingtoetsPipingSurfaceLine_ExitPointL_Cannot_set_exit_point_at_L_0 {
- get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_ExitPointL_Cannot_set_exit_point_at_L_0", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Kan geen hoogte bepalen..
///
public static string RingtoetsPipingSurfaceLine_GetZAtL_Cannot_determine_height {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx
===================================================================
diff -u -r1abce3b7d9611e826388ff49f3faf8cb1040f80c -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -177,15 +177,9 @@
De profielmeting heeft geen geometrie.
-
- Kan intredepunt niet zetten.
-
Kan geen hoogte bepalen.
-
- Kan uittredepunt niet zetten.
-
De geometrie bevat geen punt op locatie ({0},{1},{2}) om als karakteristiek punt in te stellen.
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsPipingSurfaceLine.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -37,8 +37,6 @@
public class RingtoetsPipingSurfaceLine
{
private Point3D[] geometryPoints;
- private double entryPointL;
- private double exitPointL;
///
/// Initializes a new instance of the class.
@@ -96,14 +94,14 @@
public Point3D DitchDikeSide { get; private set; }
///
- /// Gets the point which is the entry point for piping.
+ /// Gets the point which characterizes the dike toe at river side.
///
- public Point3D EntryPoint { get; private set; }
+ public Point3D DikeToeAtRiver { get; private set; }
///
- /// Gets the point which is the exit point for piping.
+ /// Gets the point which characterizes the dike toe at polder side.
///
- public Point3D ExitPoint { get; private set; }
+ public Point3D DikeToeAtPolder { get; private set; }
///
/// Sets the geometry of the surfaceline.
@@ -178,27 +176,27 @@
}
///
- /// Sets the at the given point.
+ /// Sets the at the given point.
///
- /// The location as a which to set as the .
+ /// The location as a which to set as the .
/// Thrown when doesn't contain a at
/// .
/// is null.
- public void SetEntryPointAt(Point3D point)
+ public void SetDikeToeAtRiver(Point3D point)
{
- EntryPoint = GetPointFromGeometry(point);
+ DikeToeAtRiver = GetPointFromGeometry(point);
}
///
- /// Sets the at the given point.
+ /// Sets the at the given point.
///
- /// The location as a which to set as the .
+ /// The location as a which to set as the .
/// Thrown when doesn't contain a at
/// .
/// is null.
- public void SetExitPointAt(Point3D point)
+ public void SetDikeToeAtPolder(Point3D point)
{
- ExitPoint = GetPointFromGeometry(point);
+ DikeToeAtPolder = GetPointFromGeometry(point);
}
///
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -1303,83 +1303,83 @@
}
///
- /// Looks up a localized string similar to Profielmeting.
+ /// Looks up a localized string similar to Het punt dat de dijkteen binnenwaarts voorstelt..
///
- public static string RingtoetsPipingSurfaceLine_DisplayName {
+ public static string RingtoetsPipingSurfaceLine_DikeToeAtPolder_Description {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DikeToeAtPolder_Description", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Het punt dat de intsteek sloot dijkzijde voorstelt..
+ /// Looks up a localized string similar to Dijkteen binnenwaarts.
///
- public static string RingtoetsPipingSurfaceLine_DitchDikeSide_Description {
+ public static string RingtoetsPipingSurfaceLine_DikeToeAtPolder_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_Description", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DikeToeAtPolder_DisplayName", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Insteek sloot dijkzijde.
+ /// Looks up a localized string similar to Het punt dat de dijkteen buitenwaarts voorstelt..
///
- public static string RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName {
+ public static string RingtoetsPipingSurfaceLine_DikeToeAtRiver_Description {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DikeToeAtRiver_Description", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Het punt dat de intsteek sloot polderzijde voorstelt..
+ /// Looks up a localized string similar to Dijkteen buitenwaarts.
///
- public static string RingtoetsPipingSurfaceLine_DitchPolderSide_Description {
+ public static string RingtoetsPipingSurfaceLine_DikeToeAtRiver_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_Description", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DikeToeAtRiver_DisplayName", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Insteek sloot polderzijde.
+ /// Looks up a localized string similar to Profielmeting.
///
- public static string RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName {
+ public static string RingtoetsPipingSurfaceLine_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DisplayName", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Het punt van intrede voor piping..
+ /// Looks up a localized string similar to Het punt dat de intsteek sloot dijkzijde voorstelt..
///
- public static string RingtoetsPipingSurfaceLine_EntryPointL_Description {
+ public static string RingtoetsPipingSurfaceLine_DitchDikeSide_Description {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_EntryPointL_Description", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_Description", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Intredepunt.
+ /// Looks up a localized string similar to Insteek sloot dijkzijde.
///
- public static string RingtoetsPipingSurfaceLine_EntryPointL_DisplayName {
+ public static string RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_EntryPointL_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_DisplayName", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Het punt van uittrede voor piping..
+ /// Looks up a localized string similar to Het punt dat de intsteek sloot polderzijde voorstelt..
///
- public static string RingtoetsPipingSurfaceLine_ExitPointL_Description {
+ public static string RingtoetsPipingSurfaceLine_DitchPolderSide_Description {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_ExitPointL_Description", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_Description", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Uittredepunt.
+ /// Looks up a localized string similar to Insteek sloot polderzijde.
///
- public static string RingtoetsPipingSurfaceLine_ExitPointL_DisplayName {
+ public static string RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName {
get {
- return ResourceManager.GetString("RingtoetsPipingSurfaceLine_ExitPointL_DisplayName", resourceCulture);
+ return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_DisplayName", resourceCulture);
}
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -559,17 +559,17 @@
Insteek sloot polderzijde
-
- Het punt van intrede voor piping.
+
+ Het punt dat de dijkteen buitenwaarts voorstelt.
-
- Intredepunt
+
+ Dijkteen buitenwaarts
-
- Het punt van uittrede voor piping.
+
+ Het punt dat de dijkteen binnenwaarts voorstelt.
-
- Uittredepunt
+
+ Dijkteen binnenwaarts
Karakteristieke punten
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -51,24 +51,24 @@
}
[ResourcesCategory(typeof(Resources), "Categories_Characteristic_points")]
- [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_EntryPointL_DisplayName")]
- [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_EntryPointL_Description")]
- public Point3D EntryPoint
+ [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_DikeToeAtRiver_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_DikeToeAtRiver_Description")]
+ public Point3D DikeToeAtRiver
{
get
{
- return data.EntryPoint;
+ return data.DikeToeAtRiver;
}
}
[ResourcesCategory(typeof(Resources), "Categories_Characteristic_points")]
- [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_ExitPointL_DisplayName")]
- [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_ExitPointL_Description")]
- public Point3D ExitPoint
+ [ResourcesDisplayName(typeof(Resources), "RingtoetsPipingSurfaceLine_DikeToeAtPolder_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "RingtoetsPipingSurfaceLine_DikeToeAtPolder_Description")]
+ public Point3D DikeToeAtPolder
{
get
{
- return data.ExitPoint;
+ return data.DikeToeAtPolder;
}
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -376,13 +376,13 @@
TrySetCharacteristicPoint(
characteristicPointsLocation.DikeToeAtRiver,
- readSurfaceLine.SetEntryPointAt,
+ readSurfaceLine.SetDikeToeAtRiver,
readSurfaceLine.Name,
RingtoetsPluginResources.CharacteristicPoint_DikeToeAtRiver);
TrySetCharacteristicPoint(
characteristicPointsLocation.DikeToeAtPolder,
- readSurfaceLine.SetExitPointAt,
+ readSurfaceLine.SetDikeToeAtPolder,
readSurfaceLine.Name,
RingtoetsPluginResources.CharacteristicPoint_DikeToeAtPolder);
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -542,7 +542,7 @@
}
[Test]
- public void SetEntryPointAt_PointInGeometry_PointSetFromGeometry()
+ public void SetDikeToeAtRiver_PointInGeometry_PointSetFromGeometry()
{
// Setup
var testX = 1.0;
@@ -558,15 +558,15 @@
CreateTestGeometry(testPoint, surfaceLine);
// Call
- surfaceLine.SetEntryPointAt(testPoint);
+ surfaceLine.SetDikeToeAtRiver(testPoint);
// Assert
- Assert.AreEqual(testPoint, surfaceLine.EntryPoint);
- Assert.AreNotSame(testPoint, surfaceLine.EntryPoint);
+ Assert.AreEqual(testPoint, surfaceLine.DikeToeAtRiver);
+ Assert.AreNotSame(testPoint, surfaceLine.DikeToeAtRiver);
}
[Test]
- public void SetEntryPointAt_GeometryEmpty_ThrowsInvalidOperationException()
+ public void SetDikeToeAtRiver_GeometryEmpty_ThrowsInvalidOperationException()
{
// Setup
var random = new Random(21);
@@ -582,7 +582,7 @@
var surfaceLine = new RingtoetsPipingSurfaceLine();
// Call
- TestDelegate test = () => surfaceLine.SetEntryPointAt(testPoint);
+ TestDelegate test = () => surfaceLine.SetDikeToeAtRiver(testPoint);
// Assert
var message = string.Format(Resources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point,
@@ -591,20 +591,20 @@
}
[Test]
- public void SetEntryPointAt_Null_ThrowsArgumentNullException()
+ public void SetDikeToeAtRiver_Null_ThrowsArgumentNullException()
{
// Setup
var surfaceLine = new RingtoetsPipingSurfaceLine();
// Call
- TestDelegate test = () => surfaceLine.SetEntryPointAt(null);
+ TestDelegate test = () => surfaceLine.SetDikeToeAtRiver(null);
// Assert
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "Cannot find a point in geometry using a null point.");
}
[Test]
- public void SetExitPointAt_PointInGeometry_PointSetFromGeometry()
+ public void SetDikeToeAtPolder_PointInGeometry_PointSetFromGeometry()
{
// Setup
var testX = 1.0;
@@ -620,15 +620,15 @@
CreateTestGeometry(testPoint, surfaceLine);
// Call
- surfaceLine.SetExitPointAt(testPoint);
+ surfaceLine.SetDikeToeAtPolder(testPoint);
// Assert
- Assert.AreEqual(testPoint, surfaceLine.ExitPoint);
- Assert.AreNotSame(testPoint, surfaceLine.ExitPoint);
+ Assert.AreEqual(testPoint, surfaceLine.DikeToeAtPolder);
+ Assert.AreNotSame(testPoint, surfaceLine.DikeToeAtPolder);
}
[Test]
- public void SetExitPointAt_GeometryEmpty_ThrowsInvalidOperationException()
+ public void SetDikeToeAtPolder_GeometryEmpty_ThrowsInvalidOperationException()
{
// Setup
var random = new Random(21);
@@ -644,7 +644,7 @@
var surfaceLine = new RingtoetsPipingSurfaceLine();
// Call
- TestDelegate test = () => surfaceLine.SetExitPointAt(testPoint);
+ TestDelegate test = () => surfaceLine.SetDikeToeAtPolder(testPoint);
// Assert
var message = string.Format(Resources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point,
@@ -653,13 +653,13 @@
}
[Test]
- public void SetExitPointAt_Null_ThrowsArgumentNullException()
+ public void SetDikeToeAtPolder_Null_ThrowsArgumentNullException()
{
// Setup
var surfaceLine = new RingtoetsPipingSurfaceLine();
// Call
- TestDelegate test = () => surfaceLine.SetExitPointAt(null);
+ TestDelegate test = () => surfaceLine.SetDikeToeAtPolder(null);
// Assert
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "Cannot find a point in geometry using a null point.");
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -50,8 +50,8 @@
point1,
point2
});
- surfaceLine.SetEntryPointAt(point1);
- surfaceLine.SetExitPointAt(point2);
+ surfaceLine.SetDikeToeAtRiver(point1);
+ surfaceLine.SetDikeToeAtPolder(point2);
surfaceLine.SetDitchDikeSideAt(point1);
surfaceLine.SetBottomDitchDikeSideAt(point1);
surfaceLine.SetBottomDitchPolderSideAt(point2);
@@ -65,8 +65,8 @@
// Call & Assert
Assert.AreEqual(expectedName, properties.Name);
CollectionAssert.AreEqual(surfaceLine.Points, properties.Points);
- Assert.AreEqual(point1, properties.EntryPoint);
- Assert.AreEqual(point2, properties.ExitPoint);
+ Assert.AreEqual(point1, properties.DikeToeAtRiver);
+ Assert.AreEqual(point2, properties.DikeToeAtPolder);
Assert.AreEqual(point1, properties.DitchDikeSide);
Assert.AreEqual(point1, properties.BottomDitchDikeSide);
Assert.AreEqual(point2, properties.BottomDitchPolderSide);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs
===================================================================
diff -u -re5e9b60b2f5badab0a2b54a4c8542baf124751ce -r9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision e5e9b60b2f5badab0a2b54a4c8542baf124751ce)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 9d1ffc9bd1a9c392c6b832422649a0ad2f5ff59c)
@@ -1069,13 +1069,13 @@
X = 94284.0663827,
Y = 427831.918156,
Z = 1.25
- }, firstSurfaceLine.EntryPoint);
+ }, firstSurfaceLine.DikeToeAtRiver);
Assert.AreEqual(new Point3D
{
X = 94305.3566362,
Y = 427889.900123,
Z = 1.65
- }, firstSurfaceLine.ExitPoint);
+ }, firstSurfaceLine.DikeToeAtPolder);
var secondSurfaceLine = importTargetArray[1];
Assert.AreEqual("ArtifcialLocal", secondSurfaceLine.Name);
@@ -1110,13 +1110,13 @@
X = 2.3,
Y = 0,
Z = 1.0
- }, secondSurfaceLine.EntryPoint);
+ }, secondSurfaceLine.DikeToeAtRiver);
Assert.AreEqual(new Point3D
{
X = 5.7,
Y = 0,
Z = 1.1
- }, secondSurfaceLine.ExitPoint);
+ }, secondSurfaceLine.DikeToeAtPolder);
Assert.AreEqual(7, callCount);