Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -rd4dde608720153a015eb4e65c0d2d9e20b536e8d -r5ad58b7975b2e690dd7764a4e35872c95041f0bb
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision d4dde608720153a015eb4e65c0d2d9e20b536e8d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 5ad58b7975b2e690dd7764a4e35872c95041f0bb)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Components.Gis.Data;
@@ -35,63 +36,55 @@
     /// </summary>
     public partial class AssessmentSectionView : UserControl, IMapView
     {
+        private readonly IAssessmentSection assessmentSection;
         private readonly Observer assessmentSectionObserver;
         private readonly Observer hydraulicBoundaryLocationsObserver;
-        private readonly MapDataCollection mapDataCollection;
         private readonly MapLineData referenceLineMapData;
         private readonly MapPointData hydraulicBoundaryLocationsMapData;
 
         private readonly RecursiveObserver<ObservableList<HydraulicBoundaryLocation>, HydraulicBoundaryLocation> hydraulicBoundaryLocationObserver;
 
-        private IAssessmentSection data;
-
         /// <summary>
         /// Creates a new instance of <see cref="AssessmentSectionView"/>.
         /// </summary>
-        public AssessmentSectionView()
+        public AssessmentSectionView(IAssessmentSection assessmentSection)
         {
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentSection));
+            }
+
             InitializeComponent();
 
-            assessmentSectionObserver = new Observer(UpdateMapData);
-            hydraulicBoundaryLocationsObserver = new Observer(UpdateMapData);
+            assessmentSectionObserver = new Observer(UpdateMapData)
+            {
+                Observable = assessmentSection
+            };
+            hydraulicBoundaryLocationsObserver = new Observer(UpdateMapData)
+            {
+                Observable = assessmentSection.HydraulicBoundaryDatabase.Locations
+            };
             hydraulicBoundaryLocationObserver = new RecursiveObserver<ObservableList<HydraulicBoundaryLocation>, HydraulicBoundaryLocation>(
-                UpdateMapData, hbl => hbl);
+                UpdateMapData, hbl => hbl)
+            {
+                Observable = assessmentSection.HydraulicBoundaryDatabase.Locations
+            };
 
-            mapDataCollection = new MapDataCollection(Resources.AssessmentSectionMap_DisplayName);
+            var mapDataCollection = new MapDataCollection(Resources.AssessmentSectionMap_DisplayName);
             referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData();
             hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
 
             mapDataCollection.Add(referenceLineMapData);
             mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
-        }
 
-        public object Data
-        {
-            get
-            {
-                return data;
-            }
-            set
-            {
-                data = value as IAssessmentSection;
+            this.assessmentSection = assessmentSection;
 
-                assessmentSectionObserver.Observable = data;
-                hydraulicBoundaryLocationsObserver.Observable = data?.HydraulicBoundaryDatabase.Locations;
-                hydraulicBoundaryLocationObserver.Observable = data?.HydraulicBoundaryDatabase.Locations;
-
-                if (data == null)
-                {
-                    ringtoetsMapControl.RemoveAllData();
-                }
-                else
-                {
-                    SetMapDataFeatures();
-
-                    ringtoetsMapControl.SetAllData(mapDataCollection, data.BackgroundData);
-                }
-            }
+            SetMapDataFeatures();
+            ringtoetsMapControl.SetAllData(mapDataCollection, assessmentSection.BackgroundData);
         }
 
+        public object Data { get; set; }
+
         public IMapControl Map
         {
             get
@@ -123,8 +116,8 @@
 
         private void SetMapDataFeatures()
         {
-            referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(data.ReferenceLine, data.Id, data.Name);
-            hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(data.HydraulicBoundaryDatabase);
+            referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(assessmentSection.ReferenceLine, assessmentSection.Id, assessmentSection.Name);
+            hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(assessmentSection.HydraulicBoundaryDatabase);
         }
     }
 }
\ No newline at end of file