Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r4755 -r4947 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4755) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4947) @@ -267,11 +267,17 @@ damProject.SaveXMLProject(projectFilename, damProject); // Check Dike - Assert.That(damProject.DamProjectData.WaterBoard.Dikes.Count, Is.EqualTo(1)); + Assert.That(damProject.DamProjectData.WaterBoard.Dikes, Has.Count.EqualTo(1)); Dike dike = damProject.DamProjectData.WaterBoard.Dikes[0]; - //Check locations - Assert.That(dike.Locations.Count, Is.EqualTo(17)); + Assert.Multiple(() => + { + //Check locations + Assert.That(dike.Locations, Has.Count.EqualTo(17)); + + // Check aquifers + Assert.That(dike.Aquifers, Has.Count.EqualTo(5)); + }); } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs =================================================================== diff -u -r4539 -r4947 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 4947) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using Deltares.Dam.Data.CsvImporters; using Deltares.Dam.Data.DataPlugins; using Deltares.Dam.Data.DataPlugins.Configuration; using Deltares.Geometry; @@ -221,7 +222,8 @@ { // Add dikes to waterboard List importedCsvSoils = importer.WaterBoard.Dikes.First(d => d.Name == dikeRingId).ImportedCsvSoils; - Dike dike = ImportDataForDikeRing(importedCsvSoils, dikeRingId); + IEnumerable importedCsvAquifers = importer.WaterBoard.Dikes.First(d => d.Name == dikeRingId).Aquifers; + Dike dike = ImportDataForDikeRing(importedCsvSoils, importedCsvAquifers, dikeRingId); waterBoard.Dikes.Add(dike); } @@ -297,7 +299,7 @@ /// The soils as imported from the csv file /// The dike ring identifier. /// - private Dike ImportDataForDikeRing(List importedCsvSoils, string dikeRingId) + private Dike ImportDataForDikeRing(List importedCsvSoils, IEnumerable importedCsvAquifers, string dikeRingId) { var dike = new Dike { @@ -307,6 +309,8 @@ ImportSoilProfiles1D(dikeRingId, dike); + ImportAquifers(importedCsvAquifers, dike); + ImportSegments(dikeRingId, dike); ImportSurfaceLines(dikeRingId, dike); @@ -640,6 +644,14 @@ } } + private static void ImportAquifers(IEnumerable importedCsvAquifers, Dike dike) + { + foreach (Aquifer aquifer in importedCsvAquifers) + { + dike.Aquifers.Add(aquifer); + } + } + /// /// Imports a profile. /// Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r4938 -r4947 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4938) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4947) @@ -118,7 +118,7 @@ set => soilList = value; } - public virtual IList Aquifers { get; set; } + public virtual IList Aquifers { get; set; } = new List(); [Browsable(false)] public virtual IList Gauges { get; set; } = new List();