Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 249fd5e4604012895724a9d7df67201332c9e7dc) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -123,15 +123,5 @@ return ResourceManager.GetString("Project_Constructor_Default_name", resourceCulture); } } - - /// - /// Looks up a localized string similar to De geometrie bevat geen punt op locatie ({0},{1},{2}) om als karakteristiek punt in te stellen.. - /// - public static string RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_poi" + - "nt_at_0_1_2_to_assign_as_characteristic_point", resourceCulture); - } - } } } Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 249fd5e4604012895724a9d7df67201332c9e7dc) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -138,7 +138,4 @@ Ringtoets Copyright (C) 2016 Stichting Deltares. Dit programma komt ZONDER ENIGE GARANTIE. Dit programma is gratis en u mag het zelf verder verspreiden en/of aanpassen overeenkomstig de GNU Lesser General Public License versie 3. - - De geometrie bevat geen punt op locatie ({0},{1},{2}) om als karakteristiek punt in te stellen. - \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r63511ecef2fc0350f51475d844b88e870f440075 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 63511ecef2fc0350f51475d844b88e870f440075) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -242,6 +242,16 @@ } /// + /// Looks up a localized string similar to De geometrie bevat geen punt op locatie ({0},{1},{2}) om als karakteristiek punt in te stellen.. + /// + public static string RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point { + get { + return ResourceManager.GetString("RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_poi" + + "nt_at_0_1_2_to_assign_as_characteristic_point", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De profielmeting heeft geen geometrie.. /// public static string RingtoetsPipingSurfaceLine_SurfaceLine_has_no_Geometry { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -r63511ecef2fc0350f51475d844b88e870f440075 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 63511ecef2fc0350f51475d844b88e870f440075) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -186,4 +186,7 @@ Kan uittredepunt niet zetten. + + De geometrie bevat geen punt op locatie ({0},{1},{2}) om als karakteristiek punt in te stellen. + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsPipingSurfaceLine.cs =================================================================== diff -u -r63511ecef2fc0350f51475d844b88e870f440075 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision 63511ecef2fc0350f51475d844b88e870f440075) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -229,7 +229,7 @@ private static ArgumentException CreateCharacteristicPointSetException(Point3D point) { - var message = string.Format(Core.Common.Base.Properties.Resources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point, + var message = string.Format(Resources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point, point.X, point.Y, point.Z); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -r9a426b227a1f3902ae05dea3c2b0e94f4b4551cb -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 9a426b227a1f3902ae05dea3c2b0e94f4b4551cb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -34,6 +34,7 @@ using Ringtoets.Piping.IO.Exceptions; using Ringtoets.Piping.IO.SurfaceLines; using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; using RingtoetsPluginResources = Ringtoets.Piping.Plugin.Properties.Resources; @@ -47,6 +48,14 @@ public class PipingSurfaceLinesCsvImporter : FileImporterBase { private readonly ILog log; + + private readonly Point3D undefinedPoint = new Point3D + { + X = -1, + Y = -1, + Z = -1 + }; + private const string characteristicPointsFileSubExtension = ".krp"; public PipingSurfaceLinesCsvImporter() @@ -329,11 +338,11 @@ var readCharacteristicPointsLocationNames = readCharacteristicPointsLocations.Select(cpl => cpl.Name).ToList(); foreach (var readSurfaceLine in readSurfaceLines) { - var characteristicPointsLocation = readCharacteristicPointsLocations.FirstOrDefault(cpl => cpl.Name == readSurfaceLine.Name); - if (characteristicPointsLocation != null) + var characteristicPoints = readCharacteristicPointsLocations.FirstOrDefault(cpl => cpl.Name == readSurfaceLine.Name); + if (characteristicPoints != null) { - SetCharacteristicPointsOnSurfaceLine(readSurfaceLine, characteristicPointsLocation); - readCharacteristicPointsLocationNames.Remove(characteristicPointsLocation.Name); + SetCharacteristicPointsOnSurfaceLine(readSurfaceLine, characteristicPoints); + readCharacteristicPointsLocationNames.Remove(characteristicPoints.Name); } else if (readCharacteristicPointsLocations.Count > 0) { @@ -372,32 +381,66 @@ readSurfaceLine.SetDitchDikeSideAt, readSurfaceLine.Name, RingtoetsPluginResources.CharacteristicPoint_DitchDikeSide); + + TrySetLForPoint(characteristicPointsLocation.DikeToeAtRiver, + readSurfaceLine, + l => readSurfaceLine.EntryPointL = l, + RingtoetsPluginResources.CharacteristicPoint_DikeToeAtRiver); + + TrySetLForPoint(characteristicPointsLocation.DikeToeAtPolder, + readSurfaceLine, + l => readSurfaceLine.ExitPointL = l, + RingtoetsPluginResources.CharacteristicPoint_DikeToeAtPolder); } - private void TrySetCharacteristicPoint(Point3D point, Action setAction, string surfaceLineName, string characteristicPointType) + private void TrySetLForPoint(Point3D point, RingtoetsPipingSurfaceLine readSurfaceLine, Action setAction, string characteristicPointType) { - var undefinedPoint = new Point3D + if (IsDefined(point)) { - X = -1, - Y = -1, - Z = -1 - }; + var index = readSurfaceLine.Points.ToList().IndexOf(point); + if (index < 0) + { + var message = string.Format(PipingDataResources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point, + point.X, + point.Y, + point.Z); - if (!point.Equals(undefinedPoint)) + log.ErrorFormat(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_CharacteristicPoint_0_of_SurfaceLine_1_skipped_cause_2_, + characteristicPointType, + readSurfaceLine.Name, + message); + } + else + { + var localPoint = readSurfaceLine.ProjectGeometryToLZ().ElementAt(index); + setAction(localPoint.X); + } + } + } + + private void TrySetCharacteristicPoint(Point3D point, Action setAction, string surfaceLineName, string characteristicPointType) + { + if (IsDefined(point)) { try { setAction(point); } catch (ArgumentException e) { - var message = string.Format(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_CharacteristicPoint_0_of_SurfaceLine_1_skipped_cause_2_, - characteristicPointType, surfaceLineName, e.Message); - log.Error(message); + log.ErrorFormat(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_CharacteristicPoint_0_of_SurfaceLine_1_skipped_cause_2_, + characteristicPointType, + surfaceLineName, + e.Message); } } } + private bool IsDefined(Point3D point) + { + return point != null && !point.Equals(undefinedPoint); + } + private void HandleUserCancellingImport() { log.Info(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_Import_Import_cancelled); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rfea3332b5f7a5cea6b41de4a6368c1f1c2bf1282 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fea3332b5f7a5cea6b41de4a6368c1f1c2bf1282) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -79,6 +79,24 @@ } /// + /// Looks up a localized string similar to Teen dijk binnenwaarts. + /// + public static string CharacteristicPoint_DikeToeAtPolder { + get { + return ResourceManager.GetString("CharacteristicPoint_DikeToeAtPolder", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Teen dijk buitenwaarts. + /// + public static string CharacteristicPoint_DikeToeAtRiver { + get { + return ResourceManager.GetString("CharacteristicPoint_DikeToeAtRiver", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Insteek sloot dijkzijde. /// public static string CharacteristicPoint_DitchDikeSide { Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -rfea3332b5f7a5cea6b41de4a6368c1f1c2bf1282 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision fea3332b5f7a5cea6b41de4a6368c1f1c2bf1282) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -203,4 +203,10 @@ Meerdere definities gevonden voor profielmeting '{0}'. + + Teen dijk binnenwaarts + + + Teen dijk buitenwaarts + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs =================================================================== diff -u -r63511ecef2fc0350f51475d844b88e870f440075 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 63511ecef2fc0350f51475d844b88e870f440075) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -246,7 +246,8 @@ TestDelegate test = () => surfaceLine.GetZAtL(l); // Assert - var expectedMessage = "Kan geen hoogte bepalen. L moet in het bereik van [0, 3.1] liggen."; + var expectedMessage = string.Format("Kan geen hoogte bepalen. L moet in het bereik van [{0}, {1}] liggen.", + 0,3.1); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } @@ -442,7 +443,8 @@ TestDelegate test = () => surfaceLine.EntryPointL = testL; // Assert - var expectedMessage = "Kan intredepunt niet zetten. L moet in het bereik van [0, 4.1] liggen."; + var expectedMessage = string.Format("Kan intredepunt niet zetten. L moet in het bereik van [{0}, {1}] liggen.", + 0, 4.1); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs =================================================================== diff -u -rdcd6469f6000957bc1604da8e92bd5ea09e43769 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision dcd6469f6000957bc1604da8e92bd5ea09e43769) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -13,6 +13,7 @@ using Ringtoets.Piping.Plugin.FileImporter; using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using PipingIOResources = Ringtoets.Piping.IO.Properties.Resources; +using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; using UtilsResources = Core.Common.Utils.Properties.Resources; @@ -924,6 +925,61 @@ } [Test] + [TestCase("TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide", "Slootbodem dijkzijde")] + [TestCase("TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide", "Slootbodem polderzijde")] + [TestCase("TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder", "Teen dijk binnenwaarts")] + [TestCase("TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver", "Teen dijk buitenwaarts")] + [TestCase("TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide", "Insteek sloot dijkzijde")] + [TestCase("TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide", "Insteek sloot polderzijde")] + public void Import_FileWithTwoValidLinesAndCharacteristicPointNotOnGeometry_LogInvalidPointDefinition(string fileName, string characteristicPointName) + { + // Setup + string surfaceLines = Path.Combine(pluginTestDataPath, fileName + ".csv"); + string corruptPath = Path.Combine(pluginTestDataPath, fileName + ".krp.csv"); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + mocks.ReplayAll(); + + var importer = new PipingSurfaceLinesCsvImporter(); + int progressCallCount = 0; + importer.ProgressChanged = (name, step, steps) => { progressCallCount++; }; + + var observableSurfaceLinesList = new ObservableList(); + observableSurfaceLinesList.Attach(observer); + + var importResult = false; + + // Call + Action call = () => importResult = importer.Import(observableSurfaceLinesList, surfaceLines); + + // Assert + var pointFormat = string.Format(PipingDataResources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_1_2_to_assign_as_characteristic_point,0,1,2); + var expectedLogMessages = new[] + { + string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_Start_reading_characteristic_points_from_file_0_, + corruptPath), + string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CharacteristicPoint_0_of_SurfaceLine_1_skipped_cause_2_, + characteristicPointName, + "Rotterdam1Invalid", + pointFormat) + }; + TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 2); + Assert.IsTrue(importResult); + + Assert.AreEqual(2, observableSurfaceLinesList.Count, + "Ensure only the two valid surfacelines have been imported."); + Assert.AreEqual(1, observableSurfaceLinesList.Count(sl => sl.Name == "Rotterdam1Invalid")); + Assert.AreEqual(1, observableSurfaceLinesList.Count(sl => sl.Name == "ArtifcialLocal")); + + Assert.AreEqual(7, progressCallCount, + "Expect 1 call for each surfaceline (2 in total) +1 for 0/N progress and for " + + "each characteristic point location (2 in total) +1 for 0/N progress, " + + "and 1 for putting data in model."); + mocks.VerifyAll(); // Ensure there are no calls to UpdateObserver + } + + [Test] public void Import_ImportingToValidTargetWithValidFileWithCharacteristicPoints_ImportSurfaceLinesToCollection() { // Setup @@ -1009,6 +1065,9 @@ Z = 1.45 }, firstSurfaceLine.DitchDikeSide); + Assert.AreEqual(firstSurfaceLine.ProjectGeometryToLZ().ElementAt(2).X, firstSurfaceLine.EntryPointL, double.Epsilon); + Assert.AreEqual(firstSurfaceLine.ProjectGeometryToLZ().ElementAt(4).X, firstSurfaceLine.ExitPointL, double.Epsilon); + var secondSurfaceLine = importTargetArray[1]; Assert.AreEqual("ArtifcialLocal", secondSurfaceLine.Name); Assert.AreEqual(3, secondSurfaceLine.Points.Count()); @@ -1038,6 +1097,9 @@ Z = 1.1 }, secondSurfaceLine.DitchDikeSide); + Assert.AreEqual(secondSurfaceLine.ProjectGeometryToLZ().ElementAt(0).X, secondSurfaceLine.EntryPointL, double.Epsilon); + Assert.AreEqual(secondSurfaceLine.ProjectGeometryToLZ().ElementAt(2).X, secondSurfaceLine.ExitPointL, double.Epsilon); + Assert.AreEqual(7, callCount); Assert.IsTrue(TestHelper.CanOpenFileForWrite(validSurfaceLinesFilePath)); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;X1;Y1;Z1;...;Xn;Yn;Zn;;;;;;;;;;;;;;;;; +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94315.09579;427913.9083;1.66;94325.06145;427941.7668;1.55;94331.17673;427960.1127;1.44 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;;;;;;;;;;;;;;; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide.krp.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide.krp.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchDikeSide.krp.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;0;1;2;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94284.06638;427831.9182;1.25 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;X1;Y1;Z1;...;Xn;Yn;Zn;;;;;;;;;;;;;;;;; +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94315.09579;427913.9083;1.66;94325.06145;427941.7668;1.55;94331.17673;427960.1127;1.44 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;;;;;;;;;;;;;;; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide.krp.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide.krp.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidBottomDitchPolderSide.krp.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;0;1;2;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94284.06638;427831.9182;1.25 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;X1;Y1;Z1;...;Xn;Yn;Zn;;;;;;;;;;;;;;;;; +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94315.09579;427913.9083;1.66;94325.06145;427941.7668;1.55;94331.17673;427960.1127;1.44 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;;;;;;;;;;;;;;; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder.krp.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder.krp.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtPolder.krp.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;0;1;2;94284.06638;427831.9182;1.25 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;X1;Y1;Z1;...;Xn;Yn;Zn;;;;;;;;;;;;;;;;; +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94315.09579;427913.9083;1.66;94325.06145;427941.7668;1.55;94331.17673;427960.1127;1.44 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;;;;;;;;;;;;;;; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver.krp.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver.krp.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDikeToeAtRiver.krp.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;0;1;2 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;X1;Y1;Z1;...;Xn;Yn;Zn;;;;;;;;;;;;;;;;; +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94315.09579;427913.9083;1.66;94325.06145;427941.7668;1.55;94331.17673;427960.1127;1.44 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;;;;;;;;;;;;;;; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide.krp.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide.krp.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchDikeSide.krp.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;0;1;2;94305.35664;427889.9001;1.65;94284.06638;427831.9182;1.25 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;X1;Y1;Z1;...;Xn;Yn;Zn;;;;;;;;;;;;;;;;; +Rotterdam1Invalid;94263.00262;427776.6541;-1.02;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94315.09579;427913.9083;1.66;94325.06145;427941.7668;1.55;94331.17673;427960.1127;1.44 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;;;;;;;;;;;;;;; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide.krp.csv =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide.krp.csv (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_CharacteristicPointsInvalidDitchPolderSide.krp.csv (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -0,0 +1,3 @@ +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1Invalid;0;1;2;94275.91267;427811.0809;-1.04;94284.06638;427831.9182;1.25;94294.938;427858.1912;1.45;94305.35664;427889.9001;1.65;94284.06638;427831.9182;1.25 +ArtifcialLocal;2.3;0;1;4.4;0;2;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1 Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_WithCharacteristicPoints.krp.csv =================================================================== diff -u -rfea3332b5f7a5cea6b41de4a6368c1f1c2bf1282 -r1abce3b7d9611e826388ff49f3faf8cb1040f80c --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_WithCharacteristicPoints.krp.csv (.../TwoValidSurfaceLines_WithCharacteristicPoints.krp.csv) (revision fea3332b5f7a5cea6b41de4a6368c1f1c2bf1282) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/test-data/SurfaceLines/TwoValidSurfaceLines_WithCharacteristicPoints.krp.csv (.../TwoValidSurfaceLines_WithCharacteristicPoints.krp.csv) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) @@ -1,3 +1,3 @@ -Profielnaam;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; -Rotterdam1;94263.0026213;427776.654093;-1.02;94275.9126686;427811.080886;-1.04;94284.0663827;427831.918156;1.25;94294.9380015;427858.191234;1.45 -ArtifcialLocal;2.3;0;1.0;4.4;0;2.0;5.7;0;1.1;5.7;0;1.1 \ No newline at end of file +Profielnaam;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_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts +Rotterdam1;94263.0026213;427776.654093;-1.02;94275.9126686;427811.080886;-1.04;94284.0663827;427831.918156;1.25;94294.9380015;427858.191234;1.45;94305.3566362;427889.900123;1.65;94284.0663827;427831.918156;1.25 +ArtifcialLocal;2.3;0;1.0;4.4;0;2.0;5.7;0;1.1;5.7;0;1.1;5.7;0;1.1;2.3;0;1.0 \ No newline at end of file