Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -rc24cd541ca55442bb710c202bc15344dc8fc3ef7 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision c24cd541ca55442bb710c202bc15344dc8fc3ef7)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -24,7 +24,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Utils.Reflection;
 using Core.Components.BruTile.Configurations;
 using Core.Components.BruTile.Forms;
 using Core.Components.DotSpatial.Forms.Properties;
@@ -52,15 +51,14 @@
         private readonly RecursiveObserver<MapDataCollection, MapDataCollection> mapDataCollectionObserver;
         private readonly Observer backGroundMapDataObserver;
         private readonly IList<DrawnMapData> drawnMapDataList = new List<DrawnMapData>();
-        protected bool Removing;
+        private readonly MapControlBackgroundLayerStatus backgroundLayerStatus = new MapControlBackgroundLayerStatus();
 
         private Map map;
+        private bool removing;
         private MapFunctionPan mapFunctionPan;
         private MapFunctionSelectionZoom mapFunctionSelectionZoom;
         private RdNewMouseCoordinatesMapExtension mouseCoordinatesMapExtension;
         private MapDataCollection data;
-
-        private readonly MapControlBackgroundLayerStatus backgroundLayerStatus = new MapControlBackgroundLayerStatus();
         private ImageBasedMapData backgroundMapData;
 
         /// <summary>
@@ -92,7 +90,7 @@
 
                 mapDataCollectionObserver.Observable = data;
 
-                if (HasMapData && !Removing)
+                if (HasMapData && !removing)
                 {
                     DrawInitialMapData();
                 }
@@ -115,7 +113,7 @@
                 backgroundMapData = value;
                 backGroundMapDataObserver.Observable = backgroundMapData;
 
-                if (HasMapData && !Removing)
+                if (HasMapData && !removing)
                 {
                     DrawInitialMapData();
                 }
@@ -124,10 +122,10 @@
 
         public virtual void RemoveAllData()
         {
-            Removing = true;
+            removing = true;
             Data = null;
             BackgroundMapData = null;
-            Removing = false;
+            removing = false;
         }
 
         protected override void Dispose(bool disposing)
@@ -397,7 +395,7 @@
         private void DrawMissingMapDataOnCollectionChange(IEnumerable<FeatureBasedMapData> mapDataThatShouldBeDrawn,
                                                           IDictionary<FeatureBasedMapData, DrawnMapData> drawnMapDataLookup)
         {
-            foreach (var mapDataToDraw in mapDataThatShouldBeDrawn.Where(mapDataToDraw => !drawnMapDataLookup.ContainsKey(mapDataToDraw)))
+            foreach (FeatureBasedMapData mapDataToDraw in mapDataThatShouldBeDrawn.Where(mapDataToDraw => !drawnMapDataLookup.ContainsKey(mapDataToDraw)))
             {
                 DrawMapData(mapDataToDraw);
             }
@@ -436,7 +434,7 @@
         private void RemoveRedundantMapDataOnCollectionChange(IEnumerable<FeatureBasedMapData> mapDataThatShouldBeDrawn,
                                                               IDictionary<FeatureBasedMapData, DrawnMapData> drawnMapDataLookup)
         {
-            foreach (var featureBasedMapData in drawnMapDataLookup.Keys.Except(mapDataThatShouldBeDrawn))
+            foreach (FeatureBasedMapData featureBasedMapData in drawnMapDataLookup.Keys.Except(mapDataThatShouldBeDrawn))
             {
                 RemoveMapData(drawnMapDataLookup[featureBasedMapData]);
             }
@@ -453,7 +451,7 @@
 
         private static void AddPadding(Extent extent)
         {
-            var padding = Math.Min(extent.Height, extent.Width) * 0.05;
+            double padding = Math.Min(extent.Height, extent.Width) * 0.05;
             if (Math.Max(extent.Height, extent.Width) + padding <= double.MaxValue)
             {
                 extent.ExpandBy(padding);
Index: Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj
===================================================================
diff -u -r08432b412fb47916669a52095d9e20afb24994c6 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj	(.../Core.Components.Gis.Forms.csproj)	(revision 08432b412fb47916669a52095d9e20afb24994c6)
+++ Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj	(.../Core.Components.Gis.Forms.csproj)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -54,7 +54,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Views\IBackgroundMapDataSelectionControl.cs" />
+    <Compile Include="Views\BackgroundMapDataSelectionControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Views\WellKnownMapDataControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
Index: Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs	(.../IMapControl.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs	(.../IMapControl.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -45,14 +45,14 @@
         bool IsMouseCoordinatesVisible { get; }
 
         /// <summary>
-        /// Gets or sets the data to show in the <see cref="IMapControl"/>.
+        /// Gets the data to show in the <see cref="IMapControl"/>.
         /// </summary>
-        MapDataCollection Data { get; set; }
+        MapDataCollection Data { get; }
 
         /// <summary>
-        /// Gets or sets the data to show in the background of the <see cref="IMapControl"/>.
+        /// Gets the data to show in the background of the <see cref="IMapControl"/>.
         /// </summary>
-        ImageBasedMapData BackgroundMapData { get; set; }
+        ImageBasedMapData BackgroundMapData { get; }
 
         /// <summary>
         /// Removes all the data from the map without redrawing any layers.
Index: Core/Components/src/Core.Components.Gis.Forms/Views/BackgroundMapDataSelectionControl.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis.Forms/Views/BackgroundMapDataSelectionControl.cs	(revision 0)
+++ Core/Components/src/Core.Components.Gis.Forms/Views/BackgroundMapDataSelectionControl.cs	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Windows.Forms;
+using Core.Components.Gis.Data;
+
+namespace Core.Components.Gis.Forms.Views
+{
+    /// <summary>
+    /// Abstract base class for a user control used for selecting background map data.
+    /// </summary>
+    public abstract class BackgroundMapDataSelectionControl : UserControl
+    {
+        /// <summary>
+        /// Fired when the <see cref="SelectedMapData"/> has been changed.
+        /// </summary>
+        public abstract event EventHandler<EventArgs> SelectedMapDataChanged;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="BackgroundMapDataSelectionControl"/>.
+        /// </summary>
+        /// <param name="displayName">The display name of the user control.</param>
+        protected BackgroundMapDataSelectionControl(string displayName)
+        {
+            DisplayName = displayName;
+        }
+
+        /// <summary>
+        /// Gets the display name of the user control.
+        /// </summary>
+        public string DisplayName { get; }
+
+        /// <summary>
+        /// Gets the selected <see cref="ImageBasedMapData"/> or <c>null</c> if none selected.
+        /// </summary>
+        public abstract ImageBasedMapData SelectedMapData { get; }
+    }
+}
\ No newline at end of file
Fisheye: Tag 11eb517ba7a480b4a415855798a7fadefc0cfe54 refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis.Forms/Views/IBackgroundMapDataSelectionControl.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.Gis.Forms/Views/WellKnownMapDataControl.cs
===================================================================
diff -u -r0e50500bb017c821970b286992f14b03dca0e69d -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/src/Core.Components.Gis.Forms/Views/WellKnownMapDataControl.cs	(.../WellKnownMapDataControl.cs)	(revision 0e50500bb017c821970b286992f14b03dca0e69d)
+++ Core/Components/src/Core.Components.Gis.Forms/Views/WellKnownMapDataControl.cs	(.../WellKnownMapDataControl.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -30,16 +30,17 @@
     /// <summary>
     /// This class represents a <see cref="Control"/> where a well known map data layer can be selected.
     /// </summary>
-    public partial class WellKnownMapDataControl : UserControl, IBackgroundMapDataSelectionControl
+    public partial class WellKnownMapDataControl : BackgroundMapDataSelectionControl
     {
-        public event EventHandler<EventArgs> SelectedMapDataChanged;
+        public override event EventHandler<EventArgs> SelectedMapDataChanged;
 
         /// <summary>
         /// Creates a new instance of <see cref="WellKnownMapDataControl"/>.
         /// </summary>
         /// <param name="activeWellKnownTileSourceMapData">The active <see cref="WellKnownTileSourceMapData"/> 
         /// or <c>null</c> if none active.</param>
         public WellKnownMapDataControl(WellKnownTileSourceMapData activeWellKnownTileSourceMapData)
+            : base(Resources.WellKnownMapDataControl_DisplayName)
         {
             InitializeComponent();
             InitializeDataGridView();
@@ -48,24 +49,14 @@
             PreSelectDataGridView(activeWellKnownTileSourceMapData);
         }
 
-        public string DisplayName
+        public override ImageBasedMapData SelectedMapData
         {
             get
             {
-                return Resources.WellKnownMapDataControl_DisplayName;
-            }
-        }
-
-        public ImageBasedMapData SelectedMapData
-        {
-            get
-            {
                 return dataGridViewControl.CurrentRow?.DataBoundItem as WellKnownTileSourceMapData;
             }
         }
 
-        public UserControl UserControl => this;
-
         private void PreSelectDataGridView(WellKnownTileSourceMapData activeWellKnownTileSourceMapData)
         {
             if (activeWellKnownTileSourceMapData == null)
Index: Core/Components/src/Core.Components.Gis.Forms/Views/WmtsLocationControl.cs
===================================================================
diff -u -r773c8bead12417f353dc62c006f93fee5a68d06e -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/src/Core.Components.Gis.Forms/Views/WmtsLocationControl.cs	(.../WmtsLocationControl.cs)	(revision 773c8bead12417f353dc62c006f93fee5a68d06e)
+++ Core/Components/src/Core.Components.Gis.Forms/Views/WmtsLocationControl.cs	(.../WmtsLocationControl.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -41,7 +40,7 @@
     /// <summary>
     /// This class represents a <see cref="Control"/> where a WMTS layer can be selected.
     /// </summary>
-    public partial class WmtsLocationControl : UserControl, IBackgroundMapDataSelectionControl
+    public partial class WmtsLocationControl : BackgroundMapDataSelectionControl
     {
         private const string wmtsConnectionInfoFileName = "wmtsConnectionInfo.config";
         private static readonly ILog log = LogManager.GetLogger(typeof(WmtsLocationControl));
@@ -60,6 +59,7 @@
         /// <param name="wmtsCapabilityFactory">The <see cref="IWmtsCapabilityFactory"/> to use.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="wmtsCapabilityFactory"/> is <c>null</c>.</exception>
         public WmtsLocationControl(WmtsMapData activeWmtsMapData, IWmtsCapabilityFactory wmtsCapabilityFactory)
+            : base(Resources.WmtsLocationControl_DisplayName)
         {
             if (wmtsCapabilityFactory == null)
             {
@@ -88,18 +88,10 @@
             UpdateButtons();
         }
 
-        public string DisplayName
+        public override ImageBasedMapData SelectedMapData
         {
             get
             {
-                return Resources.WmtsLocationControl_DisplayName;
-            }
-        }
-
-        public ImageBasedMapData SelectedMapData
-        {
-            get
-            {
                 WmtsCapability currentRow = GetSelectedWmtsCapability();
                 if (currentRow == null)
                 {
@@ -116,14 +108,6 @@
             }
         }
 
-        public UserControl UserControl
-        {
-            get
-            {
-                return this;
-            }
-        }
-
         protected override void Dispose(bool disposing)
         {
             if (disposing)
@@ -401,7 +385,7 @@
             UpdateComboBoxDataSource(createdWmtsConnectionInfos);
         }
 
-        public event EventHandler<EventArgs> SelectedMapDataChanged;
+        public override event EventHandler<EventArgs> SelectedMapDataChanged;
 
         #endregion
     }
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj
===================================================================
diff -u -r08432b412fb47916669a52095d9e20afb24994c6 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 08432b412fb47916669a52095d9e20afb24994c6)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -61,6 +61,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Views\BackgroundMapDataSelectionControlTest.cs" />
     <Compile Include="Views\WellKnownMapDataControlTest.cs" />
     <Compile Include="Views\WmtsConnectionDialogTest.cs" />
     <Compile Include="Views\WmtsLocationControlTest.cs" />
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/BackgroundMapDataSelectionControlTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/BackgroundMapDataSelectionControlTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/BackgroundMapDataSelectionControlTest.cs	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -0,0 +1,54 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Windows.Forms;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Forms.Views;
+using NUnit.Framework;
+
+namespace Core.Components.Gis.Forms.Test.Views
+{
+    [TestFixture]
+    public class BackgroundMapDataSelectionControlTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var backgroundMapDataSelectionControl = new TestBackgroundMapDataSelectionControl("Random display name");
+
+            // Assert
+            Assert.IsInstanceOf<UserControl>(backgroundMapDataSelectionControl);
+            Assert.AreEqual("Random display name", backgroundMapDataSelectionControl.DisplayName);
+        }
+
+        private class TestBackgroundMapDataSelectionControl : BackgroundMapDataSelectionControl
+        {
+            public override event EventHandler<EventArgs> SelectedMapDataChanged;
+
+            public TestBackgroundMapDataSelectionControl(string displayName)
+                : base(displayName) {}
+
+            public override ImageBasedMapData SelectedMapData { get; }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WellKnownMapDataControlTest.cs
===================================================================
diff -u -r08432b412fb47916669a52095d9e20afb24994c6 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WellKnownMapDataControlTest.cs	(.../WellKnownMapDataControlTest.cs)	(revision 08432b412fb47916669a52095d9e20afb24994c6)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WellKnownMapDataControlTest.cs	(.../WellKnownMapDataControlTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -42,10 +42,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<UserControl>(control);
-                Assert.IsInstanceOf<IBackgroundMapDataSelectionControl>(control);
+                Assert.IsInstanceOf<BackgroundMapDataSelectionControl>(control);
                 Assert.AreEqual("Bekende kaartlagen", control.DisplayName);
                 Assert.IsNull(control.SelectedMapData);
-                Assert.AreSame(control, control.UserControl);
             }
         }
 
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -r2db5ccc1fb164fc6f43733359a0e745ec6891edd -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 2db5ccc1fb164fc6f43733359a0e745ec6891edd)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -100,10 +100,9 @@
                 {
                     // Assert
                     Assert.IsInstanceOf<UserControl>(control);
-                    Assert.IsInstanceOf<IBackgroundMapDataSelectionControl>(control);
+                    Assert.IsInstanceOf<BackgroundMapDataSelectionControl>(control);
                     Assert.AreEqual("Web Map Tile Service (WMTS)", control.DisplayName);
                     Assert.IsNull(control.SelectedMapData);
-                    Assert.AreSame(control, control.UserControl);
                 }
             }
         }
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r45440093089496f59ed420e772136756c229e30b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 45440093089496f59ed420e772136756c229e30b)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
@@ -32,7 +33,6 @@
 using Core.Common.Utils.Reflection;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using Core.Plugins.Map.Legend;
 using Core.Plugins.Map.Properties;
@@ -63,7 +63,7 @@
 
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
-            TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
             Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapDataCollection)];
@@ -104,7 +104,7 @@
             var mapDataCollection = new MapDataCollection("Collectie");
 
             // Call
-            var text = info.Text(mapDataCollection);
+            string text = info.Text(mapDataCollection);
 
             // Assert
             Assert.AreEqual(mapDataCollection.Name, text);
@@ -117,7 +117,7 @@
             mocks.ReplayAll();
 
             // Call
-            var image = info.Image(null);
+            Image image = info.Image(null);
 
             // Assert
             TestHelper.AssertImagesAreEqual(GuiResources.folder, image);
@@ -158,7 +158,7 @@
             var mapDataCollection = new MapDataCollection("test data");
 
             // Call
-            var canDrop = info.CanDrop(new object(), mapDataCollection);
+            bool canDrop = info.CanDrop(new object(), mapDataCollection);
 
             // Assert
             Assert.IsFalse(canDrop);
@@ -174,7 +174,7 @@
             mocks.ReplayAll();
 
             // Call
-            var canDrop = info.CanDrop(mapData, mapDataCollection);
+            bool canDrop = info.CanDrop(mapData, mapDataCollection);
 
             // Assert
             Assert.IsTrue(canDrop);
@@ -188,7 +188,7 @@
             var mapDataCollection = new MapDataCollection("test data");
 
             // Call
-            var canInsert = info.CanInsert(new object(), mapDataCollection);
+            bool canInsert = info.CanInsert(new object(), mapDataCollection);
 
             // Assert
             Assert.IsFalse(canInsert);
@@ -204,7 +204,7 @@
             mocks.ReplayAll();
 
             // Call
-            var canInsert = info.CanInsert(mapData, mapDataCollection);
+            bool canInsert = info.CanInsert(mapData, mapDataCollection);
 
             // Assert
             Assert.IsTrue(canInsert);
@@ -239,7 +239,7 @@
                 info.OnDrop(mapData1, mapDataCollection, mapDataCollection, position, treeViewControl);
 
                 // Assert
-                var reversedIndex = 2 - position;
+                int reversedIndex = 2 - position;
                 Assert.AreSame(mapData1, mapDataCollection.Collection.ElementAt(reversedIndex));
             }
         }
@@ -302,7 +302,7 @@
                 // Call
                 var builder = new ContextMenuBuilder(applicationFeatureCommandsStub,
                                                      importCommandHandlerMock,
-                                                     exportCommandHandlerMock, 
+                                                     exportCommandHandlerMock,
                                                      updateCommandHandlerMock,
                                                      viewCommandsMock,
                                                      mapDataCollection,
@@ -365,7 +365,7 @@
                 // Call
                 var builder = new ContextMenuBuilder(applicationFeatureCommandsStub,
                                                      importCommandHandlerMock,
-                                                     exportCommandHandlerMock, 
+                                                     exportCommandHandlerMock,
                                                      updateCommandHandlerMock,
                                                      viewCommandsMock,
                                                      mapDataCollection,
@@ -438,7 +438,7 @@
                 // Call
                 var builder = new ContextMenuBuilder(applicationFeatureCommandsStub,
                                                      importCommandHandlerMock,
-                                                     exportCommandHandlerMock, 
+                                                     exportCommandHandlerMock,
                                                      updateCommandHandlerMock,
                                                      viewCommandsMock,
                                                      mapDataCollection,
@@ -497,13 +497,9 @@
             var builder = new CustomItemsOnlyContextMenuBuilder();
             contextMenuBuilderProvider.Stub(p => p.Get(null, null)).IgnoreArguments().Return(builder);
 
-            var mapControl = mocks.Stub<IMapControl>();
-            mapControl.Expect(c => c.ZoomToAllVisibleLayers(mapData));
             mocks.ReplayAll();
 
-            mapLegendView.MapControl = mapControl;
-
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -529,7 +525,7 @@
                 IsVisible = true
             };
 
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 TestDelegate call = () => contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs
===================================================================
diff -u -r05b272ce1fe41ddbb79d367399d1339caec1a06b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 05b272ce1fe41ddbb79d367399d1339caec1a06b)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -167,7 +167,7 @@
         }
 
         [Test]
-        public void Data_ForNull_NullSet()
+        public void Data_Null_NullSet()
         {
             // Setup
             using (var view = new MapLegendView(contextMenuBuilderProvider))
@@ -181,7 +181,7 @@
         }
 
         [Test]
-        public void Data_OtherObject_ThrowsInvalidCastException()
+        public void Data_OtherObjectType_ThrowsInvalidCastException()
         {
             // Setup 
             using (var view = new MapLegendView(contextMenuBuilderProvider))
@@ -200,10 +200,10 @@
         {
             // Setup
             var mapData = new MapDataCollection("A");
-
             var mockRepository = new MockRepository();
             var mapControl = mockRepository.Stub<IMapControl>();
-            mapControl.Data = mapData;
+
+            mapControl.Expect(mc => mc.Data).Return(mapData);
             mockRepository.ReplayAll();
 
             using (var view = new MapLegendView(contextMenuBuilderProvider)
@@ -258,7 +258,7 @@
                 treeViewControl.TrySelectNodeForData(mapData);
 
                 // Call
-                var selection = view.Selection;
+                object selection = view.Selection;
 
                 // Assert
                 Assert.AreSame(mapData, selection);
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs
===================================================================
diff -u -r5bf59860c8030dc0e3fd02d02d446bf2fba691c1 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 5bf59860c8030dc0e3fd02d02d446bf2fba691c1)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLineDataTreeNodeInfoTest.cs	(.../MapLineDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -21,7 +21,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.ContextMenu;
@@ -30,7 +32,6 @@
 using Core.Common.Utils.Reflection;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using Core.Plugins.Map.Legend;
 using Core.Plugins.Map.Properties;
@@ -57,7 +58,7 @@
 
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
-            TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
             Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapLineData)];
@@ -106,7 +107,7 @@
             var mapLineData = new MapLineData("test data");
 
             // Call
-            var text = info.Text(mapLineData);
+            string text = info.Text(mapLineData);
 
             // Assert
             Assert.AreEqual(mapLineData.Name, text);
@@ -119,7 +120,7 @@
             mocks.ReplayAll();
 
             // Call
-            var image = info.Image(null);
+            Image image = info.Image(null);
 
             // Assert
             TestHelper.AssertImagesAreEqual(Resources.LineIcon, image);
@@ -169,7 +170,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -194,7 +195,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -220,7 +221,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -247,13 +248,9 @@
             var builder = new CustomItemsOnlyContextMenuBuilder();
             contextMenuBuilderProvider.Stub(p => p.Get(null, null)).IgnoreArguments().Return(builder);
 
-            var mapControl = mocks.Stub<IMapControl>();
-            mapControl.Expect(c => c.ZoomToAllVisibleLayers(mapData));
             mocks.ReplayAll();
 
-            mapLegendView.MapControl = mapControl;
-
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -279,7 +276,7 @@
                 IsVisible = true
             };
 
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 TestDelegate call = () => contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -297,7 +294,7 @@
             var mapLineData = new MapLineData("test data");
 
             // Call
-            var canCheck = info.CanCheck(mapLineData);
+            bool canCheck = info.CanCheck(mapLineData);
 
             // Assert
             Assert.IsTrue(canCheck);
@@ -311,7 +308,7 @@
             var mapLineData = new MapLineData("test data");
 
             // Call
-            var canDrag = info.CanDrag(mapLineData, null);
+            bool canDrag = info.CanDrag(mapLineData, null);
 
             // Assert
             Assert.IsTrue(canDrag);
@@ -329,7 +326,7 @@
             };
 
             // Call
-            var canCheck = info.IsChecked(mapLineData);
+            bool canCheck = info.IsChecked(mapLineData);
 
             // Assert
             Assert.AreEqual(isVisible, canCheck);
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs
===================================================================
diff -u -r8b3f995635bbd317936d1607058bb0e80c3c5508 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 8b3f995635bbd317936d1607058bb0e80c3c5508)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPointDataTreeNodeInfoTest.cs	(.../MapPointDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -21,7 +21,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.ContextMenu;
@@ -30,7 +32,6 @@
 using Core.Common.Utils.Reflection;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using Core.Plugins.Map.Legend;
 using Core.Plugins.Map.Properties;
@@ -57,7 +58,7 @@
 
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
-            TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
             Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapPointData)];
@@ -106,7 +107,7 @@
             var mapPointData = new MapPointData("MapPointData");
 
             // Call
-            var text = info.Text(mapPointData);
+            string text = info.Text(mapPointData);
 
             // Assert
             Assert.AreEqual(mapPointData.Name, text);
@@ -119,7 +120,7 @@
             mocks.ReplayAll();
 
             // Call
-            var image = info.Image(null);
+            Image image = info.Image(null);
 
             // Assert
             TestHelper.AssertImagesAreEqual(Resources.PointsIcon, image);
@@ -169,7 +170,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -194,7 +195,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -220,7 +221,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -240,20 +241,16 @@
                 IsVisible = true,
                 Features = new[]
                 {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
+                    new MapFeature(Enumerable.Empty<MapGeometry>())
                 }
             };
 
             var builder = new CustomItemsOnlyContextMenuBuilder();
             contextMenuBuilderProvider.Stub(p => p.Get(null, null)).IgnoreArguments().Return(builder);
 
-            var mapControl = mocks.Stub<IMapControl>();
-            mapControl.Expect(c => c.ZoomToAllVisibleLayers(mapData));
             mocks.ReplayAll();
 
-            mapLegendView.MapControl = mapControl;
-
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -279,7 +276,7 @@
                 IsVisible = true
             };
 
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 TestDelegate call = () => contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -297,7 +294,7 @@
             var mapPointData = new MapPointData("test data");
 
             // Call
-            var canCheck = info.CanCheck(mapPointData);
+            bool canCheck = info.CanCheck(mapPointData);
 
             // Assert
             Assert.IsTrue(canCheck);
@@ -311,7 +308,7 @@
             var mapPointData = new MapPointData("test data");
 
             // Call
-            var canDrag = info.CanDrag(mapPointData, null);
+            bool canDrag = info.CanDrag(mapPointData, null);
 
             // Assert
             Assert.IsTrue(canDrag);
@@ -329,7 +326,7 @@
             };
 
             // Call
-            var canCheck = info.IsChecked(mapPointData);
+            bool canCheck = info.IsChecked(mapPointData);
 
             // Assert
             Assert.AreEqual(isVisible, canCheck);
Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs
===================================================================
diff -u -r8b3f995635bbd317936d1607058bb0e80c3c5508 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 8b3f995635bbd317936d1607058bb0e80c3c5508)
+++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs	(.../MapPolygonDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -21,7 +21,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.ContextMenu;
@@ -30,7 +32,6 @@
 using Core.Common.Utils.Reflection;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
-using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using Core.Plugins.Map.Legend;
 using Core.Plugins.Map.Properties;
@@ -57,7 +58,7 @@
 
             mapLegendView = new MapLegendView(contextMenuBuilderProvider);
 
-            TreeViewControl treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(mapLegendView, "treeViewControl");
             Dictionary<Type, TreeNodeInfo> treeNodeInfoLookup = TypeUtils.GetField<Dictionary<Type, TreeNodeInfo>>(treeViewControl, "tagTypeTreeNodeInfoLookup");
 
             info = treeNodeInfoLookup[typeof(MapPolygonData)];
@@ -106,7 +107,7 @@
             var mapPolygonData = new MapPolygonData("MapPolygonData");
 
             // Call
-            var text = info.Text(mapPolygonData);
+            string text = info.Text(mapPolygonData);
 
             // Assert
             Assert.AreEqual(mapPolygonData.Name, text);
@@ -119,7 +120,7 @@
             mocks.ReplayAll();
 
             // Call
-            var image = info.Image(null);
+            Image image = info.Image(null);
 
             // Assert
             TestHelper.AssertImagesAreEqual(Resources.AreaIcon, image);
@@ -169,7 +170,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -194,7 +195,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -220,7 +221,7 @@
             };
 
             // Call
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Assert
                 TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuZoomToAllIndex,
@@ -247,13 +248,9 @@
             var builder = new CustomItemsOnlyContextMenuBuilder();
             contextMenuBuilderProvider.Stub(p => p.Get(null, null)).IgnoreArguments().Return(builder);
 
-            var mapControl = mocks.Stub<IMapControl>();
-            mapControl.Expect(c => c.ZoomToAllVisibleLayers(mapData));
             mocks.ReplayAll();
 
-            mapLegendView.MapControl = mapControl;
-
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -279,7 +276,7 @@
                 IsVisible = true
             };
 
-            using (var contextMenu = info.ContextMenuStrip(mapData, null, null))
+            using (ContextMenuStrip contextMenu = info.ContextMenuStrip(mapData, null, null))
             {
                 // Call
                 TestDelegate call = () => contextMenu.Items[contextMenuZoomToAllIndex].PerformClick();
@@ -297,7 +294,7 @@
             var mapPolygonData = new MapPolygonData("test data");
 
             // Call
-            var canCheck = info.CanCheck(mapPolygonData);
+            bool canCheck = info.CanCheck(mapPolygonData);
 
             // Assert
             Assert.IsTrue(canCheck);
@@ -311,7 +308,7 @@
             var mapPolygonData = new MapPolygonData("test data");
 
             // Call
-            var canDrag = info.CanDrag(mapPolygonData, null);
+            bool canDrag = info.CanDrag(mapPolygonData, null);
 
             // Assert
             Assert.IsTrue(canDrag);
@@ -329,7 +326,7 @@
             };
 
             // Call
-            var canCheck = info.IsChecked(mapPolygonData);
+            bool canCheck = info.IsChecked(mapPolygonData);
 
             // Assert
             Assert.AreEqual(isVisible, canCheck);
Index: Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.Designer.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.Designer.cs	(.../MapDataView.Designer.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.Designer.cs	(.../MapDataView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -52,14 +52,14 @@
             this.mapControl = new Core.Components.DotSpatial.Forms.MapControl();
             this.SuspendLayout();
             // 
-            // mapControl1
+            // mapControl
             // 
             this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
             this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl1";
+            this.mapControl.Name = "mapControl";
             this.mapControl.Size = new System.Drawing.Size(150, 150);
             this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            this.mapControl.Text = "mapControl";
             // 
             // MapDataView
             // 
Index: Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.cs
===================================================================
diff -u -r675771641656abfb56ef89be86bad7bd21684016 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 675771641656abfb56ef89be86bad7bd21684016)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Views/MapDataView.cs	(.../MapDataView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -46,7 +46,7 @@
             }
             set
             {
-                Map.Data = value as MapDataCollection;
+                mapControl.Data = value as MapDataCollection;
             }
         }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs	(.../ClosingStructuresFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.Designer.cs	(.../ClosingStructuresFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // ClosingStructuresFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "ClosingStructuresFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -132,7 +132,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -147,8 +147,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -157,7 +156,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
@@ -77,7 +76,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -110,16 +110,14 @@
 
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(
                     new ClosingStructuresFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -145,8 +143,6 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(
@@ -156,16 +152,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(8, mapControl.Data.Collection.Count());
+                Assert.AreEqual(8, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -197,7 +193,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -302,7 +298,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -348,7 +344,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -387,7 +383,7 @@
             // Given
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var currentHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -426,14 +422,14 @@
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -477,7 +473,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -509,7 +505,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -546,7 +542,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -575,7 +571,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -626,7 +622,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -665,7 +661,7 @@
             // Setup
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new ClosingStructuresFailureMechanism();
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -712,7 +708,7 @@
 
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new ClosingStructuresFailureMechanism();
@@ -810,7 +806,7 @@
             var newClosingStructuresFailureMechanismContext = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), newAssessmentSection);
             using (var view = new ClosingStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldClosingStructuresFailureMechanismContext;
                 view.Data = newClosingStructuresFailureMechanismContext;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rb32945a16187c3a63d141f62adda481385bf68d9 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision b32945a16187c3a63d141f62adda481385bf68d9)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -148,8 +148,11 @@
     </Compile>
     <Compile Include="Helpers\FailureMechanismSectionResultRowHelper.cs" />
     <Compile Include="Views\RingtoetsMapControl.cs">
-      <SubType>Component</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Views\RingtoetsMapControl.Designer.cs">
+      <DependentUpon>RingtoetsMapControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\RingtoetsMapDataFeaturesFactory.cs" />
     <Compile Include="TreeNodeInfos\RingtoetsContextMenuBuilder.cs" />
     <Compile Include="TreeNodeInfos\RingtoetsTreeNodeInfoFactory.cs" />
@@ -198,6 +201,9 @@
       <DependentUpon>HydraulicBoundaryLocationsView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\RingtoetsMapControl.resx">
+      <DependentUpon>RingtoetsMapControl.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.Designer.cs	(.../FailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.Designer.cs	(.../FailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // FailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "FailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private RingtoetsMapControl mapControl;
+        private RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs	(.../FailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs	(.../FailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -102,7 +102,7 @@
 
                     mapDataCollection.Name = defaultMapDataCollectionName;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -114,8 +114,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -124,7 +123,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.Designer.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.Designer.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.Designer.cs	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -0,0 +1,67 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Common.Forms.Views
+{
+    partial class RingtoetsMapControl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.mapControl = new Core.Components.DotSpatial.Forms.MapControl();
+            this.SuspendLayout();
+            // 
+            // mapControl
+            // 
+            this.mapControl.BackgroundMapData = null;
+            this.mapControl.Data = null;
+            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.mapControl.Location = new System.Drawing.Point(0, 0);
+            this.mapControl.Name = "mapControl";
+            this.mapControl.Size = new System.Drawing.Size(150, 150);
+            this.mapControl.TabIndex = 0;
+            this.mapControl.Text = "mapControl";
+            // 
+            // RingtoetsMapControl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.mapControl);
+            this.Name = "RingtoetsMapControl";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Core.Components.DotSpatial.Forms.MapControl mapControl;
+    }
+}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.cs
===================================================================
diff -u -rb48b5cf86db182ea3e86296def02347e4389e482 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.cs	(.../RingtoetsMapControl.cs)	(revision b48b5cf86db182ea3e86296def02347e4389e482)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.cs	(.../RingtoetsMapControl.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -19,18 +19,20 @@
 // 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.DotSpatial.Forms;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.Forms;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Utils.TypeConverters;
 
 namespace Ringtoets.Common.Forms.Views
 {
     /// <summary>
-    /// This class describes a map control with background.
+    /// Ringtoets map control with background data synchronization.
     /// </summary>
-    public class RingtoetsMapControl : MapControl
+    public partial class RingtoetsMapControl : UserControl
     {
         private readonly Observer backgroundDataObserver;
 
@@ -41,55 +43,83 @@
         /// </summary>
         public RingtoetsMapControl()
         {
+            InitializeComponent();
+
             backgroundDataObserver = new Observer(OnBackgroundDataUpdated);
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="BackgroundData"/>.
+        /// Gets the wrapped <see cref="IMapControl"/>.
         /// </summary>
-        public BackgroundData BackgroundData
+        public IMapControl MapControl
         {
             get
             {
-                return backgroundData;
+                return mapControl;
             }
-            set
+        }
+
+        /// <summary>
+        /// Sets all data to the control.
+        /// </summary>
+        /// <param name="data">The <see cref="MapDataCollection"/> to set to the control.</param>
+        /// <param name="background">The <see cref="BackgroundData"/> to set to the control.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any of the parameters is <c>null</c>.</exception>
+        public void SetAllData(MapDataCollection data, BackgroundData background)
+        {
+            if (data == null)
             {
-                backgroundData = value;
-                backgroundDataObserver.Observable = backgroundData;
+                throw new ArgumentNullException(nameof(data));
+            }
 
-                BackgroundMapData = backgroundData != null
-                                        ? BackgroundDataConverter.ConvertFrom(backgroundData)
-                                        : null;
+            if (background == null)
+            {
+                throw new ArgumentNullException(nameof(background));
             }
+
+            backgroundData = background;
+            backgroundDataObserver.Observable = backgroundData;
+
+            mapControl.Data = data;
+            mapControl.BackgroundMapData = backgroundData != null
+                                               ? BackgroundDataConverter.ConvertFrom(backgroundData)
+                                               : null;
         }
 
-        public override void RemoveAllData()
+        /// <summary>
+        /// Removes all data from the control.
+        /// </summary>
+        public void RemoveAllData()
         {
-            Removing = true;
-            BackgroundData = null;
-            Data = null;
-            Removing = false;
+            backgroundData = null;
+            backgroundDataObserver.Observable = null;
+
+            mapControl.RemoveAllData();
         }
 
         protected override void Dispose(bool disposing)
         {
             backgroundDataObserver.Dispose();
 
+            if (disposing)
+            {
+                components?.Dispose();
+            }
+
             base.Dispose(disposing);
         }
 
         private void OnBackgroundDataUpdated()
         {
-            if (backgroundData.Configuration is WmtsBackgroundDataConfiguration && BackgroundMapData is WmtsMapData
-                || backgroundData.Configuration is WellKnownBackgroundDataConfiguration && BackgroundMapData is WellKnownTileSourceMapData)
+            if (backgroundData.Configuration is WmtsBackgroundDataConfiguration && mapControl.BackgroundMapData is WmtsMapData
+                || backgroundData.Configuration is WellKnownBackgroundDataConfiguration && mapControl.BackgroundMapData is WellKnownTileSourceMapData)
             {
                 UpdateBackgroundMapData();
-                BackgroundMapData.NotifyObservers();
+                mapControl.BackgroundMapData.NotifyObservers();
             }
             else
             {
-                BackgroundMapData = BackgroundDataConverter.ConvertFrom(backgroundData);
+                mapControl.BackgroundMapData = BackgroundDataConverter.ConvertFrom(backgroundData);
             }
         }
 
@@ -102,23 +132,23 @@
                 if (newData.IsConfigured)
                 {
                     var newWmtsData = (WmtsMapData) newData;
-                    ((WmtsMapData) BackgroundMapData).Configure(newWmtsData.SourceCapabilitiesUrl,
-                                                                newWmtsData.SelectedCapabilityIdentifier,
-                                                                newWmtsData.PreferredFormat);
+                    ((WmtsMapData) mapControl.BackgroundMapData).Configure(newWmtsData.SourceCapabilitiesUrl,
+                                                                           newWmtsData.SelectedCapabilityIdentifier,
+                                                                           newWmtsData.PreferredFormat);
                 }
                 else
                 {
-                    ((WmtsMapData) BackgroundMapData).RemoveConfiguration();
+                    ((WmtsMapData) mapControl.BackgroundMapData).RemoveConfiguration();
                 }
             }
             else if (backgroundData.Configuration is WellKnownBackgroundDataConfiguration)
             {
-                ((WellKnownTileSourceMapData) BackgroundMapData).SetTileSource(((WellKnownTileSourceMapData) newData).TileSource);
+                ((WellKnownTileSourceMapData) mapControl.BackgroundMapData).SetTileSource(((WellKnownTileSourceMapData) newData).TileSource);
             }
 
-            BackgroundMapData.IsVisible = newData.IsVisible;
-            BackgroundMapData.Name = newData.Name;
-            BackgroundMapData.Transparency = newData.Transparency;
+            mapControl.BackgroundMapData.IsVisible = newData.IsVisible;
+            mapControl.BackgroundMapData.Name = newData.Name;
+            mapControl.BackgroundMapData.Transparency = newData.Transparency;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.resx
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.resx	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapControl.resx	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using NUnit.Framework;
@@ -68,7 +67,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -100,16 +100,14 @@
 
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanism = new TestFailureMechanism();
                 var failureMechanismContext = new FailureMechanismContext<TestFailureMechanism>(failureMechanism, assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -135,23 +133,21 @@
             // Setup
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new FailureMechanismContext<TestFailureMechanism>(new TestFailureMechanism(), new ObservableTestAssessmentSectionStub());
 
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(5, mapControl.Data.Collection.Count());
+                Assert.AreEqual(5, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(failureMechanismContext.Parent.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -180,7 +176,7 @@
             // Setup
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -243,7 +239,7 @@
             // Setup
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -289,7 +285,7 @@
             // Setup
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -328,7 +324,7 @@
             // Given
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var currentHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -367,14 +363,14 @@
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {
             // Setup
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -418,7 +414,7 @@
             // Setup
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new TestFailureMechanism();
                 var failureMechanismContext = new FailureMechanismContext<TestFailureMechanism>(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -456,7 +452,7 @@
 
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new TestFailureMechanism();
@@ -536,7 +532,7 @@
             var newFailureMechanismContext = new FailureMechanismContext<TestFailureMechanism>(new TestFailureMechanism(), newAssessmentSection);
             using (var view = new FailureMechanismView<TestFailureMechanism>())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldFailureMechanismContext;
                 view.Data = newFailureMechanismContext;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs
===================================================================
diff -u -r436f6d5ac9f4b8cb261be071d2e53140f422aa00 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 436f6d5ac9f4b8cb261be071d2e53140f422aa00)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapControlTest.cs	(.../RingtoetsMapControlTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -19,24 +19,23 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Forms;
 using BruTile;
 using BruTile.Predefined;
 using Core.Common.Base;
 using Core.Common.Base.Data;
-using Core.Common.Base.Geometry;
 using Core.Common.Gui.TestUtil.Settings;
 using Core.Common.TestUtil;
 using Core.Components.BruTile.Configurations;
 using Core.Components.BruTile.TestUtil;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
-using Core.Components.Gis.Features;
-using Core.Components.Gis.Geometries;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Utils.TypeConverters;
@@ -67,102 +66,89 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var control = new RingtoetsMapControl();
+            var ringtoetsMapControl = new RingtoetsMapControl();
 
             // Assert
-            Assert.IsInstanceOf<MapControl>(control);
-            Assert.IsNull(control.BackgroundData);
+            Assert.IsInstanceOf<UserControl>(ringtoetsMapControl);
+            Assert.IsNotNull(ringtoetsMapControl.MapControl);
+            Assert.IsNull(ringtoetsMapControl.MapControl.Data);
+            Assert.IsNull(ringtoetsMapControl.MapControl.BackgroundMapData);
         }
 
         [Test]
-        public void RemoveAllData_Always_SetDataAndBackgroundMapDataNull()
+        public void SetAllData_MapDataCollectionNull_ThrowsArgumentNullException()
         {
             // Setup
-            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            var ringtoetsMapControl = new RingtoetsMapControl();
 
-            using (new UseCustomSettingsHelper(testSettingsHelper))
-            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
-            using (var map = new RingtoetsMapControl())
-            {
-                map.BackgroundMapData = backgroundMapData;
-                var mapDataCollection = new MapDataCollection("A");
-                mapDataCollection.Add(new MapPointData("points")
-                {
-                    Features = new[]
-                    {
-                        new MapFeature(new[]
-                        {
-                            new MapGeometry(new[]
-                            {
-                                new[]
-                                {
-                                    new Point2D(1.1, 2.2)
-                                }
-                            })
-                        })
-                    }
-                });
-                map.Data = mapDataCollection;
+            // Call
+            TestDelegate test = () => ringtoetsMapControl.SetAllData(null, new BackgroundData(new TestBackgroundDataConfiguration()));
 
-                // Precondition
-                Assert.IsNotNull(map.Data);
-                Assert.IsNotNull(map.BackgroundMapData);
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("data", paramName);
+        }
 
-                // Call
-                map.RemoveAllData();
+        [Test]
+        public void SetAllData_BackgroundDataNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var ringtoetsMapControl = new RingtoetsMapControl();
 
-                // Assert
-                Assert.IsNull(map.Data);
-                Assert.IsNull(map.BackgroundData);
-                Assert.IsNull(map.BackgroundMapData);
-            }
+            // Call
+            TestDelegate test = () => ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("background", paramName);
         }
 
         [Test]
-        public void BackgroundData_NotNull_BackgroundMapDataSet()
+        public void SetAllData_Always_SetsAllDataToMapControl()
         {
             // Setup
-            WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
+            var mapDataCollection = new MapDataCollection("Collection");
+            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(backgroundMapData);
 
-            var control = new RingtoetsMapControl();
-
             using (new UseCustomSettingsHelper(testSettingsHelper))
-            using (new UseCustomTileSourceFactoryConfig(mapData))
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var ringtoetsMapControl = new RingtoetsMapControl())
             {
                 // Call
-                control.BackgroundData = backgroundData;
+                ringtoetsMapControl.SetAllData(mapDataCollection, backgroundData);
 
                 // Assert
-                Assert.AreSame(backgroundData, control.BackgroundData);
-                Assert.IsNotNull(control.BackgroundMapData);
-                MapDataTestHelper.AssertImageBasedMapData(backgroundData, control.BackgroundMapData);
+                Assert.AreSame(mapDataCollection, ringtoetsMapControl.MapControl.Data);
+                Assert.IsNotNull(ringtoetsMapControl.MapControl.BackgroundMapData);
+                MapDataTestHelper.AssertImageBasedMapData(backgroundData, ringtoetsMapControl.MapControl.BackgroundMapData);
             }
         }
 
         [Test]
-        public void GivenBackgroundData_WhenSetToNull_ThenBackgroundMapDataSetToNull()
+        public void RemoveAllData_Always_RemovesAllDataFromMapControl()
         {
-            // Given
-            WmtsMapData mapData = WmtsMapData.CreateDefaultPdokMapData();
-            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(mapData);
+            // Setup
+            var mapDataCollection = new MapDataCollection("Collection");
+            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            BackgroundData backgroundData = BackgroundDataConverter.ConvertTo(backgroundMapData);
 
             using (new UseCustomSettingsHelper(testSettingsHelper))
-            using (new UseCustomTileSourceFactoryConfig(mapData))
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var ringtoetsMapControl = new RingtoetsMapControl())
             {
-                var control = new RingtoetsMapControl
-                {
-                    BackgroundData = backgroundData
-                };
+                ringtoetsMapControl.SetAllData(mapDataCollection, backgroundData);
 
                 // Precondition
-                Assert.IsNotNull(control.BackgroundMapData);
+                Assert.IsNotNull(ringtoetsMapControl.MapControl.Data);
+                Assert.IsNotNull(ringtoetsMapControl.MapControl.BackgroundMapData);
 
-                // When
-                control.BackgroundData = null;
+                // Call
+                ringtoetsMapControl.RemoveAllData();
 
-                // Then
-                Assert.IsNull(control.BackgroundMapData);
+                // Assert
+                Assert.IsNull(ringtoetsMapControl.MapControl.Data);
+                Assert.IsNull(ringtoetsMapControl.MapControl.BackgroundMapData);
             }
         }
 
@@ -191,15 +177,12 @@
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(tileSourceFactory))
             {
-                var control = new RingtoetsMapControl
-                {
-                    BackgroundData = originalBackgroundData
-                };
+                var ringtoetsMapControl = new RingtoetsMapControl();
+                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), originalBackgroundData);
+                ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
-                control.BackgroundMapData.Attach(observer);
+                ImageBasedMapData oldMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
 
-                ImageBasedMapData oldMapData = control.BackgroundMapData;
-
                 // When
                 originalBackgroundData.Name = newBackgroundData.Name;
                 originalBackgroundData.IsVisible = newBackgroundData.IsVisible;
@@ -208,9 +191,9 @@
                 originalBackgroundData.NotifyObservers();
 
                 // Then
-                Assert.IsNotNull(control.BackgroundMapData);
-                Assert.AreNotSame(oldMapData, control.BackgroundMapData);
-                Assert.AreNotEqual(oldMapData.GetType(), control.BackgroundMapData.GetType());
+                Assert.IsNotNull(ringtoetsMapControl.MapControl.BackgroundMapData);
+                Assert.AreNotSame(oldMapData, ringtoetsMapControl.MapControl.BackgroundMapData);
+                Assert.AreNotEqual(oldMapData.GetType(), ringtoetsMapControl.MapControl.BackgroundMapData.GetType());
                 mocks.VerifyAll(); // Expect no observers notified
             }
         }
@@ -230,22 +213,19 @@
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
             {
-                var control = new RingtoetsMapControl
-                {
-                    BackgroundData = backgroundData
-                };
+                var ringtoetsMapControl = new RingtoetsMapControl();
+                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), backgroundData);
+                ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
-                control.BackgroundMapData.Attach(observer);
+                ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
 
-                ImageBasedMapData oldBackgroundMapData = control.BackgroundMapData;
-
                 // When
                 backgroundData.Transparency = (RoundedDouble) 0.3;
                 backgroundData.NotifyObservers();
 
                 // Then
-                Assert.AreSame(oldBackgroundMapData, control.BackgroundMapData);
-                Assert.AreEqual(0.3, control.BackgroundMapData.Transparency.Value);
+                Assert.AreSame(oldBackgroundMapData, ringtoetsMapControl.MapControl.BackgroundMapData);
+                Assert.AreEqual(0.3, ringtoetsMapControl.MapControl.BackgroundMapData.Transparency.Value);
                 mocks.VerifyAll();
             }
         }
@@ -265,23 +245,20 @@
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
             {
-                var control = new RingtoetsMapControl
-                {
-                    BackgroundData = backgroundData
-                };
+                var ringtoetsMapControl = new RingtoetsMapControl();
+                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), backgroundData);
+                ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
-                control.BackgroundMapData.Attach(observer);
+                ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
 
-                ImageBasedMapData oldBackgroundMapData = control.BackgroundMapData;
-
                 // When
                 backgroundData.Configuration = new WmtsBackgroundDataConfiguration();
                 backgroundData.NotifyObservers();
 
                 // Then
-                Assert.AreSame(oldBackgroundMapData, control.BackgroundMapData);
+                Assert.AreSame(oldBackgroundMapData, ringtoetsMapControl.MapControl.BackgroundMapData);
 
-                var newWmtsMapData = (WmtsMapData) control.BackgroundMapData;
+                var newWmtsMapData = (WmtsMapData) ringtoetsMapControl.MapControl.BackgroundMapData;
                 Assert.IsNull(newWmtsMapData.SourceCapabilitiesUrl);
                 Assert.IsNull(newWmtsMapData.SelectedCapabilityIdentifier);
                 Assert.IsNull(newWmtsMapData.PreferredFormat);
@@ -304,23 +281,20 @@
             using (new UseCustomSettingsHelper(testSettingsHelper))
             using (new UseCustomTileSourceFactoryConfig(mapData))
             {
-                var control = new RingtoetsMapControl
-                {
-                    BackgroundData = backgroundData
-                };
+                var ringtoetsMapControl = new RingtoetsMapControl();
+                ringtoetsMapControl.SetAllData(new MapDataCollection("Collection"), backgroundData);
+                ringtoetsMapControl.MapControl.BackgroundMapData.Attach(observer);
 
-                control.BackgroundMapData.Attach(observer);
+                ImageBasedMapData oldBackgroundMapData = ringtoetsMapControl.MapControl.BackgroundMapData;
 
-                ImageBasedMapData oldBackgroundMapData = control.BackgroundMapData;
-
                 // When
                 backgroundData.Configuration = new WellKnownBackgroundDataConfiguration(RingtoetsWellKnownTileSource.BingRoads);
                 backgroundData.NotifyObservers();
 
                 // Then
-                Assert.AreSame(oldBackgroundMapData, control.BackgroundMapData);
+                Assert.AreSame(oldBackgroundMapData, ringtoetsMapControl.MapControl.BackgroundMapData);
 
-                var newWellKnownMapData = (WellKnownTileSourceMapData) control.BackgroundMapData;
+                var newWellKnownMapData = (WellKnownTileSourceMapData) ringtoetsMapControl.MapControl.BackgroundMapData;
                 Assert.AreEqual(WellKnownTileSource.BingRoads, newWellKnownMapData.TileSource);
                 mocks.VerifyAll();
             }
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Ringtoets.DuneErosion.Forms.csproj
===================================================================
diff -u -r69e449c598057dc5d4703b95ab5c151a76a9cdbf -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Ringtoets.DuneErosion.Forms.csproj	(.../Ringtoets.DuneErosion.Forms.csproj)	(revision 69e449c598057dc5d4703b95ab5c151a76a9cdbf)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Ringtoets.DuneErosion.Forms.csproj	(.../Ringtoets.DuneErosion.Forms.csproj)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -149,6 +149,9 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\DuneErosionFailureMechanismView.resx">
+      <DependentUpon>DuneErosionFailureMechanismView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs	(.../DuneErosionFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.Designer.cs	(.../DuneErosionFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,29 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
-            // ClosingStructuresFailureMechanismView
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
             // 
+            // DuneErosionFailureMechanismView
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "DuneErosionFailureMechanismView";
             this.ResumeLayout(false);
+
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs	(.../DuneErosionFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.cs	(.../DuneErosionFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -92,7 +92,7 @@
                     assessmentSectionObserver.Observable = null;
                     duneLocationsObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -104,8 +104,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -114,7 +113,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.resx
===================================================================
diff -u
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.resx	(revision 0)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismView.resx	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismViewTest.cs	(.../DuneErosionFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using NUnit.Framework;
@@ -70,7 +69,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -121,15 +121,13 @@
 
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new DuneErosionFailureMechanismContext(new DuneErosionFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -139,25 +137,23 @@
             // Setup
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new DuneErosionFailureMechanismContext(new DuneErosionFailureMechanism(), assessmentSection);
 
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(5, mapControl.Data.Collection.Count());
+                Assert.AreEqual(5, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -187,7 +183,7 @@
             // Setup
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -247,7 +243,7 @@
             // Setup
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var duneLocation1 = new TestDuneLocation();
@@ -283,7 +279,7 @@
             // Setup
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var duneLocation1 = new TestDuneLocation();
@@ -319,7 +315,7 @@
             // Given
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new DuneErosionFailureMechanism
@@ -352,7 +348,7 @@
             // Setup
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -396,7 +392,7 @@
             // Setup
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new DuneErosionFailureMechanism();
                 var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -434,7 +430,7 @@
 
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new DuneErosionFailureMechanism();
@@ -514,7 +510,7 @@
             var newFailureMechanismContext = new DuneErosionFailureMechanismContext(new DuneErosionFailureMechanism(), newAssessmentSection);
             using (var view = new DuneErosionFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldFailureMechanismContext;
                 view.Data = newFailureMechanismContext;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionInwardsFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionInwardsFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // GrassCoverErosionInwardsFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "GrassCoverErosionInwardsFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -128,7 +128,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -142,8 +142,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -152,7 +151,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
@@ -75,7 +74,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -123,15 +123,13 @@
 
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -141,25 +139,23 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection);
 
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(8, mapControl.Data.Collection.Count());
+                Assert.AreEqual(8, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -189,7 +185,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -288,7 +284,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -335,7 +331,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -375,7 +371,7 @@
             // Given
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var currentHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -414,14 +410,14 @@
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
-        
+
         [Test]
         public void NotifyObservers_ReferenceLineUpdated_MapDataUpdated()
         {
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -466,7 +462,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -499,7 +495,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -529,7 +525,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -567,7 +563,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -613,7 +609,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -649,7 +645,7 @@
             // Setup
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -694,7 +690,7 @@
 
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -792,7 +788,7 @@
             var newGrassCoverErosionInwardsFailureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), newAssessmentSection);
             using (var view = new GrassCoverErosionInwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldGrassCoverErosionInwardsFailureMechanismContext;
                 view.Data = newGrassCoverErosionInwardsFailureMechanismContext;
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.Designer.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // GrassCoverErosionOutwardsFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "GrassCoverErosionOutwardsFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -118,7 +118,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -132,8 +132,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -142,7 +141,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using NUnit.Framework;
@@ -72,7 +71,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -120,16 +120,14 @@
 
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(
                     new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -139,8 +137,6 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(
@@ -149,16 +145,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(7, mapControl.Data.Collection.Count());
+                Assert.AreEqual(7, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -189,7 +185,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -280,7 +276,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
@@ -307,14 +303,14 @@
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(failureMechanism.HydraulicBoundaryLocations, hydraulicBoundaryLocationsMapData);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -358,7 +354,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -390,7 +386,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -427,7 +423,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -473,7 +469,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -509,7 +505,7 @@
             // Setup
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
                 var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -553,7 +549,7 @@
 
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
@@ -645,7 +641,7 @@
             var newGrassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(new GrassCoverErosionOutwardsFailureMechanism(), newAssessmentSection);
             using (var view = new GrassCoverErosionOutwardsFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldGrassCoverErosionOutwardsFailureMechanismContext;
                 view.Data = newGrassCoverErosionOutwardsFailureMechanismContext;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs	(.../HeightStructuresFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.Designer.cs	(.../HeightStructuresFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // HeightStructuresFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "HeightStructuresFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -132,7 +132,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -148,8 +148,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -158,7 +157,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
@@ -179,7 +178,7 @@
             }
             base.Dispose(disposing);
         }
-        
+
         private void UpdateMapData()
         {
             SetMapDataFeatures();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
@@ -77,7 +76,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -126,16 +126,14 @@
 
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
                     new HeightStructuresFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -145,8 +143,6 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(
@@ -155,16 +151,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(8, mapControl.Data.Collection.Count());
+                Assert.AreEqual(8, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -195,7 +191,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -300,7 +296,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -346,7 +342,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -385,7 +381,7 @@
             // Given
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var currentHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -431,7 +427,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -475,7 +471,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -507,7 +503,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -544,7 +540,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -573,7 +569,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -624,7 +620,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -663,7 +659,7 @@
             // Setup
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new HeightStructuresFailureMechanism();
                 var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -710,7 +706,7 @@
 
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new HeightStructuresFailureMechanism();
@@ -808,7 +804,7 @@
             var newHeightStructuresFailureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), newAssessmentSection);
             using (var view = new HeightStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldHeightStructuresFailureMechanismContext;
                 view.Data = newHeightStructuresFailureMechanismContext;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/BackgroundMapDataSelectionDialog.cs
===================================================================
diff -u -r0631da0684dd736f5ca061237ea606314f272366 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/BackgroundMapDataSelectionDialog.cs	(.../BackgroundMapDataSelectionDialog.cs)	(revision 0631da0684dd736f5ca061237ea606314f272366)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/BackgroundMapDataSelectionDialog.cs	(.../BackgroundMapDataSelectionDialog.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -37,8 +37,8 @@
     /// </summary>
     public partial class BackgroundMapDataSelectionDialog : DialogBase
     {
-        private readonly HashSet<IBackgroundMapDataSelectionControl> mapDatas;
-        private IBackgroundMapDataSelectionControl currentBackgroundMapDataSelectionControl;
+        private readonly HashSet<BackgroundMapDataSelectionControl> mapDatas;
+        private BackgroundMapDataSelectionControl currentBackgroundMapDataSelectionControl;
         private bool mapLayerComboBoxUpdating;
 
         /// <summary>
@@ -50,17 +50,16 @@
         public BackgroundMapDataSelectionDialog(IWin32Window dialogParent, ImageBasedMapData mapData)
             : base(dialogParent, RingtoetsCommonFormsResources.SelectionDialogIcon, 500, 350)
         {
-            mapDatas = new HashSet<IBackgroundMapDataSelectionControl>
+            mapDatas = new HashSet<BackgroundMapDataSelectionControl>
             {
                 new WellKnownMapDataControl(mapData as WellKnownTileSourceMapData),
                 new WmtsLocationControl(mapData as WmtsMapData, new BruTileWmtsCapabilityFactory())
             };
 
             InitializeComponent();
             InitializeButtons();
-            InitializeComboBox();
 
-            IBackgroundMapDataSelectionControl controlToSelect = GetBackgroundMapDataControlToSelect(mapData);
+            BackgroundMapDataSelectionControl controlToSelect = GetBackgroundMapDataControlToSelect(mapData);
             PreSelectComboBox(controlToSelect);
         }
 
@@ -78,7 +77,7 @@
             base.Dispose(disposing);
         }
 
-        private IBackgroundMapDataSelectionControl GetBackgroundMapDataControlToSelect(ImageBasedMapData mapData)
+        private BackgroundMapDataSelectionControl GetBackgroundMapDataControlToSelect(ImageBasedMapData mapData)
         {
             if (mapData is WellKnownTileSourceMapData)
             {
@@ -91,17 +90,16 @@
             return mapDatas.First();
         }
 
-        private void UpdatePropertiesGroupBox(IBackgroundMapDataSelectionControl newBackgroundMapDataSelectionControl)
+        private void UpdatePropertiesGroupBox(BackgroundMapDataSelectionControl newBackgroundMapDataSelectionControl)
         {
             if (currentBackgroundMapDataSelectionControl != null)
             {
                 currentBackgroundMapDataSelectionControl.SelectedMapDataChanged -= OnSelectedMapDataSelectionChanged;
             }
 
             propertiesGroupBox.Controls.Clear();
-            Control userControl = newBackgroundMapDataSelectionControl.UserControl;
-            propertiesGroupBox.Controls.Add(userControl);
-            userControl.Dock = DockStyle.Fill;
+            propertiesGroupBox.Controls.Add(newBackgroundMapDataSelectionControl);
+            newBackgroundMapDataSelectionControl.Dock = DockStyle.Fill;
             newBackgroundMapDataSelectionControl.SelectedMapDataChanged += OnSelectedMapDataSelectionChanged;
 
             currentBackgroundMapDataSelectionControl = newBackgroundMapDataSelectionControl;
@@ -129,18 +127,13 @@
 
         #region ComboBox
 
-        private void InitializeComboBox()
+        private void PreSelectComboBox(BackgroundMapDataSelectionControl controlToSelect)
         {
-            mapLayerComboBox.ValueMember = nameof(IBackgroundMapDataSelectionControl.UserControl);
-        }
-
-        private void PreSelectComboBox(IBackgroundMapDataSelectionControl controlToSelect)
-        {
             mapLayerComboBox.BeginUpdate();
 
             mapLayerComboBoxUpdating = true;
             mapLayerComboBox.DataSource = mapDatas.ToArray();
-            mapLayerComboBox.DisplayMember = nameof(IBackgroundMapDataSelectionControl.DisplayName);
+            mapLayerComboBox.DisplayMember = nameof(BackgroundMapDataSelectionControl.DisplayName);
             mapLayerComboBox.SelectedItem = null;
             mapLayerComboBoxUpdating = false;
 
@@ -173,7 +166,7 @@
                 return;
             }
 
-            UpdatePropertiesGroupBox((IBackgroundMapDataSelectionControl) mapLayerComboBox.SelectedItem);
+            UpdatePropertiesGroupBox((BackgroundMapDataSelectionControl) mapLayerComboBox.SelectedItem);
         }
 
         #endregion
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 7a4f8ff71ae5f81177fe5ff9cd78fdc7f24c69f4)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -255,6 +255,9 @@
       <DependentUpon>ReferenceLineMetaSelectionDialog.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\AssessmentSectionView.resx">
+      <DependentUpon>AssessmentSectionView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Views\FailureMechanismContributionView.resx">
       <DependentUpon>FailureMechanismContributionView.cs</DependentUpon>
       <SubType>Designer</SubType>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.Designer.cs
===================================================================
diff -u -r28e008eb00299c3c5a6a7c825dee3c4dba2f239a -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.Designer.cs	(.../AssessmentSectionView.Designer.cs)	(revision 28e008eb00299c3c5a6a7c825dee3c4dba2f239a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.Designer.cs	(.../AssessmentSectionView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,29 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
+            this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // AssessmentSectionView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "AssessmentSectionView";
             this.ResumeLayout(false);
+
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -84,14 +84,13 @@
 
                 if (data == null)
                 {
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.BackgroundData);
                 }
             }
         }
@@ -100,7 +99,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.resx
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.resx	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.resx	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs
===================================================================
diff -u -r2db5ccc1fb164fc6f43733359a0e745ec6891edd -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 2db5ccc1fb164fc6f43733359a0e745ec6891edd)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/BackgroundMapDataSelectionDialogTest.cs	(.../BackgroundMapDataSelectionDialogTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -432,21 +432,20 @@
         }
 
         private static void AssertMapDataControls<T>(BackgroundMapDataSelectionDialog dialog)
-            where T : UserControl, IBackgroundMapDataSelectionControl
+            where T : BackgroundMapDataSelectionControl
         {
             var mapLayers = (ComboBox) new ComboBoxTester("mapLayerComboBox", dialog).TheObject;
             Assert.AreEqual("DisplayName", mapLayers.DisplayMember);
-            Assert.AreEqual("UserControl", mapLayers.ValueMember);
             Assert.AreEqual(ComboBoxStyle.DropDownList, mapLayers.DropDownStyle);
             Assert.IsTrue(mapLayers.Sorted);
             Assert.IsInstanceOf<T>(mapLayers.SelectedItem);
 
-            var backgroundMapDataSelectionControls = (IBackgroundMapDataSelectionControl[]) mapLayers.DataSource;
+            var backgroundMapDataSelectionControls = (BackgroundMapDataSelectionControl[]) mapLayers.DataSource;
             Assert.AreEqual(2, backgroundMapDataSelectionControls.Length);
             Assert.IsInstanceOf<WellKnownMapDataControl>(backgroundMapDataSelectionControls[0]);
             Assert.IsInstanceOf<WmtsLocationControl>(backgroundMapDataSelectionControls[1]);
 
-            Assert.IsInstanceOf<IBackgroundMapDataSelectionControl[]>(mapLayers.DataSource);
+            Assert.IsInstanceOf<BackgroundMapDataSelectionControl[]>(mapLayers.DataSource);
             Assert.AreEqual("DisplayName", mapLayers.DisplayMember);
 
             var groupBoxProperties = (GroupBox) new ControlTester("propertiesGroupBox", dialog).TheObject;
@@ -457,7 +456,7 @@
 
         private static T GetComboBoxItem<T>(ComboBox comboBox)
         {
-            return ((IBackgroundMapDataSelectionControl[]) comboBox.DataSource).OfType<T>().First();
+            return ((BackgroundMapDataSelectionControl[]) comboBox.DataSource).OfType<T>().First();
         }
 
         private static Icon BitmapToIcon(Bitmap icon)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -63,7 +63,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -109,38 +110,35 @@
 
             using (var view = new AssessmentSectionView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 // Call
                 view.Data = assessmentSection;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
         [Test]
         public void Data_SetToNull_MapDataCleared()
         {
             // Setup
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             using (var view = new AssessmentSectionView
             {
-                Data = new ObservableTestAssessmentSectionStub()
+                Data = assessmentSection
             })
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 // Precondition
-                Assert.AreEqual(2, mapControl.Data.Collection.Count());
+                Assert.AreEqual(2, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -261,7 +259,7 @@
                 AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs
===================================================================
diff -u -r35fa216f8255ce431cd920b991297fa80592b64a -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/BackgroundDataTreeNodeInfoTest.cs	(.../BackgroundDataTreeNodeInfoTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -492,7 +492,7 @@
                     var dialog = (BackgroundMapDataSelectionDialog) new FormTester(name).TheObject;
 
                     var comboBox = (ComboBox) new ComboBoxTester("mapLayerComboBox", dialog).TheObject;
-                    comboBox.SelectedItem = ((IBackgroundMapDataSelectionControl[]) comboBox.DataSource).OfType<WellKnownMapDataControl>().First();
+                    comboBox.SelectedItem = ((BackgroundMapDataSelectionControl[]) comboBox.DataSource).OfType<WellKnownMapDataControl>().First();
                     var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl", dialog).TheObject;
                     dataGridViewControl.SetCurrentCell(dataGridViewControl.GetCell(0, 0));
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs	(.../PipingFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.Designer.cs	(.../PipingFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // PipingFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "PipingFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r4f9135243197ba3b1238f964bb38f3e9971d1282 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 4f9135243197ba3b1238f964bb38f3e9971d1282)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -134,7 +134,7 @@
                     surfaceLineObserver.Observable = null;
                     surfaceLinesObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -150,8 +150,7 @@
 
                     SetAllMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -160,7 +159,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r35fa216f8255ce431cd920b991297fa80592b64a -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 35fa216f8255ce431cd920b991297fa80592b64a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -26,7 +26,6 @@
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Components.BruTile.TestUtil;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using NUnit.Framework;
@@ -80,7 +79,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -175,15 +175,13 @@
 
             using (var view = new PipingFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -200,22 +198,19 @@
             using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var view = new PipingFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 view.Data = new PipingFailureMechanismContext(
                     new PipingFailureMechanism(), assessmentSection);
 
                 // Precondition
-                Assert.IsNotNull(mapControl.Data);
-                Assert.IsNotNull(mapControl.BackgroundMapData);
+                Assert.IsNotNull(view.Map.Data);
+                Assert.IsNotNull(view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -225,7 +220,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -344,7 +339,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -403,7 +398,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -446,7 +441,7 @@
             // Given
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var currentHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -505,7 +500,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -561,7 +556,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
                 var failureMechanism = new PipingFailureMechanism();
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
                 var surfaceLine = new RingtoetsPipingSurfaceLine();
@@ -603,7 +598,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
                 var surfaceLine = new RingtoetsPipingSurfaceLine();
                 var failureMechanism = new PipingFailureMechanism();
                 failureMechanism.SurfaceLines.AddRange(new[]
@@ -641,7 +636,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new PipingFailureMechanism();
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -687,7 +682,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new PipingFailureMechanism();
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -728,7 +723,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new PipingFailureMechanism();
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -781,7 +776,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var surfaceLineA = new RingtoetsPipingSurfaceLine();
                 surfaceLineA.SetGeometry(new[]
@@ -805,7 +800,7 @@
                 var failureMechanism = new PipingFailureMechanism();
                 failureMechanism.CalculationsGroup.Children.Add(calculationA);
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
-                
+
                 view.Data = failureMechanismContext;
 
                 var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex);
@@ -832,7 +827,7 @@
             // Setup
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var surfaceLineA = new RingtoetsPipingSurfaceLine();
                 surfaceLineA.SetGeometry(new[]
@@ -856,7 +851,7 @@
                 var failureMechanism = new PipingFailureMechanism();
                 failureMechanism.CalculationsGroup.Children.Add(calculationA);
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
-                
+
                 view.Data = failureMechanismContext;
 
                 var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex);
@@ -892,7 +887,7 @@
 
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new PipingFailureMechanism();
@@ -990,7 +985,7 @@
             var newPipingFailureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), newAssessmentSection);
             using (var view = new PipingFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldPipingFailureMechanismContext;
                 view.Data = newPipingFailureMechanismContext;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs	(.../StabilityPointStructuresFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.Designer.cs	(.../StabilityPointStructuresFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // StabilityPointStructuresFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "StabilityPointStructuresFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -132,7 +132,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -147,8 +147,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -157,7 +156,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
@@ -77,7 +76,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -126,16 +126,14 @@
 
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(
                     new StabilityPointStructuresFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -145,8 +143,6 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(
@@ -155,16 +151,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(8, mapControl.Data.Collection.Count());
+                Assert.AreEqual(8, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);                
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -195,7 +191,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -300,7 +296,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -346,7 +342,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -385,7 +381,7 @@
             // Given
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var currentHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -424,14 +420,14 @@
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_ReferenceLineUpdated_MapDataUpdated()
         {
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -475,7 +471,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -507,7 +503,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -544,7 +540,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -573,7 +569,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -624,7 +620,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -663,7 +659,7 @@
             // Setup
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
                 var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -710,7 +706,7 @@
 
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new StabilityPointStructuresFailureMechanism();
@@ -808,7 +804,7 @@
             var newStabilityPointStructuresFailureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), newAssessmentSection);
             using (var view = new StabilityPointStructuresFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldStabilityPointStructuresFailureMechanismContext;
                 view.Data = newStabilityPointStructuresFailureMechanismContext;
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs	(.../StabilityStoneCoverFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.Designer.cs	(.../StabilityStoneCoverFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
-            // StabilityStoneCover
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
             // 
+            // StabilityStoneCoverFailureMechanismView
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
-            this.Name = "StabilityStoneCover";
+            this.Controls.Add(this.ringtoetsMapControl);
+            this.Name = "StabilityStoneCoverFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -126,7 +126,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -140,8 +140,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -150,7 +149,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using NUnit.Framework;
@@ -72,7 +71,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -121,16 +121,14 @@
 
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(
                     new StabilityStoneCoverFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -140,8 +138,6 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(
@@ -150,16 +146,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(7, mapControl.Data.Collection.Count());
+                Assert.AreEqual(7, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -190,7 +186,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -281,14 +277,14 @@
                 AssertCalculationsMapData(failureMechanism.Calculations.Cast<StabilityStoneCoverWaveConditionsCalculation>(), mapDataList[calculationsIndex]);
             }
         }
-        
+
         [Test]
         public void UpdateObserver_AssessmentSectionUpdated_MapDataUpdated()
         {
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -334,7 +330,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -373,7 +369,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -417,7 +413,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityStoneCoverFailureMechanism();
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -449,7 +445,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityStoneCoverFailureMechanism();
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -486,7 +482,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityStoneCoverFailureMechanism();
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -532,7 +528,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityStoneCoverFailureMechanism();
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -568,7 +564,7 @@
             // Setup
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new StabilityStoneCoverFailureMechanism();
                 var failureMechanismContext = new StabilityStoneCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -612,7 +608,7 @@
 
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new StabilityStoneCoverFailureMechanism();
@@ -704,7 +700,7 @@
             var newStabilityStoneCoverFailureMechanismContext = new StabilityStoneCoverFailureMechanismContext(new StabilityStoneCoverFailureMechanism(), newAssessmentSection);
             using (var view = new StabilityStoneCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldStabilityStoneCoverFailureMechanismContext;
                 view.Data = newStabilityStoneCoverFailureMechanismContext;
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs
===================================================================
diff -u -rd71d12fa277ebebb488ccc434cb59bed32c0755b -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.Designer.cs)	(revision d71d12fa277ebebb488ccc434cb59bed32c0755b)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.Designer.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.Designer.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -36,30 +36,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.mapControl = new Common.Forms.Views.RingtoetsMapControl();
+            this.ringtoetsMapControl = new Ringtoets.Common.Forms.Views.RingtoetsMapControl();
             this.SuspendLayout();
             // 
-            // MapView
-            //
-            this.mapControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mapControl.Location = new System.Drawing.Point(0, 0);
-            this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(150, 150);
-            this.mapControl.TabIndex = 0;
-            this.mapControl.Text = "mapControl1";
+            // ringtoetsMapControl
             // 
+            this.ringtoetsMapControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ringtoetsMapControl.Location = new System.Drawing.Point(0, 0);
+            this.ringtoetsMapControl.Name = "ringtoetsMapControl";
+            this.ringtoetsMapControl.Size = new System.Drawing.Size(150, 150);
+            this.ringtoetsMapControl.TabIndex = 0;
+            // 
             // WaveImpactAsphaltCoverFailureMechanismView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mapControl);
+            this.Controls.Add(this.ringtoetsMapControl);
             this.Name = "WaveImpactAsphaltCoverFailureMechanismView";
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private Common.Forms.Views.RingtoetsMapControl mapControl;
+        private Common.Forms.Views.RingtoetsMapControl ringtoetsMapControl;
     }
 }
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs
===================================================================
diff -u -r1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision 1d7f9c7875b22fe69fd5b1a32b2bc817dd6cf192)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -126,7 +126,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
-                    mapControl.RemoveAllData();
+                    ringtoetsMapControl.RemoveAllData();
                 }
                 else
                 {
@@ -140,8 +140,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
-                    mapControl.BackgroundData = data.Parent.BackgroundData;
+                    ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData);
                 }
             }
         }
@@ -150,7 +149,7 @@
         {
             get
             {
-                return mapControl;
+                return ringtoetsMapControl.MapControl;
             }
         }
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs
===================================================================
diff -u -rf2582640849a5a4afce5674db823c37e1edaea19 -r11eb517ba7a480b4a415855798a7fadefc0cfe54
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision f2582640849a5a4afce5674db823c37e1edaea19)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 11eb517ba7a480b4a415855798a7fadefc0cfe54)
@@ -23,7 +23,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Geometry;
-using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
 using NUnit.Framework;
@@ -72,7 +71,8 @@
             {
                 // Assert
                 Assert.AreEqual(1, view.Controls.Count);
-                Assert.AreSame(view.Map, view.Controls[0]);
+                Assert.IsInstanceOf<RingtoetsMapControl>(view.Controls[0]);
+                Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl);
                 Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock);
                 Assert.IsNull(view.Map.Data);
             }
@@ -121,16 +121,14 @@
 
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(
                     new WaveImpactAsphaltCoverFailureMechanism(), assessmentSection);
 
                 // Call
                 view.Data = failureMechanismContext;
 
                 // Assert
-                Assert.AreSame(assessmentSection.BackgroundData, mapControl.BackgroundData);
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
             }
         }
 
@@ -140,8 +138,6 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var mapControl = (RingtoetsMapControl) view.Map;
-
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(
@@ -150,16 +146,16 @@
                 view.Data = failureMechanismContext;
 
                 // Precondition
-                Assert.AreEqual(7, mapControl.Data.Collection.Count());
+                Assert.AreEqual(7, view.Map.Data.Collection.Count());
+                MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
-                Assert.IsNull(mapControl.Data);
-                Assert.IsNull(mapControl.BackgroundData);
-                Assert.IsNull(mapControl.BackgroundMapData);
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
             }
         }
 
@@ -190,7 +186,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var geometryPoints = new[]
                 {
@@ -289,7 +285,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase
                 {
@@ -335,7 +331,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
                 {
@@ -374,7 +370,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var points1 = new List<Point2D>
                 {
@@ -418,7 +414,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -450,7 +446,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -487,7 +483,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -533,7 +529,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -569,7 +565,7 @@
             // Setup
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
                 var failureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub());
@@ -613,7 +609,7 @@
 
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
@@ -705,7 +701,7 @@
             var newWaveImpactAsphaltCoverFailureMechanismContext = new WaveImpactAsphaltCoverFailureMechanismContext(new WaveImpactAsphaltCoverFailureMechanism(), newAssessmentSection);
             using (var view = new WaveImpactAsphaltCoverFailureMechanismView())
             {
-                var map = (MapControl) view.Controls[0];
+                IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl;
 
                 view.Data = oldWaveImpactAsphaltCoverFailureMechanismContext;
                 view.Data = newWaveImpactAsphaltCoverFailureMechanismContext;