Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r62095309982810946139e6c4167f4976f3df96bf -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 62095309982810946139e6c4167f4976f3df96bf)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -60,6 +60,8 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="BackgroundDataIdentifiers.cs" />
+    <Compile Include="BackgroundMapDataType.cs" />
     <Compile Include="Create\ClosingStructures\ClosingStructureCreateExtensions.cs" />
     <Compile Include="Create\ClosingStructures\GeneralClosingStructuresInputCreateExtensions.cs" />
     <Compile Include="Create\DuneErosion\DuneLocationCreateExtensions.cs" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/BackgroundDataIdentifiers.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/BackgroundDataIdentifiers.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/BackgroundDataIdentifiers.cs	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -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 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 Application.Ringtoets.Storage
+{
+    /// <summary>
+    /// Container of general identifiers related to background data.
+    /// </summary>
+    public static class BackgroundDataIdentifiers
+    {
+        /// <summary>
+        /// The identifier for the configured state.
+        /// </summary>
+        public const string IsConfigured = "IsConfigured";
+
+        /// <summary>
+        /// The identifier for the source capabilities url.
+        /// </summary>
+        public const string SourceCapabilitiesUrl = "SourceCapabilitiesUrl";
+
+        /// <summary>
+        /// The identifier for the selected capability identifier.
+        /// </summary>
+        public const string SelectedCapabilityIdentifier = "SelectedCapabilityIdentifier";
+
+        /// <summary>
+        /// The identifier for the preferred format.
+        /// </summary>
+        public const string PreferredFormat = "PreferredFormat";
+
+        /// <summary>
+        /// The identifier for the well known tile source.
+        /// </summary>
+        public const string WellKnownTileSource = "WellKnownTileSource";
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/BackgroundMapDataType.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/BackgroundMapDataType.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/BackgroundMapDataType.cs	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -0,0 +1,41 @@
+// 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.
+
+using Ringtoets.Common.Data.AssessmentSection;
+
+namespace Application.Ringtoets.Storage
+{
+    /// <summary>
+    /// Enumeration that defines the possible types of a <see cref="BackgroundData"/>.
+    /// </summary>
+    public enum BackgroundMapDataType
+    {
+        /// <summary>
+        /// Web Map Tile Service background map data type.
+        /// </summary>
+        Wmts = 1,
+
+        /// <summary>
+        /// Well known tile source background map data type.
+        /// </summary>
+        WellKnown = 2
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r62095309982810946139e6c4167f4976f3df96bf -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 62095309982810946139e6c4167f4976f3df96bf)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -78,6 +78,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="BackgroundDataIdentifiersTest.cs" />
     <Compile Include="Create\BackgroundDataCreateExtensionsTest.cs" />
     <Compile Include="Create\ClosingStructures\ClosingStructureCreateExtensionsTest.cs" />
     <Compile Include="Create\ClosingStructures\GeneralClosingStructuresInputCreateExtensionsTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/BackgroundDataIdentifiersTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/BackgroundDataIdentifiersTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/BackgroundDataIdentifiersTest.cs	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -0,0 +1,40 @@
+// 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.
+
+using Application.Ringtoets.Storage.Read;
+using NUnit.Framework;
+
+namespace Application.Ringtoets.Storage.Test
+{
+    [TestFixture]
+    public class BackgroundDataIdentifiersTest
+    {
+        [Test]
+        public void BackgroundDataIdentifiers_ExpectedValues()
+        {
+            Assert.AreEqual("IsConfigured", BackgroundDataIdentifiers.IsConfigured);
+            Assert.AreEqual("SourceCapabilitiesUrl", BackgroundDataIdentifiers.SourceCapabilitiesUrl);
+            Assert.AreEqual("SelectedCapabilityIdentifier", BackgroundDataIdentifiers.SelectedCapabilityIdentifier);
+            Assert.AreEqual("PreferredFormat", BackgroundDataIdentifiers.PreferredFormat);
+            Assert.AreEqual("WellKnownTileSource", BackgroundDataIdentifiers.WellKnownTileSource);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs
===================================================================
diff -u -r4b32064801ece7ab70357a2a942e21f113abc679 -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 4b32064801ece7ab70357a2a942e21f113abc679)
+++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs	(.../TypeUtils.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -41,6 +41,8 @@
         /// <typeparam name="TEnumType">The type of the enum.</typeparam>
         /// <param name="enumValue">The value of the enum.</param>
         /// <returns>The display name of the enum value.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="enumValue"/>
+        /// is an invalid value for <typeparamref name="TEnumType"/>.</exception>
         public static string GetDisplayName<TEnumType>(TEnumType enumValue) where TEnumType : IConvertible
         {
             string valueString = enumValue.ToString();
@@ -49,7 +51,7 @@
             {
                 throw new InvalidEnumArgumentException(nameof(enumValue), Convert.ToInt32(enumValue), typeof(TEnumType));
             }
-            var resourcesDisplayNameAttribute = (ResourcesDisplayNameAttribute)Attribute.GetCustomAttribute(fieldInfo, typeof(ResourcesDisplayNameAttribute));
+            var resourcesDisplayNameAttribute = (ResourcesDisplayNameAttribute) Attribute.GetCustomAttribute(fieldInfo, typeof(ResourcesDisplayNameAttribute));
             return resourcesDisplayNameAttribute != null ?
                        resourcesDisplayNameAttribute.DisplayName :
                        valueString;
Fisheye: Tag 935e492135a782b9e63c0924df798ebb358ac7cc refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/BackgroundDataIdentifiers.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 935e492135a782b9e63c0924df798ebb358ac7cc refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/BackgroundMapDataType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/RingtoetsWellKnownTileSource.cs
===================================================================
diff -u -r19fb6d61aab057e0e405453c3a180360a48bb3b7 -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/RingtoetsWellKnownTileSource.cs	(.../RingtoetsWellKnownTileSource.cs)	(revision 19fb6d61aab057e0e405453c3a180360a48bb3b7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/RingtoetsWellKnownTileSource.cs	(.../RingtoetsWellKnownTileSource.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -19,32 +19,18 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Core.Common.Utils.Attributes;
-using Ringtoets.Common.Data.Properties;
-
 namespace Ringtoets.Common.Data.AssessmentSection
 {
     /// <summary>
     /// All well known tile sources for which built-in support is provided.
     /// </summary>
     public enum RingtoetsWellKnownTileSource
     {
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Map_OpenStreetMap_DisplayName))]
         OpenStreetMap = 1,
-
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Map_BingAerial_DisplayName))]
         BingAerial = 2,
-
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Map_BingHybrid_DisplayName))]
         BingHybrid = 3,
-
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Map_BingRoads_DisplayName))]
         BingRoads = 4,
-
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Map_EsriWorldTopo_DisplayName))]
         EsriWorldTopo = 5,
-
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.Map_EsriWorldShadedRelief_DisplayName))]
         EsriWorldShadedRelief = 6
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r19fb6d61aab057e0e405453c3a180360a48bb3b7 -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 19fb6d61aab057e0e405453c3a180360a48bb3b7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -427,60 +427,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bing Maps - Satelliet.
-        /// </summary>
-        public static string Map_BingAerial_DisplayName {
-            get {
-                return ResourceManager.GetString("Map_BingAerial_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bing Maps - Satelliet + Wegen.
-        /// </summary>
-        public static string Map_BingHybrid_DisplayName {
-            get {
-                return ResourceManager.GetString("Map_BingHybrid_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Bing Maps - Wegen.
-        /// </summary>
-        public static string Map_BingRoads_DisplayName {
-            get {
-                return ResourceManager.GetString("Map_BingRoads_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Esri World - Reliëf.
-        /// </summary>
-        public static string Map_EsriWorldShadedRelief_DisplayName {
-            get {
-                return ResourceManager.GetString("Map_EsriWorldShadedRelief_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Esri World - Topografisch.
-        /// </summary>
-        public static string Map_EsriWorldTopo_DisplayName {
-            get {
-                return ResourceManager.GetString("Map_EsriWorldTopo_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to OpenStreetMap.
-        /// </summary>
-        public static string Map_OpenStreetMap_DisplayName {
-            get {
-                return ResourceManager.GetString("Map_OpenStreetMap_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to De waarde voor &apos;N&apos; moet in het bereik {0} liggen..
         /// </summary>
         public static string N_Value_should_be_in_Range_0_ {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r19fb6d61aab057e0e405453c3a180360a48bb3b7 -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 19fb6d61aab057e0e405453c3a180360a48bb3b7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -264,22 +264,4 @@
   <data name="BackgroundData_Transparency_Value_must_be_in_Range_0_" xml:space="preserve">
     <value>De transparantie moet in het bereik {0} liggen.</value>
   </data>
-  <data name="Map_BingAerial_DisplayName" xml:space="preserve">
-    <value>Bing Maps - Satelliet</value>
-  </data>
-  <data name="Map_BingHybrid_DisplayName" xml:space="preserve">
-    <value>Bing Maps - Satelliet + Wegen</value>
-  </data>
-  <data name="Map_BingRoads_DisplayName" xml:space="preserve">
-    <value>Bing Maps - Wegen</value>
-  </data>
-  <data name="Map_EsriWorldShadedRelief_DisplayName" xml:space="preserve">
-    <value>Esri World - Reliëf</value>
-  </data>
-  <data name="Map_EsriWorldTopo_DisplayName" xml:space="preserve">
-    <value>Esri World - Topografisch</value>
-  </data>
-  <data name="Map_OpenStreetMap_DisplayName" xml:space="preserve">
-    <value>OpenStreetMap</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -40,8 +40,6 @@
     </Compile>
     <Compile Include="AssessmentSection\AssessmentSectionComposition.cs" />
     <Compile Include="AssessmentSection\BackgroundData.cs" />
-    <Compile Include="AssessmentSection\BackgroundDataIdentifiers.cs" />
-    <Compile Include="AssessmentSection\BackgroundMapDataType.cs" />
     <Compile Include="AssessmentSection\IAssessmentSection.cs" />
     <Compile Include="AssessmentSection\IBackgroundDataConfiguration.cs" />
     <Compile Include="AssessmentSection\ReferenceLine.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsBackgroundMapDataFactory.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsBackgroundMapDataFactory.cs	(.../RingtoetsBackgroundMapDataFactory.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsBackgroundMapDataFactory.cs	(.../RingtoetsBackgroundMapDataFactory.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -40,8 +40,6 @@
         /// <returns>The created <see cref="ImageBasedMapData"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="backgroundData"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <see cref="BackgroundMapDataType"/>
-        /// is not valid.</exception>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="BackgroundData.Configuration"/>
         /// contains an invalid value for <see cref="WellKnownTileSource"/></exception>.
         public static ImageBasedMapData CreateBackgroundMapData(BackgroundData backgroundData)
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/TypeConverters/BackgroundDataConverter.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/src/Ringtoets.Common.Utils/TypeConverters/BackgroundDataConverter.cs	(.../BackgroundDataConverter.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/TypeConverters/BackgroundDataConverter.cs	(.../BackgroundDataConverter.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -39,13 +39,15 @@
         /// <returns>The converted <see cref="BackgroundData"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="mapData"/>
         /// is <c>null</c>.</exception>
+        /// <exception cref="NotSupportedException">Thrown when the <see cref="ImageBasedMapData"/></
+        /// is not supported for conversion.</exception>
         public static BackgroundData ConvertTo(ImageBasedMapData mapData)
         {
             if (mapData == null)
             {
                 throw new ArgumentNullException(nameof(mapData));
             }
-            
+
             var backgroundData = new BackgroundData(CreateBackgroundDataConfiguration(mapData))
             {
                 Name = mapData.Name,
@@ -56,21 +58,6 @@
             return backgroundData;
         }
 
-        private static IBackgroundDataConfiguration CreateBackgroundDataConfiguration(ImageBasedMapData mapData)
-        {
-            var wmtsMapData = mapData as WmtsMapData;
-            if (wmtsMapData != null)
-            {
-                return CreateWmtsBackgroundDataConfiguration(wmtsMapData);
-            }
-            var wellKnownMapData = mapData as WellKnownTileSourceMapData;
-            if (wellKnownMapData != null)
-            {
-                return CreateWellKnownBackgroundDataConfiguration(wellKnownMapData);
-            }
-            throw new InvalidOperationException($"Can't create a background data configuration for {mapData.GetType()}.");
-        }
-
         /// <summary>
         /// Converts <see cref="BackgroundData"/> to <see cref="ImageBasedMapData"/>.
         /// </summary>
@@ -109,6 +96,28 @@
             return mapData;
         }
 
+        /// <summary>
+        /// Creates a <see cref="IBackgroundDataConfiguration"/> based on the <see cref="ImageBasedMapData"/>.
+        /// </summary>
+        /// <param name="mapData">The map <see cref="ImageBasedMapData"/> the configuration is based upon.</param>
+        /// <returns>A <see cref="IBackgroundDataConfiguration"/> based on the <see cref="ImageBasedMapData"/>.</returns>
+        /// <exception cref="NotSupportedException">Thrown when the <see cref="ImageBasedMapData"/> is not supported
+        /// for creating the configuration.</exception>
+        private static IBackgroundDataConfiguration CreateBackgroundDataConfiguration(ImageBasedMapData mapData)
+        {
+            var wmtsMapData = mapData as WmtsMapData;
+            if (wmtsMapData != null)
+            {
+                return CreateWmtsBackgroundDataConfiguration(wmtsMapData);
+            }
+            var wellKnownMapData = mapData as WellKnownTileSourceMapData;
+            if (wellKnownMapData != null)
+            {
+                return CreateWellKnownBackgroundDataConfiguration(wellKnownMapData);
+            }
+            throw new NotSupportedException($"Can't create a background data configuration for {mapData.GetType()}.");
+        }
+
         private static WellKnownBackgroundDataConfiguration CreateWellKnownBackgroundDataConfiguration(WellKnownTileSourceMapData mapData)
         {
             return new WellKnownBackgroundDataConfiguration(mapData.TileSource);
Fisheye: Tag 935e492135a782b9e63c0924df798ebb358ac7cc refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/BackgroundDataIdentifiersTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs
===================================================================
diff -u -r19fb6d61aab057e0e405453c3a180360a48bb3b7 -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs	(.../RingtoetsWellKnownTileSourceTest.cs)	(revision 19fb6d61aab057e0e405453c3a180360a48bb3b7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs	(.../RingtoetsWellKnownTileSourceTest.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -36,28 +36,29 @@
                 return new Dictionary<RingtoetsWellKnownTileSource, string>
                 {
                     {
-                        RingtoetsWellKnownTileSource.OpenStreetMap, "OpenStreetMap"
+                        RingtoetsWellKnownTileSource.OpenStreetMap, null
                     },
                     {
-                        RingtoetsWellKnownTileSource.BingAerial, "Bing Maps - Satelliet"
+                        RingtoetsWellKnownTileSource.BingAerial, null
                     },
                     {
-                        RingtoetsWellKnownTileSource.BingHybrid, "Bing Maps - Satelliet + Wegen"
+                        RingtoetsWellKnownTileSource.BingHybrid, null
                     },
                     {
-                        RingtoetsWellKnownTileSource.BingRoads, "Bing Maps - Wegen"
+                        RingtoetsWellKnownTileSource.BingRoads, null
                     },
                     {
-                        RingtoetsWellKnownTileSource.EsriWorldTopo, "Esri World - Topografisch"
+                        RingtoetsWellKnownTileSource.EsriWorldTopo, null
                     },
                     {
-                        RingtoetsWellKnownTileSource.EsriWorldShadedRelief, "Esri World - Reliëf"
+                        RingtoetsWellKnownTileSource.EsriWorldShadedRelief, null
                     }
                 };
             }
         }
 
-        protected override IDictionary<RingtoetsWellKnownTileSource, byte> ExpectedValueForEnumValues {
+        protected override IDictionary<RingtoetsWellKnownTileSource, byte> ExpectedValueForEnumValues
+        {
             get
             {
                 return new Dictionary<RingtoetsWellKnownTileSource, byte>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -55,7 +55,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="AssessmentSection\AssessmentSectionCompositionTest.cs" />
-    <Compile Include="AssessmentSection\BackgroundDataIdentifiersTest.cs" />
     <Compile Include="AssessmentSection\BackgroundDataTest.cs" />
     <Compile Include="AssessmentSection\ReferenceLineMetaTest.cs" />
     <Compile Include="AssessmentSection\ReferenceLineTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs	(.../BackgroundDataTestDataGenerator.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/BackgroundDataTestDataGenerator.cs	(.../BackgroundDataTestDataGenerator.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -39,9 +39,9 @@
         public static BackgroundData GetWmtsBackgroundMapData(WmtsMapData wmtsMapData)
         {
             var backgroundMapData = new BackgroundData(new WmtsBackgroundDataConfiguration(wmtsMapData.IsConfigured,
-                                                                    wmtsMapData.SourceCapabilitiesUrl,
-                                                                    wmtsMapData.SelectedCapabilityIdentifier,
-                                                                    wmtsMapData.PreferredFormat))
+                                                                                           wmtsMapData.SourceCapabilitiesUrl,
+                                                                                           wmtsMapData.SelectedCapabilityIdentifier,
+                                                                                           wmtsMapData.PreferredFormat))
             {
                 Name = wmtsMapData.Name,
                 IsVisible = wmtsMapData.IsVisible,
@@ -52,14 +52,14 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="BackgroundData"/> with <see cref="BackgroundMapDataType.WellKnown"/>.
+        /// Gets the <see cref="BackgroundData"/> with <see cref="WellKnownTileSource"/>.
         /// </summary>
         /// <param name="tileSource">The <see cref="WellKnownTileSource"/> to create the background data for.</param>
         /// <returns>The created <see cref="BackgroundData"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="tileSource"/>
         /// is an invalid <see cref="WellKnownTileSource"/>.</exception>
         public static BackgroundData GetWellKnownBackgroundMapData(WellKnownTileSource tileSource)
-        { 
+        {
             return new BackgroundData(new WellKnownBackgroundDataConfiguration(tileSource))
             {
                 IsVisible = true,
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/Ringtoets.Common.Utils.Test.csproj
===================================================================
diff -u -rdd2a51d0a110b707de32cca2b00994f33f877c9c -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/Ringtoets.Common.Utils.Test.csproj	(.../Ringtoets.Common.Utils.Test.csproj)	(revision dd2a51d0a110b707de32cca2b00994f33f877c9c)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/Ringtoets.Common.Utils.Test.csproj	(.../Ringtoets.Common.Utils.Test.csproj)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -84,6 +84,10 @@
       <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
       <Name>Core.Components.Gis</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Components\test\Core.Components.Gis.TestUtils\Core.Components.Gis.TestUtils.csproj">
+      <Project>{F0FB401A-3494-4237-9E6D-02CDF77912A8}</Project>
+      <Name>Core.Components.Gis.TestUtils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs
===================================================================
diff -u -r7f540fc512a6c291d69612b1d0b9241d42288aef -r935e492135a782b9e63c0924df798ebb358ac7cc
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs	(.../BackgroundDataConverterTest.cs)	(revision 7f540fc512a6c291d69612b1d0b9241d42288aef)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/TypeConverters/BackgroundDataConverterTest.cs	(.../BackgroundDataConverterTest.cs)	(revision 935e492135a782b9e63c0924df798ebb358ac7cc)
@@ -24,6 +24,7 @@
 using System.ComponentModel;
 using Core.Common.TestUtil;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
@@ -58,6 +59,21 @@
         }
 
         [Test]
+        public void ConvertTo_MapDataNotSupportedForConversion_ThrowNotSupportedException()
+        {
+            // Setup
+            var unsupportedImageBasedMapData = new TestImageBasedMapData("What's in a name?", false);
+
+            // Call 
+            TestDelegate call = () => BackgroundDataConverter.ConvertTo(unsupportedImageBasedMapData);
+
+            // Assert
+            var exception = Assert.Throws<NotSupportedException>(call);
+            string expectedMessage = $"Can't create a background data configuration for {unsupportedImageBasedMapData.GetType()}.";
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
         [TestCase(true)]
         [TestCase(false)]
         public void ConvertTo_WmtsMapData_ReturnBackgroundData(bool configured)