Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs =================================================================== diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision f88343c0590cb04c7135ce141872940e59325927) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -55,9 +55,16 @@ { IEnumerable importedClosingStructures = CreateClosingStructures(structureLocations.ToList(), groupedStructureParameterRows); - foreach (ClosingStructure closingStructure in importedClosingStructures) + foreach (ClosingStructure structure in importedClosingStructures) { - ImportTarget.Add(closingStructure); + if (ImportTarget.Select(s => s.Id).Contains(structure.Id)) + { + LogStructureExisting(structure.Id); + } + else + { + ImportTarget.Add(structure); + } } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs =================================================================== diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs (.../ClosingStructuresImporterTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/ClosingStructuresImporterTest.cs (.../ClosingStructuresImporterTest.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -203,7 +203,7 @@ { // Setup string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.ClosingStructures.IO, - Path.Combine(nameof(ClosingStructuresImporter), "Kunstwerken.shp")); + Path.Combine(nameof(ClosingStructuresImporter), "MissingParameters", "Kunstwerken.shp")); ReferenceLine referenceLine = CreateReferenceLine(); @@ -244,6 +244,45 @@ Assert.AreEqual(defaultStructure.FailureProbabilityReparation, importedStructure.FailureProbabilityReparation); } + [Test] + public void Import_ImportingAlreadyExistingStructures_LogAndTrue() + { + // Setup + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.ClosingStructures.IO, + Path.Combine(nameof(ClosingStructuresImporter), "SeveralStructures", "kunstwerken_12_2_sluiting.shp")); + + var referencePoints = new List + { + new Point2D(136274.908, 536499.510), + new Point2D(135070.069, 542897.615), + new Point2D(132918.827, 547187.001), + new Point2D(131522.536, 548951.128) + }; + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(referencePoints); + + var importTarget = new ObservableList(); + var structuresImporter = new ClosingStructuresImporter(importTarget, referenceLine, filePath); + structuresImporter.Import(); + importTarget.RemoveAt(2); + + var importResult = false; + + // Call + Action call = () => importResult = structuresImporter.Import(); + + // Assert + var expectedMessages = new[] + { + Tuple.Create("Kunstwerk 'KWK_1' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + Tuple.Create("Kunstwerk 'KWK_2' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + Tuple.Create("Kunstwerk 'KWK_4' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + }; + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3); + Assert.IsTrue(importResult); + Assert.AreEqual(4, importTarget.Count); + } + private static ReferenceLine CreateReferenceLine() { var referencePoints = new List Fisheye: Tag 96708dc3012a1398efc8829a487369abc24a64c1 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/Kunstwerken.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/Kunstwerken.dbf =================================================================== diff -u -r006e2461c3c2f32451e7f8715e3cece92230a27a -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Fisheye: Tag 96708dc3012a1398efc8829a487369abc24a64c1 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/Kunstwerken.prj'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/Kunstwerken.shp =================================================================== diff -u -r006e2461c3c2f32451e7f8715e3cece92230a27a -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/Kunstwerken.shx =================================================================== diff -u -r006e2461c3c2f32451e7f8715e3cece92230a27a -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.csv =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.csv (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.csv (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1,12 @@ +Namespace;Identificatie;Versie;Kunstwerken.identificatie;Parameter.code;Parameter.omschrijving;Grootheid.code;Grootheid.omschrijving;Eenheid.code;Eenheid.omschrijving;Hoedanigheid.code;Hoedanigheid.omschrijving;Waardebepalingsmethode.code;Waardebepalingsmethode.codespace;Waardebewerkingsmethode.code;Waardebewerkingsmethode.codespace;AlfanumeriekeWaarde;NumeriekeWaarde;Standaardafwijking.variatie;Boolean;Kwaliteitsoordeel.code +12;KUNST1;1;KW_BETSLUIT2;2;2;2;2;2;2;;;2;;;;;1;0.01;0; +12;KUNST1;1;KW_BETSLUIT3;3;3;3;3;3;3;;;3;;;;;1;0;0; +12;KUNST1;1;KW_BETSLUIT4;4;4;4;4;4;4;;;4;;;;;1;0.01;0; +12;KUNST1;1;KW_BETSLUIT6;6;6;6;6;6;6;;;6;;;;;1;0.01;0; +12;KUNST1;1;KW_BETSLUIT7;7;7;7;7;7;7;;;7;;;;;1;0.01;0; +12;KUNST1;1;KW_BETSLUIT9;9;9;9;9;9;9;;;9;;;;;1;0.01;0; +12;KUNST1;1;KW_BETSLUIT10;10;10;10;10;10;10;;;10;;;;;1;0;0; +12;KUNST1;1;KW_BETSLUIT11;11;11;11;11;11;11;;;11;;;;;1;0;0; +12;KUNST1;1;KW_BETSLUIT12;12;12;12;12;12;12;;;12;;;;;1;0;0; +12;KUNST1;1;KW_BETSLUIT13;13;13;13;13;13;13;;;13;;;;;1;0;0; +12;KUNST1;1;KW_BETSLUIT15;15;15;15;15;15;15;;;15;;;;LageDrempel;1;0;0; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.dbf =================================================================== diff -u Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.prj =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.prj (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.prj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.shp =================================================================== diff -u Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/MissingParameters/Kunstwerken.shx =================================================================== diff -u Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.csv =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.csv (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.csv (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1,61 @@ +Identificatie;Kunstwerken.identificatie;AlfanumeriekeWaarde;NumeriekeWaarde;Standaardafwijking.variatie;Boolean +KWK_1;KW_BETSLUIT1;; 20000.11; 0.1;0 +KWK_1;KW_BETSLUIT2;; 0.21; 0.1;1 +KWK_1;KW_BETSLUIT3;; 11.11; 0;0 +KWK_1;KW_BETSLUIT4;; 21.11; 0.05;1 +KWK_1;KW_BETSLUIT5;; 4.91; 0.05;1 +KWK_1;KW_BETSLUIT6;; 0.51; 0.1;1 +KWK_1;KW_BETSLUIT7;; 4.11; 0.1;1 +KWK_1;KW_BETSLUIT8;; 31.51; 0.01;1 +KWK_1;KW_BETSLUIT9;; 1.11; 0.15;0 +KWK_1;KW_BETSLUIT10;; 25.11; 0.05;1 +KWK_1;KW_BETSLUIT11;; 0.0909; 0;0 +KWK_1;KW_BETSLUIT12;; 0.1; 0;0 +KWK_1;KW_BETSLUIT13;; 11; 0;1 +KWK_1;KW_BETSLUIT14;; 0.009009; 0;1 +KWK_1;KW_BETSLUIT15;VerdronkenKoker;; ; +KWK_2;KW_BETSLUIT1;; 20000.22; 0.1;0 +KWK_2;KW_BETSLUIT2;; 0.22; 0.1;1 +KWK_2;KW_BETSLUIT3;; 11.22; 0;0 +KWK_2;KW_BETSLUIT4;; 21.22; 0.05;1 +KWK_2;KW_BETSLUIT5;; 4.92; 0.05;1 +KWK_2;KW_BETSLUIT6;; 0.52; 0.1;1 +KWK_2;KW_BETSLUIT7;; 4.22; 0.1;1 +KWK_2;KW_BETSLUIT8;; 31.52; 0.01;1 +KWK_2;KW_BETSLUIT9;; 1.22; 0.15;0 +KWK_2;KW_BETSLUIT10;; 25.22; 0.05;1 +KWK_2;KW_BETSLUIT11;; 0.04545; 0;0 +KWK_2;KW_BETSLUIT12;; 0.05; 0;0 +KWK_2;KW_BETSLUIT13;; 22; 0;1 +KWK_2;KW_BETSLUIT14;; 0.0045045; 0;1 +KWK_2;KW_BETSLUIT15;verticalewand;; ; +KWK_3;KW_BETSLUIT1;; 20000.33; 0.1;0 +KWK_3;KW_BETSLUIT2;; 0.23; 0.1;1 +KWK_3;KW_BETSLUIT3;; 11.33; 0;0 +KWK_3;KW_BETSLUIT4;; 21.33; 0.05;1 +KWK_3;KW_BETSLUIT5;; 4.93; 0.05;1 +KWK_3;KW_BETSLUIT6;; 0.53; 0.1;1 +KWK_3;KW_BETSLUIT7;; 4.13; 0.1;1 +KWK_3;KW_BETSLUIT8;; 31.53; 0.01;1 +KWK_3;KW_BETSLUIT9;; 1.33; 0.15;0 +KWK_3;KW_BETSLUIT10;; 25.33; 0.05;1 +KWK_3;KW_BETSLUIT11;; 0.030303; 0;0 +KWK_3;KW_BETSLUIT12;; 0.03333; 0;0 +KWK_3;KW_BETSLUIT13;; 33; 0;1 +KWK_3;KW_BETSLUIT14;; 0.003003; 0;1 +KWK_3;KW_BETSLUIT15;LageDrempel;; ; +KWK_4;KW_BETSLUIT1;; 20000.44; 0.1;0 +KWK_4;KW_BETSLUIT2;; 0.24; 0.1;1 +KWK_4;KW_BETSLUIT3;; 11.44; 0;0 +KWK_4;KW_BETSLUIT4;; 21.44; 0.05;1 +KWK_4;KW_BETSLUIT5;; 4.94; 0.05;1 +KWK_4;KW_BETSLUIT6;; 0.54; 0.1;1 +KWK_4;KW_BETSLUIT7;; 4.14; 0.1;1 +KWK_4;KW_BETSLUIT8;; 31.54; 0.01;1 +KWK_4;KW_BETSLUIT9;; 1.44; 0.15;0 +KWK_4;KW_BETSLUIT10;; 25.44; 0.05;1 +KWK_4;KW_BETSLUIT11;; 0.022727; 0;0 +KWK_4;KW_BETSLUIT12;; 0.025; 0;0 +KWK_4;KW_BETSLUIT13;; 44; 0;1 +KWK_4;KW_BETSLUIT14;; 0.00225225; 0;1 +KWK_4;KW_BETSLUIT15;verticalewand;; ; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.dbf =================================================================== diff -u Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.prj =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.prj (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.prj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["Amersfoort_RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["Meter",1]] \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.qpj =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.qpj (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.qpj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["Amersfoort / RD New",GEOGCS["Amersfoort",DATUM["Amersfoort",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725],AUTHORITY["EPSG","6289"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4289"]],PROJECTION["Oblique_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","28992"]] Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.shp =================================================================== diff -u Binary files differ Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresImporter/SeveralStructures/kunstwerken_12_2_sluiting.shx =================================================================== diff -u Binary files differ Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -90,6 +90,15 @@ } /// + /// Logs a warning for an already existing structure in the import target. + /// + /// The structure id which already exists. + protected void LogStructureExisting(string structureId) + { + log.WarnFormat(Resources.StructuresImporter_LogStructureExisting_Structure_0_already_imported, structureId); + } + + /// /// Create structure objects from location and geometry data. /// /// The read structure locations. Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r27bbcb784f41b02ded9416b5ac0f40e4c3f99d23 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 27bbcb784f41b02ded9416b5ac0f40e4c3f99d23) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -1658,6 +1658,15 @@ } /// + /// Looks up a localized string similar to Kunstwerk '{0}' is al geïmporteerd en wordt overgeslagen.. + /// + public static string StructuresImporter_LogStructureExisting_Structure_0_already_imported { + get { + return ResourceManager.GetString("StructuresImporter_LogStructureExisting_Structure_0_already_imported", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Klik op details voor meer informatie. ///{0}. /// Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -r27bbcb784f41b02ded9416b5ac0f40e4c3f99d23 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 27bbcb784f41b02ded9416b5ac0f40e4c3f99d23) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -646,4 +646,7 @@ Voorlandprofiel '{0}' is al geïmporteerd en wordt overgeslagen. + + Kunstwerk '{0}' is al geïmporteerd en wordt overgeslagen. + \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs =================================================================== diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs (.../HeightStructuresImporter.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs (.../HeightStructuresImporter.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -55,9 +55,16 @@ { IEnumerable importedHeightStructures = CreateHeightStructures(structureLocations.ToList(), groupedStructureParameterRows); - foreach (HeightStructure heightStructure in importedHeightStructures) + foreach (HeightStructure structure in importedHeightStructures) { - ImportTarget.Add(heightStructure); + if (ImportTarget.Select(s => s.Id).Contains(structure.Id)) + { + LogStructureExisting(structure.Id); + } + else + { + ImportTarget.Add(structure); + } } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresImporterTest.cs =================================================================== diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresImporterTest.cs (.../HeightStructuresImporterTest.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresImporterTest.cs (.../HeightStructuresImporterTest.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -171,7 +171,7 @@ { // Setup string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HeightStructures.IO, - Path.Combine(nameof(HeightStructuresImporter), "Kunstwerken.shp")); + Path.Combine(nameof(HeightStructuresImporter), "MissingParameters", "Kunstwerken.shp")); ReferenceLine referenceLine = CreateReferenceLine(); @@ -210,6 +210,45 @@ } [Test] + public void Import_ImportingAlreadyExistingStructures_LogAndTrue() + { + // Setup + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HeightStructures.IO, + Path.Combine(nameof(HeightStructuresImporter), "SeveralStructures", "kunstwerken_12_2_hoogte.shp")); + + var referencePoints = new List + { + new Point2D(135886.504, 532243.083), + new Point2D(136372.653, 537572.658), + new Point2D(134604.394, 543826.847), + new Point2D(132429.513, 548163.831) + }; + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(referencePoints); + + var importTarget = new ObservableList(); + var structuresImporter = new HeightStructuresImporter(importTarget, referenceLine, filePath); + structuresImporter.Import(); + importTarget.RemoveAt(2); + + var importResult = false; + + // Call + Action call = () => importResult = structuresImporter.Import(); + + // Assert + var expectedMessages = new[] + { + Tuple.Create("Kunstwerk 'KWK_1' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + Tuple.Create("Kunstwerk 'KWK_2' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + Tuple.Create("Kunstwerk 'KWK_4' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + }; + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3); + Assert.IsTrue(importResult); + Assert.AreEqual(4, importTarget.Count); + } + + [Test] public void Import_ParameterIdsWithVaryingCase_TrueAndImportTargetUpdated() { // Setup Fisheye: Tag 96708dc3012a1398efc8829a487369abc24a64c1 refers to a dead (removed) revision in file `Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/Kunstwerken.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/Kunstwerken.dbf =================================================================== diff -u -r492fe6c36c8cfc83d4c624bad14fb4f5120c953d -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Fisheye: Tag 96708dc3012a1398efc8829a487369abc24a64c1 refers to a dead (removed) revision in file `Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/Kunstwerken.prj'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/Kunstwerken.shp =================================================================== diff -u -r492fe6c36c8cfc83d4c624bad14fb4f5120c953d -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/Kunstwerken.shx =================================================================== diff -u -r492fe6c36c8cfc83d4c624bad14fb4f5120c953d -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.csv =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.csv (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.csv (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1,6 @@ +Namespace;Identificatie;Versie;Kunstwerken.identificatie;Parameter.code;Parameter.omschrijving;Grootheid.code;Grootheid.omschrijving;Eenheid.code;Eenheid.omschrijving;Hoedanigheid.code;Hoedanigheid.omschrijving;Waardebepalingsmethode.code;Waardebepalingsmethode.codespace;Waardebewerkingsmethode.code;Waardebewerkingsmethode.codespace;AlfanumeriekeWaarde;NumeriekeWaarde;Standaardafwijking.variatie;Boolean;Kwaliteitsoordeel.code +12;KUNST1;1;KW_HOOGTE2;KRUIN;Kruin;NIVEAU;Niveau;m;meter;;;Schematiseringshandleiding;;;;;5.9;0.01;1; +12;KUNST1;1;KW_HOOGTE4;OVS;Overslag;DEBIET;Debiet;m3/s/m;kubieke meter per seconden per meter;;;Schematiseringshandleiding;;;;;0.1;0.15;0; +12;KUNST1;1;KW_HOOGTE5;KRUIN;Kruin;BREEDTE;Breedte;m;meter;;;Schematiseringshandleiding;;;;;4;0.05;1; +12;KUNST1;1;KW_HOOGTE7;KOMBERG;Komberging;OPPERVLAKTE;Oppervlakte;m2;vierkante meter;;;Schematiseringshandleiding;;;;;500000;0.1;0; +12;KUNST1;1;KW_HOOGTE8;PEIL;Peil;VERHOGING;Verhoging;m;meter;;;Schematiseringshandleiding;;;;;6.5;0.1;0; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.dbf =================================================================== diff -u Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.prj =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.prj (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.prj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.shp =================================================================== diff -u Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/MissingParameters/Kunstwerken.shx =================================================================== diff -u Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.csv =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.csv (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.csv (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1,33 @@ +Identificatie;Kunstwerken.identificatie;AlfanumeriekeWaarde;NumeriekeWaarde;Standaardafwijking.variatie;Boolean +KWK_1;KW_HOOGTE1; ; 11.63; 0.01;1 +KWK_1;KW_HOOGTE3; ; 18.11; 0.02;1 +KWK_1;KW_HOOGTE5; ; 4.11; 0.03;1 +KWK_1;KW_HOOGTE7; ;511000; 0.04;0 +KWK_1;KW_HOOGTE8; ; 6.11; 0.05;1 +KWK_1;KW_HOOGTE2; ; 5.11; 0.06;1 +KWK_1;KW_HOOGTE4; ; 0.11; 0.07;0 +KWK_1;KW_HOOGTE6; ; 0.10; 0.08;1 +KWK_2;KW_HOOGTE1; ; 22.63; 0.01;1 +KWK_2;KW_HOOGTE3; ; 18.22; 0.02;1 +KWK_2;KW_HOOGTE5; ; 4.22; 0.03;1 +KWK_2;KW_HOOGTE7; ;522000; 0.04;0 +KWK_2;KW_HOOGTE8; ; 6.22; 0.05;1 +KWK_2;KW_HOOGTE2; ; 5.22; 0.06;1 +KWK_2;KW_HOOGTE4; ; 0.22; 0.07;0 +KWK_2;KW_HOOGTE6; ; 0.05; 0.08;1 +KWK_3;KW_HOOGTE1; ; 33.63; 0.01;1 +KWK_3;KW_HOOGTE3; ; 18.33; 0.02;1 +KWK_3;KW_HOOGTE5; ; 4.33; 0.03;1 +KWK_3;KW_HOOGTE7; ;533000; 0.04;0 +KWK_3;KW_HOOGTE8; ; 6.33; 0.05;1 +KWK_3;KW_HOOGTE2; ; 5.33; 0.06;1 +KWK_3;KW_HOOGTE4; ; 0.33; 0.07;0 +KWK_3;KW_HOOGTE6; ; 0.033; 0.08;1 +KWK_4;KW_HOOGTE1; ; 44.63; 0.01;1 +KWK_4;KW_HOOGTE3; ; 18.44; 0.02;1 +KWK_4;KW_HOOGTE5; ; 4.44; 0.03;1 +KWK_4;KW_HOOGTE7; ;544000; 0.04;0 +KWK_4;KW_HOOGTE8; ; 6.44; 0.05;1 +KWK_4;KW_HOOGTE2; ; 5.44; 0.06;1 +KWK_4;KW_HOOGTE4; ; 0.44; 0.07;0 +KWK_4;KW_HOOGTE6; ; 0.025; 0.08;1 Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.dbf =================================================================== diff -u Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.prj =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.prj (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.prj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["Amersfoort_RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["Meter",1]] \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.qpj =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.qpj (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.qpj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["Amersfoort / RD New",GEOGCS["Amersfoort",DATUM["Amersfoort",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725],AUTHORITY["EPSG","6289"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4289"]],PROJECTION["Oblique_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","28992"]] Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.shp =================================================================== diff -u Binary files differ Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresImporter/SeveralStructures/kunstwerken_12_2_hoogte.shx =================================================================== diff -u Binary files differ Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresImporter.cs =================================================================== diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresImporter.cs (.../StabilityPointStructuresImporter.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresImporter.cs (.../StabilityPointStructuresImporter.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -55,9 +55,16 @@ { IEnumerable importedStabilityPointStructures = CreateStabilityPointStructures(structureLocations.ToList(), groupedStructureParameterRows); - foreach (StabilityPointStructure stabilityPointStructure in importedStabilityPointStructures) + foreach (StabilityPointStructure structure in importedStabilityPointStructures) { - ImportTarget.Add(stabilityPointStructure); + if (ImportTarget.Select(s => s.Id).Contains(structure.Id)) + { + LogStructureExisting(structure.Id); + } + else + { + ImportTarget.Add(structure); + } } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs =================================================================== diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r96708dc3012a1398efc8829a487369abc24a64c1 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresImporterTest.cs (.../StabilityPointStructuresImporterTest.cs) (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -220,7 +220,7 @@ { // Setup string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.StabilityPointStructures.IO, - Path.Combine(nameof(StabilityPointStructuresImporter), "Kunstwerken.shp")); + Path.Combine(nameof(StabilityPointStructuresImporter), "MissingParameters", "Kunstwerken.shp")); ReferenceLine referenceLine = CreateReferenceLine(); @@ -262,6 +262,45 @@ DistributionAssert.AreEqual(defaultStructure.AreaFlowApertures, importedStructure.AreaFlowApertures); } + [Test] + public void Import_ImportingAlreadyExistingStructures_LogAndTrue() + { + // Setup + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.StabilityPointStructures.IO, + Path.Combine(nameof(StabilityPointStructuresImporter), "SeveralStructures", "kunstwerken_12_2_punt.shp")); + + var referencePoints = new List + { + new Point2D(136097.939, 534563.258), + new Point2D(136196.307, 540654.202), + new Point2D(133749.164, 545531.441), + new Point2D(131415.385, 548340.305) + }; + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(referencePoints); + + var importTarget = new ObservableList(); + var structuresImporter = new StabilityPointStructuresImporter(importTarget, referenceLine, filePath); + structuresImporter.Import(); + importTarget.RemoveAt(2); + + var importResult = false; + + // Call + Action call = () => importResult = structuresImporter.Import(); + + // Assert + var expectedMessages = new[] + { + Tuple.Create("Kunstwerk 'KWK_1' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + Tuple.Create("Kunstwerk 'KWK_2' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + Tuple.Create("Kunstwerk 'KWK_4' is al geïmporteerd en wordt overgeslagen.", LogLevelConstant.Warn), + }; + TestHelper.AssertLogMessagesWithLevelAreGenerated(call, expectedMessages, 3); + Assert.IsTrue(importResult); + Assert.AreEqual(4, importTarget.Count); + } + private static ReferenceLine CreateReferenceLine() { var referencePoints = new List Fisheye: Tag 96708dc3012a1398efc8829a487369abc24a64c1 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/Kunstwerken.csv'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/Kunstwerken.dbf =================================================================== diff -u -rbdba242bf394db36636077b0652e46f32f9c9e7b -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Fisheye: Tag 96708dc3012a1398efc8829a487369abc24a64c1 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/Kunstwerken.prj'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/Kunstwerken.shp =================================================================== diff -u -rbdba242bf394db36636077b0652e46f32f9c9e7b -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/Kunstwerken.shx =================================================================== diff -u -rbdba242bf394db36636077b0652e46f32f9c9e7b -r96708dc3012a1398efc8829a487369abc24a64c1 Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.csv =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.csv (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.csv (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1,22 @@ +Namespace;Identificatie;Versie;Kunstwerken.identificatie;Parameter.code;Parameter.omschrijving;Grootheid.code;Grootheid.omschrijving;Eenheid.code;Eenheid.omschrijving;Hoedanigheid.code;Hoedanigheid.omschrijving;Waardebepalingsmethode.code;Waardebepalingsmethode.codespace;Waardebewerkingsmethode.code;Waardebewerkingsmethode.codespace;AlfanumeriekeWaarde;NumeriekeWaarde;Standaardafwijking.variatie;Boolean;Kwaliteitsoordeel.code +12;KUNST1;1;KW_STERSTAB1;1;1;1;1;1;1;;;1;;;;;1;0.01;0; +12;KUNST1;1;KW_STERSTAB3;3;3;3;3;3;3;;;3;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB4;4;4;4;4;4;4;;;4;;;;;1;0.01;0; +12;KUNST1;1;KW_STERSTAB5;5;5;5;5;5;5;;;5;;;;;1;0.01;0; +12;KUNST1;1;KW_STERSTAB7;7;7;7;7;7;7;;;7;;;;;1;0.01;0; +12;KUNST1;1;KW_STERSTAB8;8;8;8;8;8;8;;;8;;;;;1;0.01;0; +12;KUNST1;1;KW_STERSTAB9;9;9;9;9;9;9;;;9;;;;;1;0.01;0; +12;KUNST1;1;KW_STERSTAB10;10;10;10;10;10;10;;;10;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB11;11;11;11;11;11;11;;;11;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB13;13;13;13;13;13;13;;;13;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB14;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB15;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB16;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB17;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB18;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB19;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB21;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB22;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB23;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB24;14;14;14;14;14;14;;;14;;;;;1;0;0; +12;KUNST1;1;KW_STERSTAB26;15;15;15;15;15;15;;;15;;;;LageDrempel;1;0;0; Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.dbf =================================================================== diff -u Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.prj =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.prj (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.prj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.shp =================================================================== diff -u Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/MissingParameters/Kunstwerken.shx =================================================================== diff -u Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.csv =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.csv (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.csv (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1,105 @@ +Identificatie;Kunstwerken.identificatie;AlfanumeriekeWaarde;NumeriekeWaarde;Standaardafwijking.variatie;Boolean +KWK_1;KW_STERSTAB1; ; 10.11; 0;0 +KWK_1;KW_STERSTAB2; ; 20000.11; 0.1;0 +KWK_1;KW_STERSTAB3; ; 0.81; 0.1;1 +KWK_1;KW_STERSTAB4; ; 21.11; 0.05;1 +KWK_1;KW_STERSTAB5; ; 0.71; 0.1;1 +KWK_1;KW_STERSTAB6; ; 4.11; 0.1;1 +KWK_1;KW_STERSTAB7; ; 1.11; 0.15;0 +KWK_1;KW_STERSTAB8; ; 25.11; 0.05;1 +KWK_1;KW_STERSTAB9; ; 11.11; 0.1;0 +KWK_1;KW_STERSTAB10; ; 10.11; 0.1;0 +KWK_1;KW_STERSTAB11; ; 0.11; 0;1 +KWK_1;KW_STERSTAB12; ; 0.51; 0.1;1 +KWK_1;KW_STERSTAB13; ; 0.21; 0;0 +KWK_1;KW_STERSTAB14; ; 4.91; 0.05;1 +KWK_1;KW_STERSTAB15; ; 0.11; 0;0 +KWK_1;KW_STERSTAB16; ; 0.09; 0;0 +KWK_1;KW_STERSTAB17; ; 10.11; 0.3;0 +KWK_1;KW_STERSTAB18; ; 16000.11; 0.2;0 +KWK_1;KW_STERSTAB19; ; 2.11; 0.2;0 +KWK_1;KW_STERSTAB20; ; 11; 0;0 +KWK_1;KW_STERSTAB21; ; 0.10; 0;0 +KWK_1;KW_STERSTAB22; ; 3.11; 1;1 +KWK_1;KW_STERSTAB23; ; 15.11; 0.1;0 +KWK_1;KW_STERSTAB24; ; 17.11; 0.1;0 +KWK_1;KW_STERSTAB25; ; 2.51; 0.01;1 +KWK_1;KW_STERSTAB26;VerdronkenKoker; ; ; +KWK_2;KW_STERSTAB1; ; 10.22; 0;0 +KWK_2;KW_STERSTAB2; ; 20000.22; 0.1;0 +KWK_2;KW_STERSTAB3; ; 0.82; 0.1;1 +KWK_2;KW_STERSTAB4; ; 21.22; 0.05;1 +KWK_2;KW_STERSTAB5; ; 0.72; 0.1;1 +KWK_2;KW_STERSTAB6; ; 4.22; 0.1;1 +KWK_2;KW_STERSTAB7; ; 1.22; 0.15;0 +KWK_2;KW_STERSTAB8; ; 25.22; 0.05;1 +KWK_2;KW_STERSTAB9; ; 11.22; 0.1;0 +KWK_2;KW_STERSTAB10; ; 10.22; 0.1;0 +KWK_2;KW_STERSTAB11; ; 0.22; 0;1 +KWK_2;KW_STERSTAB12; ; 0.52; 0.1;1 +KWK_2;KW_STERSTAB13; ; 0.22; 0;0 +KWK_2;KW_STERSTAB14; ; 4.92; 0.05;1 +KWK_2;KW_STERSTAB15; ; 0.22; 0;0 +KWK_2;KW_STERSTAB16; ;0.0454545; 0;0 +KWK_2;KW_STERSTAB17; ; 10.22; 0.3;0 +KWK_2;KW_STERSTAB18; ; 16000.22; 0.2;0 +KWK_2;KW_STERSTAB19; ; 2.22; 0.2;0 +KWK_2;KW_STERSTAB20; ; 22; 0;0 +KWK_2;KW_STERSTAB21; ; 0.05; 0;0 +KWK_2;KW_STERSTAB22; ; 3.22; 1;1 +KWK_2;KW_STERSTAB23; ; 15.22; 0.1;0 +KWK_2;KW_STERSTAB24; ; 17.22; 0.1;0 +KWK_2;KW_STERSTAB25; ; 2.52; 0.01;1 +KWK_2;KW_STERSTAB26;LageDrempel; ; ; +KWK_3;KW_STERSTAB1; ; 10.33; 0;0 +KWK_3;KW_STERSTAB2; ; 20000.33; 0.1;0 +KWK_3;KW_STERSTAB3; ; 0.83; 0.1;1 +KWK_3;KW_STERSTAB4; ; 21.33; 0.05;1 +KWK_3;KW_STERSTAB5; ; 0.73; 0.1;1 +KWK_3;KW_STERSTAB6; ; 4.33; 0.1;1 +KWK_3;KW_STERSTAB7; ; 1.33; 0.15;0 +KWK_3;KW_STERSTAB8; ; 25.33; 0.05;1 +KWK_3;KW_STERSTAB9; ; 11.33; 0.1;0 +KWK_3;KW_STERSTAB10; ; 10.33; 0.1;0 +KWK_3;KW_STERSTAB11; ; 0.33; 0;1 +KWK_3;KW_STERSTAB12; ; 0.53; 0.1;1 +KWK_3;KW_STERSTAB13; ; 0.23; 0;0 +KWK_3;KW_STERSTAB14; ; 4.93; 0.05;1 +KWK_3;KW_STERSTAB15; ; 0.33; 0;0 +KWK_3;KW_STERSTAB16; ; 0.030303; 0;0 +KWK_3;KW_STERSTAB17; ; 10.33; 0.3;0 +KWK_3;KW_STERSTAB18; ; 16000.33; 0.2;0 +KWK_3;KW_STERSTAB19; ; 2.33; 0.2;0 +KWK_3;KW_STERSTAB20; ; 33; 0;0 +KWK_3;KW_STERSTAB21; ; 0.0333; 0;0 +KWK_3;KW_STERSTAB22; ; 3.33; 1;1 +KWK_3;KW_STERSTAB23; ; 15.33; 0.1;0 +KWK_3;KW_STERSTAB24; ; 17.33; 0.1;0 +KWK_3;KW_STERSTAB25; ; 2.53; 0.01;1 +KWK_3;KW_STERSTAB26;VerdronkenKoker; ; ; +KWK_4;KW_STERSTAB1; ; 10.44; 0;0 +KWK_4;KW_STERSTAB2; ; 20000.44; 0.1;0 +KWK_4;KW_STERSTAB3; ; 0.84; 0.1;1 +KWK_4;KW_STERSTAB4; ; 21.44; 0.05;1 +KWK_4;KW_STERSTAB5; ; 0.74; 0.1;1 +KWK_4;KW_STERSTAB6; ; 4.44; 0.1;1 +KWK_4;KW_STERSTAB7; ; 1.44; 0.15;0 +KWK_4;KW_STERSTAB8; ; 25.44; 0.05;1 +KWK_4;KW_STERSTAB9; ; 11.44; 0.1;0 +KWK_4;KW_STERSTAB10; ; 10.44; 0.1;0 +KWK_4;KW_STERSTAB11; ; 0.44; 0;1 +KWK_4;KW_STERSTAB12; ; 0.54; 0.1;1 +KWK_4;KW_STERSTAB13; ; 0.24; 0;0 +KWK_4;KW_STERSTAB14; ; 4.94; 0.05;1 +KWK_4;KW_STERSTAB15; ; 0.44; 0;0 +KWK_4;KW_STERSTAB16; ; 0.022727; 0;0 +KWK_4;KW_STERSTAB17; ; 10.44; 0.3;0 +KWK_4;KW_STERSTAB18; ; 16000.44; 0.2;0 +KWK_4;KW_STERSTAB19; ; 2.44; 0.2;0 +KWK_4;KW_STERSTAB20; ; 44; 0;0 +KWK_4;KW_STERSTAB21; ; 0.025; 0;0 +KWK_4;KW_STERSTAB22; ; 3.44; 1;1 +KWK_4;KW_STERSTAB23; ; 15.44; 0.1;0 +KWK_4;KW_STERSTAB24; ; 17.44; 0.1;0 +KWK_4;KW_STERSTAB25; ; 2.54; 0.01;1 +KWK_4;KW_STERSTAB26;LageDrempel; ; ; Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.dbf =================================================================== diff -u Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.prj =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.prj (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.prj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["Amersfoort_RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["Meter",1]] \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.qpj =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.qpj (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.qpj (revision 96708dc3012a1398efc8829a487369abc24a64c1) @@ -0,0 +1 @@ +PROJCS["Amersfoort / RD New",GEOGCS["Amersfoort",DATUM["Amersfoort",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725],AUTHORITY["EPSG","6289"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4289"]],PROJECTION["Oblique_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","28992"]] Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.shp =================================================================== diff -u Binary files differ Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresImporter/SeveralStructures/kunstwerken_12_2_punt.shx =================================================================== diff -u Binary files differ