Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r532e4c07a37d3243ed69af7cfe57ecfaea5951ba -r764d8b4def2fd6d7a3d296aae65dd5bed54f1828 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 532e4c07a37d3243ed69af7cfe57ecfaea5951ba) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 764d8b4def2fd6d7a3d296aae65dd5bed54f1828) @@ -347,16 +347,6 @@ return calculation.InputParameters.HydraulicBoundaryLocation?.DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN; } - private static ObservableList GetHydraulicBoundaryLocationCalculations(IEnumerable hydraulicBoundaryLocations, - Func getCalculationFunc) - { - var hydraulicBoundaryLocationCalculations = new ObservableList(); - - hydraulicBoundaryLocationCalculations.AddRange(hydraulicBoundaryLocations.Select(getCalculationFunc)); - - return hydraulicBoundaryLocationCalculations; - } - #region ViewInfos #region GrassCoverErosionOutwardsFailureMechanismView ViewInfo @@ -505,26 +495,22 @@ private static object[] GetHydraulicBoundariesGroupContextChildNodeObjects(HydraulicBoundariesGroupContext context) { IAssessmentSection assessmentSection = context.AssessmentSection; - if (!assessmentSection.HydraulicBoundaryDatabase.IsLinked()) + if (assessmentSection.HydraulicBoundaryDatabase.IsLinked()) { - return new object[0]; + ObservableList locations = context.WrappedData.Locations; + GrassCoverErosionOutwardsFailureMechanism failureMechanism = context.FailureMechanism; + return new object[] + { + new GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext(locations, failureMechanism, assessmentSection), + new GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext(locations, failureMechanism, assessmentSection), + new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + null, + failureMechanism, + assessmentSection) + }; } - ObservableList locations = context.WrappedData.Locations; - GrassCoverErosionOutwardsFailureMechanism failureMechanism = context.FailureMechanism; - return new object[] - { - new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(GetHydraulicBoundaryLocationCalculations(locations, hbl => hbl.DesignWaterLevelCalculation1), - assessmentSection, - failureMechanism), - new GrassCoverErosionOutwardsWaveHeightCalculationsContext(GetHydraulicBoundaryLocationCalculations(locations, hbl => hbl.WaveHeightCalculation1), - assessmentSection, - failureMechanism), - new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(context.FailureMechanism.WaveConditionsCalculationGroup, - null, - context.FailureMechanism, - assessmentSection) - }; + return new object[0]; } #endregion