Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -re581f7fd8199f0fb565bfea26384ce38040d10e4 -r00e22650e8bf1fc0324fbb514a22e17225e57e4b --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision e581f7fd8199f0fb565bfea26384ce38040d10e4) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 00e22650e8bf1fc0324fbb514a22e17225e57e4b) @@ -89,7 +89,22 @@ return false; } - assessmentSection.HydraulicBoundaryDatabase = CreateHydraulicBoundaryDatabase(readHydraulicBoundaryDatabase, filePath); + hydraulicBoundaryDatabase.FilePath = filePath; + hydraulicBoundaryDatabase.Version = readHydraulicBoundaryDatabase.Version; + hydraulicBoundaryDatabase.Locations.Clear(); + hydraulicBoundaryDatabase.Locations.AddRange(readHydraulicBoundaryDatabase.Locations); + + if (readHydraulicBoundaryDatabase.CanUsePreprocessor) + { + hydraulicBoundaryDatabase.CanUsePreprocessor = true; + hydraulicBoundaryDatabase.UsePreprocessor = true; + hydraulicBoundaryDatabase.PreprocessorDirectory = Path.GetDirectoryName(filePath); + } + else + { + hydraulicBoundaryDatabase.CanUsePreprocessor = false; + } + assessmentSection.NotifyObservers(); log.Info(Resources.HydraulicBoundaryDatabaseImporter_Import_All_hydraulic_locations_read); @@ -211,25 +226,5 @@ return 0; } } - - private static HydraulicBoundaryDatabase CreateHydraulicBoundaryDatabase(ReadHydraulicBoundaryDatabase readData, string filePath) - { - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase - { - Version = readData.Version, - FilePath = filePath - }; - - hydraulicBoundaryDatabase.Locations.AddRange(readData.Locations); - - if (readData.CanUsePreprocessor) - { - hydraulicBoundaryDatabase.CanUsePreprocessor = true; - hydraulicBoundaryDatabase.UsePreprocessor = true; - hydraulicBoundaryDatabase.PreprocessorDirectory = Path.GetDirectoryName(filePath); - } - - return hydraulicBoundaryDatabase; - } } } \ No newline at end of file