Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -rbeb18e42dc3e7bf19f85bae978634368159989b4 -ra567a0f3695ad8915dcf8f197ad2cb970b7c49d7 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision beb18e42dc3e7bf19f85bae978634368159989b4) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision a567a0f3695ad8915dcf8f197ad2cb970b7c49d7) @@ -30,6 +30,7 @@ using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase; using Ringtoets.Integration.Data; using Ringtoets.Integration.IO.Handlers; +using Ringtoets.Integration.Plugin.Helpers; using Ringtoets.Integration.Plugin.Properties; using Ringtoets.Integration.Service; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; @@ -41,9 +42,6 @@ /// public class HydraulicBoundaryDatabaseUpdateHandler : IHydraulicBoundaryDatabaseUpdateHandler { - private const string mandatoryConfigurationPropertyDefaultValue = "WBI2017"; - private const string optionalConfigurationPropertyDefaultValue = "Conform WBI2017"; - private const string additionalInformationConfigurationPropertyValue = "Gegenereerd door Ringtoets (conform WBI2017)"; private readonly AssessmentSection assessmentSection; private readonly IDuneLocationsReplacementHandler duneLocationsReplacementHandler; private bool updateLocations; @@ -164,9 +162,9 @@ } } - SetHydraulicLocationConfigurationSettings(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings, - readHydraulicLocationConfigurationDatabase, - hlcdFilePath); + HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings, + readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings?.Single(), + hlcdFilePath); return changedObjects; } @@ -185,41 +183,6 @@ || readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count() == 1; } - private static void SetHydraulicLocationConfigurationSettings(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings, - ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase, - string hlcdFilePath) - { - if (readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings != null) - { - ReadHydraulicLocationConfigurationDatabaseSettings readSettings = - readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings - .Single(); - hydraulicLocationConfigurationSettings.SetValues(hlcdFilePath, - readSettings.ScenarioName, - readSettings.Year, - readSettings.Scope, - readSettings.SeaLevel, - readSettings.RiverDischarge, - readSettings.LakeLevel, - readSettings.WindDirection, - readSettings.WindSpeed, - readSettings.Comment); - } - else - { - hydraulicLocationConfigurationSettings.SetValues(hlcdFilePath, - mandatoryConfigurationPropertyDefaultValue, - 2023, - mandatoryConfigurationPropertyDefaultValue, - optionalConfigurationPropertyDefaultValue, - optionalConfigurationPropertyDefaultValue, - optionalConfigurationPropertyDefaultValue, - optionalConfigurationPropertyDefaultValue, - optionalConfigurationPropertyDefaultValue, - additionalInformationConfigurationPropertyValue); - } - } - private IEnumerable GetLocationsAndCalculationsObservables(HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { return new IObservable[]