Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r4180 -r4199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 4180) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 4199) @@ -881,34 +881,6 @@ } /// - /// Import the specified MGeobase to all dikerings with id as specified in dikeRingIds - /// Note that this does import the 1D soil profiles together with the soils and their parameters. - /// If dikeringId not found then a new dike is created for that dikeRingId - /// - /// path where the data can be found - /// - private void ImportMGeobase(string importFolder, IEnumerable dikeRingIds) - { - if (dikeRingIds == null) - { - return; - } - - DataSourceManager.CurrentSource = DataSourceSystemType.MGeobase; - - foreach (string dikeRingId in dikeRingIds) - { - // first check to see if this dike is already known, if not create it - Dike dike = GetOrCreateDike(dikeRingId); - - dike.SoilDatabaseName = importFolder; - dike.AddSoilProfilesFromDB(); - } - - DataSourceManager.CurrentSource = DataSourceSystemType.User; - } - - /// /// Import data from Iris shapefiles /// /// path where the data can be found @@ -1137,7 +1109,6 @@ case DataSourceType.Iris: case DataSourceType.BackgroundShapeFiles: case DataSourceType.MSoilBase: - case DataSourceType.MGeobase: break; default: throw new ArgumentOutOfRangeException(); @@ -1182,9 +1153,6 @@ case DataSourceType.MSoilBase: ImportMSoilBaseName(dataLocation, dikeRingIdList); break; - case DataSourceType.MGeobase: - ImportMGeobase(dataLocation, dikeRingIdList); - break; default: throw new ArgumentOutOfRangeException(); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r4124 -r4199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4124) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4199) @@ -231,8 +231,7 @@ Iris, DataShapeFiles, BackgroundShapeFiles, - MSoilBase, - MGeobase + MSoilBase } public enum LayerType Fisheye: Tag 4199 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterMGeobaseTests.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r4189 -r4199 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4189) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4199) @@ -233,37 +233,6 @@ } /// - /// Read all the soils and their parameters from the database - /// - /// Add 1D-soilprofiles from MGeobase database - /// - public void AddSoilProfilesFromDB() - { - if ((SoilDatabaseName == null) || !File.Exists(SoilDatabaseName)) - { - throw new DikeException($"The MGeobase database '{SoilDatabaseName}' cannot be found"); - } - - if (soilList.Soils.Count == 0) - { - FillDataBaseSoilListFromSoilBase(); - soilList.Soils.AddRange(ImportedCsvSoils); - } - - if (soilList.Soils.Count == 0) - { - throw new DikeException($"The MGeobase database '{SoilDatabaseName}' does not contain soils and can not be used."); - } - - var mgbDB = new MGeobaseDB(soilList); - IList addedSoilProfiles = mgbDB.AddSoilProfiles(SoilDatabaseName); - foreach (SoilProfile1D addedSoilProfile in addedSoilProfiles) - { - soilProfiles.Add(addedSoilProfile); - } - } - - /// /// Add to soil data as read from the csv-file to the dike soils /// public void FillImportedCsvSoilsFromCsvFile(IEnumerable soilRecords)