Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs
===================================================================
diff -u -r9b83f33bbdd0e5bcd78e60342e5c780599c12c93 -r6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs)	(revision 9b83f33bbdd0e5bcd78e60342e5c780599c12c93)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties.cs)	(revision 6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4)
@@ -37,14 +37,27 @@
     /// </summary>
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties : HydraulicBoundaryLocationsProperties
     {
+        private readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
+
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsDesignWaterLevelLocationProperties"/>.
         /// </summary>
         /// <param name="locations">The locations to show the properties for.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="locations"/> is <c>null</c>.</exception>
-        public GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(ObservableList<HydraulicBoundaryLocation> locations)
-            : base(locations) {}
+        /// <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 GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(ObservableList<HydraulicBoundaryLocation> locations,
+                                                                            Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
+            : base(locations)
+        {
+            if (getCalculationFunc == null)
+            {
+                throw new ArgumentNullException(nameof(getCalculationFunc));
+            }
 
+            this.getCalculationFunc = getCalculationFunc;
+        }
+
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Locations_DisplayName))]
@@ -53,7 +66,7 @@
         {
             get
             {
-                return data.Select(loc => new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(loc, loc.DesignWaterLevelCalculation)).ToArray();
+                return data.Select(loc => new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(loc, getCalculationFunc(loc))).ToArray();
             }
         }
     }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsProperties.cs
===================================================================
diff -u -r9b83f33bbdd0e5bcd78e60342e5c780599c12c93 -r6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsProperties.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsProperties.cs)	(revision 9b83f33bbdd0e5bcd78e60342e5c780599c12c93)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsProperties.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsProperties.cs)	(revision 6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4)
@@ -37,14 +37,27 @@
     /// </summary>
     public class GrassCoverErosionOutwardsWaveHeightLocationsProperties : HydraulicBoundaryLocationsProperties
     {
+        private readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
+
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveHeightLocationsProperties"/>.
         /// </summary>
         /// <param name="locations">The locations to show the properties for.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="locations"/> is <c>null</c>.</exception>
-        public GrassCoverErosionOutwardsWaveHeightLocationsProperties(ObservableList<HydraulicBoundaryLocation> locations)
-            : base(locations) {}
+        /// <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 GrassCoverErosionOutwardsWaveHeightLocationsProperties(ObservableList<HydraulicBoundaryLocation> locations,
+                                                                      Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc)
+            : base(locations)
+        {
+            if (getCalculationFunc == null)
+            {
+                throw new ArgumentNullException(nameof(getCalculationFunc));
+            }
 
+            this.getCalculationFunc = getCalculationFunc;
+        }
+
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Locations_DisplayName))]
@@ -53,7 +66,7 @@
         {
             get
             {
-                return data.Select(loc => new GrassCoverErosionOutwardsWaveHeightLocationProperties(loc, loc.WaveHeightCalculation)).ToArray();
+                return data.Select(loc => new GrassCoverErosionOutwardsWaveHeightLocationProperties(loc, getCalculationFunc(loc))).ToArray();
             }
         }
     }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r9b83f33bbdd0e5bcd78e60342e5c780599c12c93 -r6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9b83f33bbdd0e5bcd78e60342e5c780599c12c93)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4)
@@ -79,11 +79,13 @@
             };
             yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelLocationsContext, GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(context.WrappedData)
+                CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(context.WrappedData,
+                                                                                                             hbl => hbl.DesignWaterLevelCalculation)
             };
             yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightLocationsContext, GrassCoverErosionOutwardsWaveHeightLocationsProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationsProperties(context.WrappedData)
+                CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationsProperties(context.WrappedData,
+                                                                                                       hbl => hbl.WaveHeightCalculation)
             };
 
             yield return new PropertyInfo<GrassCoverErosionOutwardsWaveConditionsOutput, GrassCoverErosionOutwardsWaveConditionsOutputProperties>();
@@ -97,12 +99,14 @@
 
             yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelLocationContext, GrassCoverErosionOutwardsDesignWaterLevelLocationProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(context.WrappedData, context.WrappedData.DesignWaterLevelCalculation)
+                CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(context.WrappedData,
+                                                                                                            context.WrappedData.DesignWaterLevelCalculation)
             };
 
             yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightLocationContext, GrassCoverErosionOutwardsWaveHeightLocationProperties>
             {
-                CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationProperties(context.WrappedData, context.WrappedData.WaveHeightCalculation)
+                CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationProperties(context.WrappedData,
+                                                                                                      context.WrappedData.WaveHeightCalculation)
             };
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs
===================================================================
diff -u -rcedf973769c057c935ffce89259027f2ea13c4df -r6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs)	(revision cedf973769c057c935ffce89259027f2ea13c4df)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs)	(revision 6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4)
@@ -42,8 +42,8 @@
             var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>();
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(
-                hydraulicBoundaryLocations);
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryLocations,
+                                                                                              hbl => hbl.DesignWaterLevelCalculation);
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationsProperties>(properties);
@@ -73,13 +73,14 @@
         {
             // Setup
             HydraulicBoundaryLocation location = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(1.2);
+            var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>
+            {
+                location
+            };
 
             // Call
-            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(
-                new ObservableList<HydraulicBoundaryLocation>
-                {
-                    location
-                });
+            var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryLocations,
+                                                                                              hbl => hbl.DesignWaterLevelCalculation);
 
             // Assert
             Assert.AreEqual(1, properties.Locations.Length);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs
===================================================================
diff -u -rcedf973769c057c935ffce89259027f2ea13c4df -r6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs)	(revision cedf973769c057c935ffce89259027f2ea13c4df)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs)	(revision 6b0cf3b2a278cb86ec4fc5af26f792afcf0cf3a4)
@@ -43,8 +43,8 @@
             var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>();
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(
-                hydraulicBoundaryLocations);
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryLocations,
+                                                                                        hbl => hbl.DesignWaterLevelCalculation);
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationsProperties>(properties);
@@ -73,13 +73,14 @@
         {
             // Setup
             HydraulicBoundaryLocation location = TestHydraulicBoundaryLocation.CreateWaveHeightCalculated(1.2);
+            var hydraulicBoundaryLocations = new ObservableList<HydraulicBoundaryLocation>
+            {
+                location
+            };
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(
-                new ObservableList<HydraulicBoundaryLocation>
-                {
-                    location
-                });
+            var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryLocations,
+                                                                                        hbl => hbl.WaveHeightCalculation);
 
             // Assert
             Assert.AreEqual(1, properties.Locations.Length);