Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r34427a72185b44cb53697b3f58ab941e838d1665 -r78584140e80fac8c1c9c9468cb7aafbac43b0ef5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 34427a72185b44cb53697b3f58ab941e838d1665) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 78584140e80fac8c1c9c9468cb7aafbac43b0ef5) @@ -99,7 +99,7 @@ { SetSimpleProperties(calculationConfiguration, calculation.InputParameters); - SetZonesParameters(calculationConfiguration, calculation.InputParameters); + SetZoningBoundariesDeterminationType(calculationConfiguration, calculation.InputParameters); SetDikeSoilScenario(calculationConfiguration, calculation.InputParameters); SetGridDeterminationType(calculationConfiguration, calculation.InputParameters); SetTangentLineDeterminationType(calculationConfiguration, calculation.InputParameters); @@ -641,43 +641,44 @@ { input.MoveGrid = calculationConfiguration.MoveGrid.Value; } - } - /// - /// Assigns the zones parameters. - /// - /// The read calculation read. - /// The calculation input to configure. - private static void SetZonesParameters(MacroStabilityInwardsCalculationConfiguration configuration, - MacroStabilityInwardsInput input) - { - if (configuration.CreateZones.HasValue) + if (calculationConfiguration.CreateZones.HasValue) { - input.CreateZones = configuration.CreateZones.Value; + input.CreateZones = calculationConfiguration.CreateZones.Value; } - if (configuration.ZoningBoundariesDeterminationType.HasValue) + if (calculationConfiguration.ZoneBoundaryLeft.HasValue) { - input.ZoningBoundariesDeterminationType = (MacroStabilityInwardsZoningBoundariesDeterminationType) - new ConfigurationZoningBoundariesDeterminationTypeConverter().ConvertTo(configuration.ZoningBoundariesDeterminationType.Value, - typeof(MacroStabilityInwardsZoningBoundariesDeterminationType)); + input.ZoneBoundaryLeft = (RoundedDouble) calculationConfiguration.ZoneBoundaryLeft.Value; } - - if (configuration.ZoneBoundaryLeft.HasValue) + if (calculationConfiguration.ZoneBoundaryRight.HasValue) { - input.ZoneBoundaryLeft = (RoundedDouble) configuration.ZoneBoundaryLeft.Value; + input.ZoneBoundaryRight = (RoundedDouble) calculationConfiguration.ZoneBoundaryRight.Value; } + } - if (configuration.ZoneBoundaryRight.HasValue) + /// + /// Assigns the zoning boundary determination type. + /// + /// The read calculation configuration. + /// The calculation input to configure. + private static void SetZoningBoundariesDeterminationType(MacroStabilityInwardsCalculationConfiguration configuration, + MacroStabilityInwardsInput input) + { + if (!configuration.ZoningBoundariesDeterminationType.HasValue) { - input.ZoneBoundaryRight = (RoundedDouble) configuration.ZoneBoundaryRight.Value; + return; } + + input.ZoningBoundariesDeterminationType = (MacroStabilityInwardsZoningBoundariesDeterminationType) + new ConfigurationZoningBoundariesDeterminationTypeConverter().ConvertTo(configuration.ZoningBoundariesDeterminationType.Value, + typeof(MacroStabilityInwardsZoningBoundariesDeterminationType)); } /// /// Assigns the dike soil scenario. /// - /// The read calculation read. + /// The read calculation configuration. /// The calculation input to configure. private static void SetDikeSoilScenario(MacroStabilityInwardsCalculationConfiguration configuration, MacroStabilityInwardsInput input) @@ -694,7 +695,7 @@ /// /// Assigns the grid determination type. /// - /// The read calculation read. + /// The read calculation configuration. /// The calculation input to configure. private static void SetGridDeterminationType(MacroStabilityInwardsCalculationConfiguration configuration, MacroStabilityInwardsInput input) @@ -711,7 +712,7 @@ /// /// Assigns the tangent line determination type. /// - /// The read calculation read. + /// The read calculation configuration. /// The calculation input to configure. private static void SetTangentLineDeterminationType(MacroStabilityInwardsCalculationConfiguration configuration, MacroStabilityInwardsInput input) Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsZonesSchema.xsd =================================================================== diff -u -r34427a72185b44cb53697b3f58ab941e838d1665 -r78584140e80fac8c1c9c9468cb7aafbac43b0ef5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsZonesSchema.xsd (.../MacroStabiliteitBinnenwaartsZonesSchema.xsd) (revision 34427a72185b44cb53697b3f58ab941e838d1665) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsZonesSchema.xsd (.../MacroStabiliteitBinnenwaartsZonesSchema.xsd) (revision 78584140e80fac8c1c9c9468cb7aafbac43b0ef5) @@ -29,7 +29,6 @@ -