Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationsProperties.cs
===================================================================
diff -u -r2bca78cdfd4e336f16bf2abfffb3f5ba4d46277d -r5cd1ac2b1438ea93461625d699a5377739c5abbf
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationsProperties.cs	(.../DuneLocationsProperties.cs)	(revision 2bca78cdfd4e336f16bf2abfffb3f5ba4d46277d)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/PropertyClasses/DuneLocationsProperties.cs	(.../DuneLocationsProperties.cs)	(revision 5cd1ac2b1438ea93461625d699a5377739c5abbf)
@@ -34,39 +34,28 @@
     /// <summary>
     /// ViewModel of an enumeration of <see cref="DuneLocation"/> for the properties panel.
     /// </summary>
-    public class DuneLocationsProperties : ObjectProperties<ObservableList<DuneLocation>>, IDisposable
+    public class DuneLocationsProperties : ObjectProperties<ObservableList<DuneLocationCalculation>>, IDisposable
     {
-        private readonly Func<DuneLocation, DuneLocationCalculation> getCalculationFunc;
-        private readonly RecursiveObserver<ObservableList<DuneLocation>, DuneLocation> locationObserver;
+        private readonly RecursiveObserver<ObservableList<DuneLocationCalculation>, DuneLocationCalculation> calculationsObserver;
 
         /// <summary>
         /// Creates a new instance of <see cref="DuneLocationsProperties"/>.
         /// </summary>
-        /// <param name="locations">The list of dune locations to set as data.</param>
-        /// <param name="getCalculationFunc"><see cref="Func{T,TResult}"/> for obtaining a <see cref="DuneLocationCalculation"/>
-        /// based on <see cref="DuneLocation"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public DuneLocationsProperties(ObservableList<DuneLocation> locations,
-                                       Func<DuneLocation, DuneLocationCalculation> getCalculationFunc)
+        /// <param name="calculations">The collection of dune location calculations to set as data.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/> is <c>null</c>.</exception>
+        public DuneLocationsProperties(ObservableList<DuneLocationCalculation> calculations)
         {
-            if (locations == null)
+            if (calculations == null)
             {
-                throw new ArgumentNullException(nameof(locations));
+                throw new ArgumentNullException(nameof(calculations));
             }
 
-            if (getCalculationFunc == null)
+            calculationsObserver = new RecursiveObserver<ObservableList<DuneLocationCalculation>, DuneLocationCalculation>(OnRefreshRequired, list => list)
             {
-                throw new ArgumentNullException(nameof(getCalculationFunc));
-            }
-
-            locationObserver = new RecursiveObserver<ObservableList<DuneLocation>, DuneLocation>(OnRefreshRequired, list => list)
-            {
-                Observable = locations
+                Observable = calculations
             };
 
-            this.getCalculationFunc = getCalculationFunc;
-
-            Data = locations;
+            Data = calculations;
         }
 
         [TypeConverter(typeof(ExpandableArrayConverter))]
@@ -77,13 +66,13 @@
         {
             get
             {
-                return data.Select(loc => new DuneLocationProperties(loc, getCalculationFunc(loc))).ToArray();
+                return data.Select(calculation => new DuneLocationProperties(calculation.DuneLocation, calculation)).ToArray();
             }
         }
 
         public void Dispose()
         {
-            locationObserver.Dispose();
+            calculationsObserver.Dispose();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -rf74c65d0ad7a4658f8a87a0beace37735b3ce749 -r5cd1ac2b1438ea93461625d699a5377739c5abbf
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision f74c65d0ad7a4658f8a87a0beace37735b3ce749)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 5cd1ac2b1438ea93461625d699a5377739c5abbf)
@@ -63,7 +63,7 @@
             };
             yield return new PropertyInfo<DuneLocationCalculationsContext, DuneLocationsProperties>
             {
-                CreateInstance = context => new DuneLocationsProperties(context.WrappedData, l => l.Calculation)
+                CreateInstance = context => new DuneLocationsProperties(context.WrappedData)
             };
 
             yield return new PropertyInfo<DuneLocation, DuneLocationProperties>
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsPropertiesTest.cs
===================================================================
diff -u -rc743d1f229ff553fff9a05964c1adac6e510df4a -r5cd1ac2b1438ea93461625d699a5377739c5abbf
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsPropertiesTest.cs	(.../DuneLocationsPropertiesTest.cs)	(revision c743d1f229ff553fff9a05964c1adac6e510df4a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsPropertiesTest.cs	(.../DuneLocationsPropertiesTest.cs)	(revision 5cd1ac2b1438ea93461625d699a5377739c5abbf)
@@ -38,64 +38,53 @@
         private const int requiredLocationsPropertyIndex = 0;
 
         [Test]
-        public void Constructor_LocationsNull_ThrowsArgumentNullException()
+        public void Constructor_CalculationsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => new DuneLocationsProperties(null, dl => new DuneLocationCalculation(new TestDuneLocation()));
+            TestDelegate call = () => new DuneLocationsProperties(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("locations", exception.ParamName);
+            Assert.AreEqual("calculations", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_GetCalculationFuncNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => new DuneLocationsProperties(new ObservableList<DuneLocation>(), null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getCalculationFunc", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_WithData_ReturnExpectedValues()
         {
             // Setup
-            var location = new TestDuneLocation();
-            var locations = new ObservableList<DuneLocation>
+            var calculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
             {
-                location
+                calculation
             };
 
             // Call
-            using (var properties = new DuneLocationsProperties(locations, dl => new DuneLocationCalculation(new TestDuneLocation())))
+            using (var properties = new DuneLocationsProperties(duneLocationCalculations))
             {
                 // Assert
-                Assert.IsInstanceOf<ObjectProperties<ObservableList<DuneLocation>>>(properties);
+                Assert.IsInstanceOf<ObjectProperties<ObservableList<DuneLocationCalculation>>>(properties);
                 Assert.IsInstanceOf<IDisposable>(properties);
 
                 Assert.AreEqual(1, properties.Locations.Length);
-                Assert.AreSame(location, properties.Locations[0].Data);
+                Assert.AreSame(calculation.DuneLocation, properties.Locations[0].Data);
             }
         }
 
         [Test]
         public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var location = new TestDuneLocation();
-            var locations = new ObservableList<DuneLocation>
+            var calculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
             {
-                location
+                calculation
             };
 
             // Call
-            using (var properties = new DuneLocationsProperties(locations, dl => new DuneLocationCalculation(new TestDuneLocation())))
+            using (var properties = new DuneLocationsProperties(duneLocationCalculations))
             {
                 // Assert
-                Assert.AreSame(locations, properties.Data);
+                Assert.AreSame(duneLocationCalculations, properties.Data);
 
                 PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
                 Assert.AreEqual(1, dynamicProperties.Count);
@@ -111,40 +100,40 @@
         }
 
         [Test]
-        public void GivenPropertyControlWithData_WhenSingleLocationUpdated_RefreshRequiredEventRaised()
+        public void GivenPropertyControlWithData_WhenSingleCalculationUpdated_RefreshRequiredEventRaised()
         {
             // Given
-            DuneLocation location = new TestDuneLocation();
-            var duneLocations = new ObservableList<DuneLocation>
+            var calculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
             {
-                location
+                calculation
             };
 
-            using (var properties = new DuneLocationsProperties(duneLocations, dl => new DuneLocationCalculation(new TestDuneLocation())))
+            using (var properties = new DuneLocationsProperties(duneLocationCalculations))
             {
 
                 var refreshRequiredRaised = 0;
                 properties.RefreshRequired += (sender, args) => refreshRequiredRaised++;
 
                 // When
-                location.NotifyObservers();
+                calculation.NotifyObservers();
 
                 // Then
                 Assert.AreEqual(1, refreshRequiredRaised);
             }
         }
 
         [Test]
-        public void GivenDisposedPropertyControlWithData_WhenSingleLocationUpdated_RefreshRequiredEventNotRaised()
+        public void GivenDisposedPropertyControlWithData_WhenSingleCalculationUpdated_RefreshRequiredEventNotRaised()
         {
             // Given
-            DuneLocation location = new TestDuneLocation();
-            var duneLocations = new ObservableList<DuneLocation>
+            var calculation = new DuneLocationCalculation(new TestDuneLocation());
+            var duneLocationCalculations = new ObservableList<DuneLocationCalculation>
             {
-                location
+                calculation
             };
 
-            using (var properties = new DuneLocationsProperties(duneLocations, dl => new DuneLocationCalculation(new TestDuneLocation())))
+            using (var properties = new DuneLocationsProperties(duneLocationCalculations))
             {
 
                 var refreshRequiredRaised = 0;
@@ -153,7 +142,7 @@
                 properties.Dispose();
 
                 // When
-                location.NotifyObservers();
+                calculation.NotifyObservers();
 
                 // Then
                 Assert.AreEqual(0, refreshRequiredRaised);