Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs =================================================================== diff -u -r7059 -r7073 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 7059) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 7073) @@ -963,6 +963,18 @@ return soilProfile2D; } + /// + /// Creates a rectangular soil layer. + /// + /// The top coordinate of the layer. + /// The bottom coordinate of the layer. + /// The left coordinate of the layer. + /// The right coordinate of the layer. + /// The soil profile 2D containing this created layer. + /// The soil material of the layer. + /// Indicates if the layer is an aquifer. + /// Indicates if the layer should be added to the soil profile as a surface. + /// public static SoilLayer2D CreateRectangularSoilLayer2D(double topCoord, double bottomCoord, double leftCoord, double rightCoord, SoilProfile2D soilProfile2D, Soil soil = null, bool isAquifer = false, bool addLayerAsSurface = true) { @@ -1009,6 +1021,15 @@ ], soil, soilProfile2D, isAquifer); } + /// + /// Creates a polygonal soil layer. + /// + /// The points defining the polygon. + /// The soil material of the layer. + /// The soil profile 2D containing this created layer. + /// Indicates if the layer is an aquifer. + /// Indicates if the layer should be added to the soil profile as a surface. + /// public static SoilLayer2D CreatePolygonSoilLayer2D(List points, Soil soil, SoilProfile2D soilProfile2D, bool isAquifer = false, bool addLayerAsSurface = true) { var soilLayer2D = new SoilLayer2D Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryPointString.cs =================================================================== diff -u -r7071 -r7073 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryPointString.cs (.../GeometryPointString.cs) (revision 7071) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryPointString.cs (.../GeometryPointString.cs) (revision 7073) @@ -491,7 +491,13 @@ return RelativeXzPosition.OnGeometricLine; } - + + /// + /// Determines the relative position of a point to the geometric line in the XZ-plane. + /// + /// The point to check the position for. + /// The extrapolation mode to use when determining the position. + /// public RelativeXzPosition PositionXzOfPointRelatedToExtrapolatedLine(Point2D point, ExtraPolationMode extraPolationMode = ExtraPolationMode.Beyond) { Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs =================================================================== diff -u -r7071 -r7073 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs (.../IssuesTests.cs) (revision 7071) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs (.../IssuesTests.cs) (revision 7073) @@ -77,6 +77,8 @@ private static void TestGeometryAndResult(string calcDirectory, string xmlInput, string location, string segment, int surfaceCount, int curveCount, int pointCount, int surfaceLinePointCount, double safetyFactor) { + const string partOfActualExceptionMessage = "DAM kon geen geldig 2D‑grondprofiel genereren bij het " + + "combineren van de hoogtegeometrie uit het CSV‑bestand met het grondprofiel uit het STIX‑bestand."; if (Directory.Exists(calcDirectory)) { Directory.Delete(calcDirectory, true); // delete previous results @@ -103,7 +105,7 @@ Soil soil = engineInterface.DamProjectData.Dike.SoilList.GetSoilByName(soilName); // To be able to check the geometry, create it here. SoilGeometryProbability soilProfile2DOriginal = engineInterface.DamProjectData.Segments.First(s => s.Name == segment).SoilProfileProbabilities[0]; - var expectedException = ""; + var actualExceptionMessage = ""; SoilProfile2D soilProfile2D = null; try { @@ -116,13 +118,12 @@ } catch (Exception exception) { - expectedException = exception.Message; + actualExceptionMessage = exception.Message; } if (surfaceCount == 0) { - Assert.That(expectedException, Does.Contain("DAM kon geen geldig 2D‑grondprofiel genereren bij het " + - "combineren van de hoogtegeometrie uit het CSV‑bestand met het grondprofiel uit het STIX‑bestand.")); + Assert.That(actualExceptionMessage, Does.Contain(partOfActualExceptionMessage)); } else {