Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsProperties.cs
===================================================================
diff -u -r622768283f80b349b41e4de33d2f86fef8d989ac -ra4914458efa8ce67244c7743d5511080ac232dad
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsProperties.cs	(.../DesignWaterLevelLocationsProperties.cs)	(revision 622768283f80b349b41e4de33d2f86fef8d989ac)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationsProperties.cs	(.../DesignWaterLevelLocationsProperties.cs)	(revision a4914458efa8ce67244c7743d5511080ac232dad)
@@ -37,13 +37,21 @@
     /// </summary>
     public class DesignWaterLevelLocationsProperties : HydraulicBoundaryLocationsProperties
     {
+        private readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
+
         /// <summary>
         /// Creates a new instance of <see cref="DesignWaterLevelLocationProperties"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocations">The list of hydraulic boundary locations to set as data.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocations"/> is <c>null</c>.</exception>
-        public DesignWaterLevelLocationsProperties(ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
-            : base(hydraulicBoundaryLocations) {}
+        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
+        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
+        public DesignWaterLevelLocationsProperties(ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
+                                                   Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
+            : base(hydraulicBoundaryLocations)
+        {
+            this.getCalculationFunc = getCalculationFunc;
+        }
 
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
@@ -53,7 +61,7 @@
         {
             get
             {
-                return data.Select(loc => new DesignWaterLevelLocationProperties(loc, loc.DesignWaterLevelCalculation)).ToArray();
+                return data.Select(loc => new DesignWaterLevelLocationProperties(loc, getCalculationFunc(loc))).ToArray();
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsProperties.cs
===================================================================
diff -u -r622768283f80b349b41e4de33d2f86fef8d989ac -ra4914458efa8ce67244c7743d5511080ac232dad
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsProperties.cs	(.../WaveHeightLocationsProperties.cs)	(revision 622768283f80b349b41e4de33d2f86fef8d989ac)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationsProperties.cs	(.../WaveHeightLocationsProperties.cs)	(revision a4914458efa8ce67244c7743d5511080ac232dad)
@@ -37,13 +37,21 @@
     /// </summary>
     public class WaveHeightLocationsProperties : HydraulicBoundaryLocationsProperties
     {
+        private readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
+
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightLocationProperties"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocations">The hydraulic boundary locations to set as data.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocations"/> is <c>null</c>.</exception>
-        public WaveHeightLocationsProperties(ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
-            : base(hydraulicBoundaryLocations) {}
+        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="HydraulicBoundaryLocationCalculation"/>
+        /// based on <see cref="HydraulicBoundaryLocation"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
+        public WaveHeightLocationsProperties(ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
+                                             Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
+            : base(hydraulicBoundaryLocations)
+        {
+            this.getCalculationFunc = getCalculationFunc;
+        }
 
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
@@ -53,7 +61,7 @@
         {
             get
             {
-                return data.Select(loc => new WaveHeightLocationProperties(loc, loc.WaveHeightCalculation)).ToArray();
+                return data.Select(loc => new WaveHeightLocationProperties(loc, getCalculationFunc(loc))).ToArray();
             }
         }
     }