Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r3e2b418a9bbc27e2e990b15325b1350e6d56dc3d -r539779c3ab8d787b26f6a2b1ec518eace8d49a02
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 3e2b418a9bbc27e2e990b15325b1350e6d56dc3d)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 539779c3ab8d787b26f6a2b1ec518eace8d49a02)
@@ -143,8 +143,8 @@
             return new StructuresOvertoppingCalculationInput(
                 calculation.InputParameters.HydraulicBoundaryLocation.Id,
                 new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation),
-                ParseForeshore(calculation.InputParameters),
-                ParseBreakWater(calculation.InputParameters),
+                CalculationInputParser.ParseForeshore(calculation.InputParameters),
+                CalculationInputParser.ParseBreakWater(calculation.InputParameters),
                 generalInput.GravitationalAcceleration,
                 generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation,
                 calculation.InputParameters.LevelCrestStructure.Mean, calculation.InputParameters.LevelCrestStructure.StandardDeviation,
@@ -162,16 +162,6 @@
                 calculation.InputParameters.StormDuration.Mean, calculation.InputParameters.StormDuration.CoefficientOfVariation);
         }
 
-        private static IEnumerable<HydraRingForelandPoint> ParseForeshore(HeightStructuresInput input)
-        {
-            return input.UseForeshore ? input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)) : new HydraRingForelandPoint[0];
-        }
-
-        private static HydraRingBreakWater ParseBreakWater(HeightStructuresInput input)
-        {
-            return input.UseBreakWater ? new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height) : null;
-        }
-
         private static string[] ValidateInput(HeightStructuresInput inputParameters, IAssessmentSection assessmentSection)
         {
             var validationResults = new List<string>();