Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.cs	(.../LocationsView.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/LocationsView.cs	(.../LocationsView.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -164,6 +164,16 @@
             }
         }
 
+        /// <summary>
+        /// Handles the update from the hydraulic boundary database by refreshing
+        /// the data grid view and updating the data of the illustration points control.
+        /// </summary>
+        protected void HandleHydraulicBoundaryDatabaseUpdate()
+        {
+            dataGridViewControl.RefreshDataGridView();
+            illustrationPointsControl.Data = GetGeneralIllustrationPointsResult();
+        }
+
         private void LocalizeControls()
         {
             CalculateForSelectedButton.Text = Resources.CalculatableView_CalculateForSelectedButton_Text;
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -178,7 +178,7 @@
             }
             else
             {
-                dataGridViewControl.RefreshDataGridView();
+                HandleHydraulicBoundaryDatabaseUpdate();
             }
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -185,7 +185,7 @@
             }
             else
             {
-                dataGridViewControl.RefreshDataGridView();
+                HandleHydraulicBoundaryDatabaseUpdate();
             }
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -117,51 +117,51 @@
         }
 
         [Test]
-        public void Selection_LocationWithoutOutput_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutOutput_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(0, 1));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithoutGeneralResult_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutGeneralResult_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(1, 0));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithGeneralResult_GeneralResultSetOnChartData()
+        public void Selection_LocationWithGeneralResult_GeneralResultSetOnIllustrationPointsControlData()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(4, 0));
 
             // Assert
-            Assert.IsNotNull(chartControl.Data);
+            Assert.IsNotNull(control.Data);
         }
 
         [Test]
@@ -485,6 +485,33 @@
             Assert.AreEqual(expectedErrorMessage, errorProvider.GetError(button));
         }
 
+        [Test]
+        public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseNotifyObservers_UpdateIllustrationPointsControlData()
+        {
+            // Setup
+            GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
+            var illustrationPointsControl = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
+
+            var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
+
+            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+
+            // Precondition
+            Assert.IsNull(illustrationPointsControl.Data);
+
+            var output = new TestHydraulicBoundaryLocationOutput(1);
+            var result = new TestGeneralResult();
+            output.SetIllustrationPoints(result);
+
+            // Call
+            var locations = (ObservableList<HydraulicBoundaryLocation>)view.Data;
+            locations[3].DesignWaterLevelCalculation.Output = output;
+            locations.NotifyObservers();
+
+            // Assert
+            Assert.AreSame(result, illustrationPointsControl.Data);
+        }
+
         private GrassCoverErosionOutwardsDesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView()
         {
             var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -117,51 +117,51 @@
         }
 
         [Test]
-        public void Selection_LocationWithoutOutput_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutOutput_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(0, 1));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithoutGeneralResult_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutGeneralResult_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(1, 0));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithGeneralResult_GeneralResultSetOnChartData()
+        public void Selection_LocationWithGeneralResult_GeneralResultSetOnIllustrationPointsControlData()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(4, 0));
 
             // Assert
-            Assert.IsNotNull(chartControl.Data);
+            Assert.IsNotNull(control.Data);
         }
 
         [Test]
@@ -480,6 +480,33 @@
             Assert.AreEqual(expectedErrorMessage, errorProvider.GetError(button));
         }
 
+        [Test]
+        public void WaveHeightLocationsView_HydraulicBoundaryDatabaseNotifyObservers_UpdateIllustrationPointsControlData()
+        {
+            // Setup
+            GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+            var illustrationPointsControl = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
+
+            var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
+
+            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+
+            // Precondition
+            Assert.IsNull(illustrationPointsControl.Data);
+
+            var output = new TestHydraulicBoundaryLocationOutput(1);
+            var result = new TestGeneralResult();
+            output.SetIllustrationPoints(result);
+
+            // Call
+            var locations = (ObservableList<HydraulicBoundaryLocation>)view.Data;
+            locations[3].WaveHeightCalculation.Output = output;
+            locations.NotifyObservers();
+
+            // Assert
+            Assert.AreSame(result, illustrationPointsControl.Data);
+        }
+
         private GrassCoverErosionOutwardsWaveHeightLocationsView ShowWaveHeightLocationsView()
         {
             var view = new GrassCoverErosionOutwardsWaveHeightLocationsView();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -49,7 +49,7 @@
             InitializeComponent();
 
             assessmentSectionObserver = new Observer(UpdateHydraulicBoundaryDatabase);
-            hydraulicBoundaryDatabaseObserver = new Observer(() => dataGridViewControl.RefreshDataGridView());
+            hydraulicBoundaryDatabaseObserver = new Observer(HandleHydraulicBoundaryDatabaseUpdate);
         }
 
         public override IAssessmentSection AssessmentSection
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -49,7 +49,7 @@
             InitializeComponent();
 
             assessmentSectionObserver = new Observer(UpdateHydraulicBoundaryDatabase);
-            hydraulicBoundaryDatabaseObserver = new Observer(() => dataGridViewControl.RefreshDataGridView());
+            hydraulicBoundaryDatabaseObserver = new Observer(HandleHydraulicBoundaryDatabaseUpdate);
         }
 
         public override IAssessmentSection AssessmentSection
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -107,51 +107,51 @@
         }
 
         [Test]
-        public void Selection_LocationWithoutOutput_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutOutput_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(0, 1));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithoutGeneralResult_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutGeneralResult_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl) testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(1, 0));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithGeneralResult_GeneralResultSetOnChartData()
+        public void Selection_LocationWithGeneralResult_GeneralResultSetOnIllustrationPointsControlData()
         {
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
-            var chartControl = (IllustrationPointsChartControl) testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var illustrationPointsControl = (IllustrationPointsControl) testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(4, 0));
 
             // Assert
-            Assert.IsNotNull(chartControl.Data);
+            Assert.IsNotNull(illustrationPointsControl.Data);
         }
 
         [Test]
@@ -383,6 +383,32 @@
             Assert.DoesNotThrow(test);
         }
 
+        [Test]
+        public void DesignWaterLevelLocationsView_HydraulicBoundaryDatabaseNotifyObservers_UpdateIllustrationPointsControlData()
+        {
+            // Setup
+            DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
+            var illustrationPointsControl = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
+
+            var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
+            
+            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+
+            // Precondition
+            Assert.IsNull(illustrationPointsControl.Data);
+
+            var output = new TestHydraulicBoundaryLocationOutput(1);
+            var result = new TestGeneralResult();
+            output.SetIllustrationPoints(result);
+
+            // Call
+            view.AssessmentSection.HydraulicBoundaryDatabase.Locations[3].DesignWaterLevelCalculation.Output = output;
+            view.AssessmentSection.HydraulicBoundaryDatabase.NotifyObservers();
+
+            // Assert
+            Assert.AreSame(result, illustrationPointsControl.Data);
+        }
+
         private DesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView()
         {
             var view = new DesignWaterLevelLocationsView();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r13d9407c89466e20fe912bb64d078358f8d03afc -rd61395c0a62dbd3e563ad0d2942f544b2c5cc2e1
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 13d9407c89466e20fe912bb64d078358f8d03afc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision d61395c0a62dbd3e563ad0d2942f544b2c5cc2e1)
@@ -106,51 +106,51 @@
         }
 
         [Test]
-        public void Selection_LocationWithoutOutput_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutOutput_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var chartControl = (IllustrationPointsChartControl)testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(0, 1));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithoutGeneralResult_ChartControlDataSetToNull()
+        public void Selection_LocationWithoutGeneralResult_IllustrationPointsControlDataSetToNull()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var chartControl = (IllustrationPointsChartControl)testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(1, 0));
 
             // Assert
-            Assert.IsNull(chartControl.Data);
+            Assert.IsNull(control.Data);
         }
 
         [Test]
-        public void Selection_LocationWithGeneralResult_GeneralResultSetOnChartData()
+        public void Selection_LocationWithGeneralResult_GeneralResultSetOnIllustrationPointsControlData()
         {
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
-            var chartControl = (IllustrationPointsChartControl)testForm.Controls.Find("IllustrationPointsChartControl", true).Single();
+            var control = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
 
             var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
 
             // Call
             dataGridView.SetCurrentCell(dataGridView.GetCell(4, 0));
 
             // Assert
-            Assert.IsNotNull(chartControl.Data);
+            Assert.IsNotNull(control.Data);
         }
 
         [Test]
@@ -374,6 +374,32 @@
             Assert.DoesNotThrow(test);
         }
 
+        [Test]
+        public void WaveHeightlLocationsView_HydraulicBoundaryDatabaseNotifyObservers_UpdateIllustrationPointsControlData()
+        {
+            // Setup
+            WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
+            var illustrationPointsControl = (IllustrationPointsControl)testForm.Controls.Find("IllustrationPointsControl", true).Single();
+
+            var dataGridView = (DataGridViewControl)testForm.Controls.Find("dataGridViewControl", true).First();
+
+            dataGridView.SetCurrentCell(dataGridView.GetCell(3, 0));
+
+            // Precondition
+            Assert.IsNull(illustrationPointsControl.Data);
+
+            var output = new TestHydraulicBoundaryLocationOutput(1);
+            var result = new TestGeneralResult();
+            output.SetIllustrationPoints(result);
+
+            // Call
+            view.AssessmentSection.HydraulicBoundaryDatabase.Locations[3].WaveHeightCalculation.Output = output;
+            view.AssessmentSection.HydraulicBoundaryDatabase.NotifyObservers();
+
+            // Assert
+            Assert.AreSame(result, illustrationPointsControl.Data);
+        }
+
         private WaveHeightLocationsView ShowWaveHeightLocationsView()
         {
             var view = new WaveHeightLocationsView();