Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -r539779c3ab8d787b26f6a2b1ec518eace8d49a02
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 16cb360eae0014270ebb6700054afdbbd565ae65)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 539779c3ab8d787b26f6a2b1ec518eace8d49a02)
@@ -208,8 +208,8 @@
             return new OvertoppingCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id,
                                                    new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.Orientation),
                                                    ParseProfilePoints(calculation.InputParameters.DikeGeometry),
-                                                   ParseForeshore(calculation.InputParameters),
-                                                   ParseBreakWater(calculation.InputParameters),
+                                                   CalculationInputParser.ParseForeshore(calculation.InputParameters),
+                                                   CalculationInputParser.ParseBreakWater(calculation.InputParameters),
                                                    calculation.InputParameters.DikeHeight,
                                                    generalInput.CriticalOvertoppingModelFactor,
                                                    generalInput.FbFactor.Mean,
@@ -232,8 +232,8 @@
                                                   assessmentSection.FailureMechanismContribution.Norm,
                                                   new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.Orientation),
                                                   ParseProfilePoints(calculation.InputParameters.DikeGeometry),
-                                                  ParseForeshore(calculation.InputParameters),
-                                                  ParseBreakWater(calculation.InputParameters),
+                                                  CalculationInputParser.ParseForeshore(calculation.InputParameters),
+                                                  CalculationInputParser.ParseBreakWater(calculation.InputParameters),
                                                   generalInput.CriticalOvertoppingModelFactor,
                                                   generalInput.FbFactor.Mean,
                                                   generalInput.FbFactor.StandardDeviation,
@@ -248,16 +248,6 @@
                                                   generalInput.FshallowModelFactor.StandardDeviation);
         }
 
-        private static HydraRingBreakWater ParseBreakWater(GrassCoverErosionInwardsInput input)
-        {
-            return input.UseBreakWater ? new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height) : null;
-        }
-
-        private static IEnumerable<HydraRingForelandPoint> ParseForeshore(GrassCoverErosionInwardsInput input)
-        {
-            return input.UseForeshore ? input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)) : new HydraRingForelandPoint[0];
-        }
-
         private static IEnumerable<HydraRingRoughnessProfilePoint> ParseProfilePoints(RoughnessPoint[] roughnessProfilePoints)
         {
             for (var i = 0; i < roughnessProfilePoints.Length; i++)