Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs
===================================================================
diff -u -r4000 -r4052
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs	(.../SurfaceLine2Validator.cs)	(revision 4000)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs	(.../SurfaceLine2Validator.cs)	(revision 4052)
@@ -27,133 +27,132 @@
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Validation;
 
-namespace Deltares.DamEngine.Data.Geotechnics
+namespace Deltares.DamEngine.Data.Geotechnics;
+
+/// <summary>
+/// Validator for <see cref="SurfaceLine2"/>.
+/// </summary>
+public class SurfaceLine2Validator
 {
     /// <summary>
-    /// Validator for <see cref="SurfaceLine2"/>.
+    /// Performs all validation checks for a surfaceline.
     /// </summary>
-    public class SurfaceLine2Validator
+    /// <param name="surfaceline">The surfaceline being evaluated.</param>
+    /// <returns>The collection of validation results.</returns>
+    public IEnumerable<ValidationResult> Validate(SurfaceLine2 surfaceline)
     {
-        /// <summary>
-        /// Performs all validation checks for a surfaceline.
-        /// </summary>
-        /// <param name="surfaceline">The surfaceline being evaluated.</param>
-        /// <returns>The collection of validation results.</returns>
-        public IEnumerable<ValidationResult> Validate(SurfaceLine2 surfaceline)
-        {
-            return ValidateGeometryPointsAreOrdered(surfaceline)
-                   .Concat(ValidateCharacteristicPointsAreOrdered(surfaceline))
-                   .Concat(ValidateDikeShape(surfaceline));
-        }
+        return ValidateGeometryPointsAreOrdered(surfaceline)
+               .Concat(ValidateCharacteristicPointsAreOrdered(surfaceline))
+               .Concat(ValidateDikeShape(surfaceline));
+    }
 
-        /// <summary>
-        /// Checks if all <see cref="GeometryPoint"/> instances in <see cref="SurfaceLine2.Geometry"/>
-        /// are ordered on ascending X.
-        /// </summary>
-        /// <param name="surfaceline">The surfaceline being evaluated.</param>
-        /// <returns>The collection of validation results.</returns>
-        public IEnumerable<ValidationResult> ValidateGeometryPointsAreOrdered(SurfaceLine2 surfaceline)
+    /// <summary>
+    /// Checks if all <see cref="GeometryPoint"/> instances in <see cref="SurfaceLine2.Geometry"/>
+    /// are ordered on ascending X.
+    /// </summary>
+    /// <param name="surfaceline">The surfaceline being evaluated.</param>
+    /// <returns>The collection of validation results.</returns>
+    public IEnumerable<ValidationResult> ValidateGeometryPointsAreOrdered(SurfaceLine2 surfaceline)
+    {
+        if (!ArePointsAscending(surfaceline))
         {
-            if (!ArePointsAscending(surfaceline))
-            {
-                yield return new ValidationResult(ValidationResultType.Error, this.Translate("SurfacePointsNotAscending"),
-                                                  surfaceline, surfaceline.GetMemberName(sl => sl.Geometry), "");
-            }
+            yield return new ValidationResult(ValidationResultType.Error, this.Translate("SurfacePointsNotAscending"),
+                                              surfaceline, surfaceline.GetMemberName(sl => sl.Geometry), "");
         }
+    }
 
-        /// <summary>
-        /// Checks if all characteristic points that require proper ordering based on X coordinate
-        /// are indeed properly ordered.
-        /// </summary>
-        /// <param name="surfaceline">The surfaceline being evaluated.</param>
-        /// <returns>The collection of validation results.</returns>
-        public IEnumerable<ValidationResult> ValidateCharacteristicPointsAreOrdered(SurfaceLine2 surfaceline)
+    /// <summary>
+    /// Checks if all characteristic points that require proper ordering based on X coordinate
+    /// are indeed properly ordered.
+    /// </summary>
+    /// <param name="surfaceline">The surfaceline being evaluated.</param>
+    /// <returns>The collection of validation results.</returns>
+    public IEnumerable<ValidationResult> ValidateCharacteristicPointsAreOrdered(SurfaceLine2 surfaceline)
+    {
+        if (!AreAllCharacteristicPointsXCoordinatesAscending(surfaceline))
         {
-            if (!AreAllCharacteristicPointsXCoordinatesAscending(surfaceline))
-            {
-                yield return new ValidationResult(ValidationResultType.Error, this.Translate("ChartPointsNotAscending"),
-                                                  surfaceline, surfaceline.GetMemberName(sl => sl.CharacteristicPoints), "");
-            }
+            yield return new ValidationResult(ValidationResultType.Error, this.Translate("ChartPointsNotAscending"),
+                                              surfaceline, surfaceline.GetMemberName(sl => sl.CharacteristicPoints), "");
         }
+    }
 
-        /// <summary>
-        /// Ares all characteristic points x coordinates ascending.
-        /// </summary>
-        /// <param name="line">The line.</param>
-        /// <returns></returns>
-        public static bool AreAllCharacteristicPointsXCoordinatesAscending(SurfaceLine2 line)
-        {
-            CharacteristicPoint[] points = line.GetCharacteristicPointsRequiringAscendingX().ToArray();
-            return AreGeometryPointsXCoordinatesAscending(points);
-        }
+    /// <summary>
+    /// Ares all characteristic points x coordinates ascending.
+    /// </summary>
+    /// <param name="line">The line.</param>
+    /// <returns></returns>
+    public static bool AreAllCharacteristicPointsXCoordinatesAscending(SurfaceLine2 line)
+    {
+        CharacteristicPoint[] points = line.GetCharacteristicPointsRequiringAscendingX().ToArray();
+        return AreGeometryPointsXCoordinatesAscending(points);
+    }
 
-        /// <summary>
-        /// Determines whether all characteristic points are in correct shape.
-        /// </summary>
-        /// <returns><c>true</c> if all characteristic are in correct shape, otherwise <c>false</c></returns>
-        public static bool AreAllCharacteristicPointsInCorrectShape(SurfaceLine2 line)
-        {
-            // when there are no points to check, make sure true is returned.
-            var result = true;
+    /// <summary>
+    /// Determines whether all characteristic points are in correct shape.
+    /// </summary>
+    /// <returns><c>true</c> if all characteristic are in correct shape, otherwise <c>false</c></returns>
+    public static bool AreAllCharacteristicPointsInCorrectShape(SurfaceLine2 line)
+    {
+        // when there are no points to check, make sure true is returned.
+        var result = true;
 
-            if (line.IsDefined(CharacteristicPointType.DikeToeAtRiver) && line.IsDefined(CharacteristicPointType.DikeTopAtRiver))
-            {
-                result = line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z < line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z;
-            }
-
-            if (line.IsDefined(CharacteristicPointType.DikeToeAtPolder) && line.IsDefined(CharacteristicPointType.DikeTopAtPolder))
-            {
-                result = result && line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z < line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z;
-            }
-
-            return result;
+        if (line.IsDefined(CharacteristicPointType.DikeToeAtRiver) && line.IsDefined(CharacteristicPointType.DikeTopAtRiver))
+        {
+            result = line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z < line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z;
         }
 
-        /// <summary>
-        /// Checks if the shape of the dike is proper.
-        /// </summary>
-        /// <param name="surfaceline">The surfaceline being evaluated.</param>
-        /// <returns>The collection of validation results.</returns>
-        private IEnumerable<ValidationResult> ValidateDikeShape(SurfaceLine2 surfaceline)
+        if (line.IsDefined(CharacteristicPointType.DikeToeAtPolder) && line.IsDefined(CharacteristicPointType.DikeTopAtPolder))
         {
-            if (!AreAllCharacteristicPointsInCorrectShape(surfaceline))
-            {
-                yield return new ValidationResult(ValidationResultType.Error,
-                                                  this.Translate("ImproperDikeShape"), surfaceline);
-            }
+            result = result && line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z < line.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z;
         }
 
-        private bool ArePointsAscending(SurfaceLine2 line)
+        return result;
+    }
+
+    /// <summary>
+    /// Checks if the shape of the dike is proper.
+    /// </summary>
+    /// <param name="surfaceline">The surfaceline being evaluated.</param>
+    /// <returns>The collection of validation results.</returns>
+    private IEnumerable<ValidationResult> ValidateDikeShape(SurfaceLine2 surfaceline)
+    {
+        if (!AreAllCharacteristicPointsInCorrectShape(surfaceline))
         {
-            return AreGeometryPointsXCoordinatesAscending(line.Geometry.Points);
+            yield return new ValidationResult(ValidationResultType.Error,
+                                              this.Translate("ImproperDikeShape"), surfaceline);
         }
+    }
 
-        private static bool AreGeometryPointsXCoordinatesAscending(IList<GeometryPoint> points)
+    private bool ArePointsAscending(SurfaceLine2 line)
+    {
+        return AreGeometryPointsXCoordinatesAscending(line.Geometry.Points);
+    }
+
+    private static bool AreGeometryPointsXCoordinatesAscending(IList<GeometryPoint> points)
+    {
+        for (var i = 1; i < points.Count; i++)
         {
-            for (var i = 1; i < points.Count; i++)
+            if (points[i].X < points[i - 1].X + GeometryConstants.Accuracy)
             {
-                if (points[i].X < points[i - 1].X + GeometryConstants.Accuracy)
+                // #Bka: if fact we now should return FALSE immediately but there is a snag. Due to faults with adding characteristic 
+                //       points to a surface line, some surface lines can have identical points (in Location) but with different 
+                //       characteristic (e.g. diktop and trafficload combined). These points should use the same refence to the point
+                //       but it occurs that TWO fysical (and identical) points are added.
+                //       So these points must now be ignored (so identical points must be seen as OK). This is in fact ok for the purpose
+                //       of the validation ast the main problem is that points may never give a vertical part in the geometry.
+                if ((Math.Abs(points[i].X - points[i - 1].X) < GeometryConstants.Accuracy) && (Math.Abs(points[i].Z - points[i - 1].Z) < GeometryConstants.Accuracy))
                 {
-                    // #Bka: if fact we now should return FALSE immediately but there is a snag. Due to faults with adding characteristic 
-                    //       points to a surface line, some surface lines can have identical points (in Location) but with different 
-                    //       characteristic (e.g. diktop and trafficload combined). These points should use the same refence to the point
-                    //       but it occurs that TWO fysical (and identical) points are added.
-                    //       So these points must now be ignored (so identical points must be seen as OK). This is in fact ok for the purpose
-                    //       of the validation ast the main problem is that points may never give a vertical part in the geometry.
-                    if ((Math.Abs(points[i].X - points[i - 1].X) < GeometryConstants.Accuracy) && (Math.Abs(points[i].Z - points[i - 1].Z) < GeometryConstants.Accuracy))
-                    {
-                        // Make sure points are made identical
-                        points[i].X = points[i - 1].X;
-                        points[i].Z = points[i - 1].Z;
-                    }
-                    else
-                    {
-                        return false;
-                    }
+                    // Make sure points are made identical
+                    points[i].X = points[i - 1].X;
+                    points[i].Z = points[i - 1].Z;
                 }
+                else
+                {
+                    return false;
+                }
             }
-
-            return true;
         }
+
+        return true;
     }
 }
\ No newline at end of file