Index: Application/Ringtoets/src/Application.Ringtoets.Storage/BackedUpFileWriter.cs
===================================================================
diff -u -r065af7e201b59ec19a17c42e9d772f5e86b31338 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/BackedUpFileWriter.cs	(.../BackedUpFileWriter.cs)	(revision 065af7e201b59ec19a17c42e9d772f5e86b31338)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/BackedUpFileWriter.cs	(.../BackedUpFileWriter.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -45,7 +45,7 @@
         /// <exception cref="ArgumentException"><paramref name="targetFilePath"/> is not a valid path.</exception>
         public BackedUpFileWriter(string targetFilePath)
         {
-            FileUtils.ValidateFilePath(targetFilePath);
+            IOUtils.ValidateFilePath(targetFilePath);
 
             this.targetFilePath = targetFilePath;
             temporaryFilePath = targetFilePath + temporarySuffix;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs
===================================================================
diff -u -r8e5f037ed7df5263d26ba1ada373be196e7a354b -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 8e5f037ed7df5263d26ba1ada373be196e7a354b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs	(.../StorageSqLite.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -250,7 +250,7 @@
         /// </exception>
         private static string GetConnectionToExistingFile(string databaseFilePath)
         {
-            FileUtils.ValidateFilePath(databaseFilePath);
+            IOUtils.ValidateFilePath(databaseFilePath);
             return GetConnectionToFile(databaseFilePath);
         }
 
@@ -269,7 +269,7 @@
         /// </exception>
         private static string GetConnectionToNewFile(string databaseFilePath)
         {
-            FileUtils.ValidateFilePath(databaseFilePath);
+            IOUtils.ValidateFilePath(databaseFilePath);
             StorageSqliteCreator.CreateDatabaseStructure(databaseFilePath);
             return GetConnectionToFile(databaseFilePath);
         }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs
===================================================================
diff -u -r0df7cded06f5afbac08b97e025242ba55c90ec57 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(.../StorageSqliteCreator.cs)	(revision 0df7cded06f5afbac08b97e025242ba55c90ec57)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(.../StorageSqliteCreator.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -47,7 +47,7 @@
         /// <exception cref="StorageException">Thrown when executing <c>DatabaseStructure</c> script fails.</exception>
         public static void CreateDatabaseStructure(string databaseFilePath)
         {
-            FileUtils.ValidateFilePath(databaseFilePath);
+            IOUtils.ValidateFilePath(databaseFilePath);
 
             if (File.Exists(databaseFilePath))
             {
Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rd6ef4701f85e2df60c71f0961f42b1c6444bc5ad -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision d6ef4701f85e2df60c71f0961f42b1c6444bc5ad)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -186,7 +186,7 @@
             {
                 try
                 {
-                    FileUtils.ValidateFilePath(potentialPath);
+                    IOUtils.ValidateFilePath(potentialPath);
                     fileToOpen = potentialPath;
                     return true;
                 }
@@ -204,7 +204,7 @@
         {
             try
             {
-                FileUtils.DeleteOldFiles(GetLogFileDirectory(), "*.log", numberOfDaysToKeepLogFiles);
+                IOUtils.DeleteOldFiles(GetLogFileDirectory(), "*.log", numberOfDaysToKeepLogFiles);
             }
             catch (Exception e)
             {
Index: Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs
===================================================================
diff -u -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs	(.../SqLiteDatabaseReaderBase.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
+++ Core/Common/src/Core.Common.IO/Readers/SqLiteDatabaseReaderBase.cs	(.../SqLiteDatabaseReaderBase.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -51,7 +51,7 @@
         {
             try
             {
-                FileUtils.ValidateFilePath(databaseFilePath);
+                IOUtils.ValidateFilePath(databaseFilePath);
                 Path = databaseFilePath;
 
                 if (!File.Exists(databaseFilePath))
Index: Core/Common/src/Core.Common.Utils/Builders/DirectoryWriterErrorMessageBuilder.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/Builders/DirectoryWriterErrorMessageBuilder.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/Builders/DirectoryWriterErrorMessageBuilder.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -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.Globalization;
+using Core.Common.Utils.Extensions;
+using Core.Common.Utils.Properties;
+
+namespace Core.Common.Utils.Builders
+{
+    /// <summary>
+    /// Class to help create consistent folder writer error messages.
+    /// </summary>
+    public class DirectoryWriterErrorMessageBuilder
+    {
+        private readonly string folderPath;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DirectoryWriterErrorMessageBuilder"/> class.
+        /// </summary>
+        /// <param name="folderPath">The file path to the directory where the error occurred.</param>
+        public DirectoryWriterErrorMessageBuilder(string folderPath)
+        {
+            this.folderPath = folderPath;
+        }
+
+        /// <summary>
+        /// Builds the specified error message.
+        /// </summary>
+        /// <param name="errorMessage">The message about the error that occurred.</param>
+        /// <returns>The full error message.</returns>
+        public string Build(string errorMessage)
+        {
+            return string.Format(CultureInfo.CurrentCulture,
+                                 Resources.Error_Writing_to_Directory_0_CustomMessage_1_,
+                                 folderPath,
+                                 errorMessage.FirstToLower());
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Builders/FileWriterErrorMessageBuilder.cs
===================================================================
diff -u -r49c5da81f49a23dd6e66526d264a08bf510e6963 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/src/Core.Common.Utils/Builders/FileWriterErrorMessageBuilder.cs	(.../FileWriterErrorMessageBuilder.cs)	(revision 49c5da81f49a23dd6e66526d264a08bf510e6963)
+++ Core/Common/src/Core.Common.Utils/Builders/FileWriterErrorMessageBuilder.cs	(.../FileWriterErrorMessageBuilder.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -48,7 +48,7 @@
         public string Build(string errorMessage)
         {
             return string.Format(CultureInfo.CurrentCulture,
-                                 Resources.Error_Writing_To_File_0_1,
+                                 Resources.Error_Writing_to_File_0_CustomMessage_1_,
                                  filePath,
                                  errorMessage);
         }
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -91,6 +91,7 @@
     <Compile Include="Attributes\ResourcesCategoryAttribute.cs" />
     <Compile Include="Attributes\ResourcesDescriptionAttribute.cs" />
     <Compile Include="Attributes\ResourcesDisplayNameAttribute.cs" />
+    <Compile Include="Builders\DirectoryWriterErrorMessageBuilder.cs" />
     <Compile Include="Builders\FileReaderErrorMessageBuilder.cs" />
     <Compile Include="Builders\FileWriterErrorMessageBuilder.cs" />
     <Compile Include="Drawing\GraphicsExtensions.cs" />
@@ -102,7 +103,7 @@
     <Compile Include="Extensions\ComparableExtensions.cs" />
     <Compile Include="Extensions\EnumerableExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="FileUtils.cs" />
+    <Compile Include="IOUtils.cs" />
     <Compile Include="IO\EmbeddedResourceFileWriter.cs" />
     <Compile Include="NullableEnumTypeConverter.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Fisheye: Tag 16bd8076863c03907abeee60b16704aba1bdb1a0 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/FileUtils.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/IOUtils.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/IOUtils.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/IOUtils.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,245 @@
+// 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.Globalization;
+using System.IO;
+using System.Linq;
+using System.Security;
+using Core.Common.Utils.Builders;
+using Core.Common.Utils.Properties;
+
+namespace Core.Common.Utils
+{
+    /// <summary>
+    /// Class with reusable file and folder related utility methods.
+    /// </summary>
+    public static class IOUtils
+    {
+        /// <summary>
+        /// Validates the folder path.
+        /// </summary>
+        /// <param name="path">The folder path to be validated.</param>
+        /// <returns><c>true</c> if the folder path is valid; <c>false</c> otherwise.</returns>
+        /// <remarks>A valid folder path:
+        /// <list type="bullet">
+        /// <item>is not empty nor contains only whitespaces.</item>
+        /// <item>has no access rights to that location.</item>
+        /// <item>isn't too long.</item>
+        /// <item>does not contain an invalid ':' character.</item>
+        /// </list></remarks>
+        public static bool IsValidFolderPath(string path)
+        {
+            try
+            {
+                ValidateFolderPath(path);
+            }
+            catch (ArgumentException)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Validates the folder path.
+        /// </summary>
+        /// <param name="path">The folder path to be validated.</param>
+        /// <exception cref="ArgumentException">Thrown when:
+        /// <list type="bullet">
+        /// <item>The folder path is empty or contains only whitespaces.</item>
+        /// <item>Caller has no access rights to the folder path.</item>
+        /// <item>The folder path is too long.</item>
+        /// <item>The folder path contains an invalid ':' character.</item>
+        /// </list></exception>
+        public static void ValidateFolderPath(string path)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                var message = new DirectoryWriterErrorMessageBuilder(path)
+                    .Build(Resources.FileUtils_ValidateFolderPath_Path_cannot_be_empty);
+                throw new ArgumentException(message);
+            }
+            try
+            {
+                string fullPath = Path.GetFullPath(path);
+            }
+            catch (SecurityException e)
+            {
+                var message = new DirectoryWriterErrorMessageBuilder(path)
+                    .Build(Resources.FileUtils_ValidateFolderPath_No_access_rights_to_folder);
+                throw new ArgumentException(message, e);
+            }
+            catch (PathTooLongException e)
+            {
+                var message = new DirectoryWriterErrorMessageBuilder(path)
+                    .Build(Resources.FileUtils_ValidateFolderPath_Folder_path_too_long);
+                throw new ArgumentException(message, e);
+            }
+            catch (NotSupportedException e)
+            {
+                var message = new DirectoryWriterErrorMessageBuilder(path)
+                    .Build(Resources.FileUtils_ValidateFolderPath_Folder_path_contains_invalid_character);
+                throw new ArgumentException(message, e);
+            }
+        }
+
+        /// <summary>
+        /// Validates the file path.
+        /// </summary>
+        /// <param name="path">The file path to be validated.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="path"/> is invalid.</exception>
+        /// <remarks>A valid path:
+        /// <list type="bullet">
+        /// <item>is not empty or <c>null</c>,</item>
+        /// <item>does not consist out of only whitespace characters,</item>
+        /// <item>does not contain an invalid character,</item>
+        /// <item>does not end with a directory or path separator (empty file name).</item>
+        /// </list></remarks>
+        public static void ValidateFilePath(string path)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                var message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_Path_must_be_specified);
+                throw new ArgumentException(message);
+            }
+
+            string name;
+            try
+            {
+                name = Path.GetFileName(path);
+            }
+            catch (ArgumentException e)
+            {
+                var message = new FileReaderErrorMessageBuilder(path)
+                    .Build(string.Format(CultureInfo.CurrentCulture,
+                                         Resources.Error_Path_cannot_contain_Characters_0_,
+                                         string.Join(", ", Path.GetInvalidFileNameChars())));
+                throw new ArgumentException(message, e);
+            }
+            if (string.IsNullOrEmpty(name))
+            {
+                var message = new FileReaderErrorMessageBuilder(path).Build(Resources.Error_Path_must_not_point_to_empty_file_name);
+                throw new ArgumentException(message);
+            }
+        }
+
+        /// <summary>
+        /// Validates the file path.
+        /// </summary>
+        /// <param name="path">The file path to be validated.</param>
+        /// <returns><c>true</c> if the file path is valid, <c>false</c> otherwise.</returns>
+        /// <remarks>A valid path:
+        /// <list type="bullet">
+        /// <item>contains not only whitespace,</item>
+        /// <item>does not contain an invalid character,</item>
+        /// <item>is not empty or <c>null</c>,</item>
+        /// <item>does not end with a directory or path separator (empty file name).</item>
+        /// </list></remarks>
+        public static bool IsValidFilePath(string path)
+        {
+            try
+            {
+                ValidateFilePath(path);
+            }
+            catch (ArgumentException)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Searches the files in <paramref name="path"/> that match <paramref name="searchPattern"/> and 
+        /// deletes the files older than <paramref name="numberOfDaysToKeepFiles"/> days.
+        /// </summary>
+        /// <param name="path">The directory to search.</param>
+        /// <param name="searchPattern">The search string to match against the names of files in path.</param>
+        /// <param name="numberOfDaysToKeepFiles">The maximum number days since the file was created.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="path"/> or <paramref name="searchPattern"/> is <c>null</c>, is a zero-length string, 
+        /// contains only white space, or contains one or more invalid characters.</exception>
+        /// <exception cref="IOException">Thrown when an error occurred while trying to search and delete files in <paramref name="path"/>.</exception>
+        public static void DeleteOldFiles(string path, string searchPattern, int numberOfDaysToKeepFiles)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                throw new ArgumentException(@"No valid value for 'path'.", nameof(path));
+            }
+            if (string.IsNullOrWhiteSpace(searchPattern))
+            {
+                throw new ArgumentException(@"No valid value for 'searchPattern'.", nameof(searchPattern));
+            }
+            try
+            {
+                foreach (string logFile in Directory.GetFiles(path, searchPattern).Where(
+                    l => (DateTime.Now - File.GetCreationTime(l)).TotalDays > numberOfDaysToKeepFiles))
+                {
+                    File.Delete(logFile);
+                }
+            }
+            catch (Exception e)
+            {
+                if (e is ArgumentException || e is IOException || e is NotSupportedException || e is UnauthorizedAccessException)
+                {
+                    var message = string.Format(CultureInfo.CurrentCulture,
+                                                Resources.FileUtils_DeleteOldFiles_Error_occurred_deleting_files_in_folder_0,
+                                                path);
+                    throw new IOException(message, e);
+                }
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Validates if the file path is writable.
+        /// </summary>
+        /// <param name="path">The file path to be validated.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="path"/> is invalid.</exception>
+        /// <remarks>A valid path:
+        /// <list type="bullet">
+        /// <item>is not empty or <c>null</c>,</item>
+        /// <item>does not consist out of only whitespace characters,</item>
+        /// <item>does not contain an invalid character,</item>
+        /// <item>does not end with a directory or path separator (empty file name),</item>
+        /// <item>is writable.</item>
+        /// </list></remarks>
+        public static void ValidateFilePathIsWritable(string path)
+        {
+            ValidateFilePath(path);
+
+            var canWrite = false;
+            try
+            {
+                using (var fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write))
+                {
+                    canWrite = fs.CanWrite;
+                }
+            }
+            finally
+            {
+                if (!canWrite)
+                {
+                    throw new ArgumentException(string.Format(Resources.Error_General_output_error_0, path), nameof(path));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/Properties/Resources.Designer.cs
===================================================================
diff -u -r36c6449038e383f66174db2c09a5bff079f758b2 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/src/Core.Common.Utils/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 36c6449038e383f66174db2c09a5bff079f758b2)
+++ Core/Common/src/Core.Common.Utils/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -181,11 +181,20 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Fout bij het schrijven naar bestandsmap &apos;{0}&apos;: {1}.
+        /// </summary>
+        public static string Error_Writing_to_Directory_0_CustomMessage_1_ {
+            get {
+                return ResourceManager.GetString("Error_Writing_to_Directory_0_CustomMessage_1_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Fout bij het schrijven naar bestand &apos;{0}&apos;: {1}.
         /// </summary>
-        public static string Error_Writing_To_File_0_1 {
+        public static string Error_Writing_to_File_0_CustomMessage_1_ {
             get {
-                return ResourceManager.GetString("Error_Writing_To_File_0_1", resourceCulture);
+                return ResourceManager.GetString("Error_Writing_to_File_0_CustomMessage_1_", resourceCulture);
             }
         }
         
@@ -209,6 +218,42 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Het pad naar bestandsmap bevat een &apos;:&apos; op een ongeldige plek..
+        /// </summary>
+        public static string FileUtils_ValidateFolderPath_Folder_path_contains_invalid_character {
+            get {
+                return ResourceManager.GetString("FileUtils_ValidateFolderPath_Folder_path_contains_invalid_character", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Het pad naar bestandsmap is te lang..
+        /// </summary>
+        public static string FileUtils_ValidateFolderPath_Folder_path_too_long {
+            get {
+                return ResourceManager.GetString("FileUtils_ValidateFolderPath_Folder_path_too_long", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Geen toegangsrechten tot bestandsmap..
+        /// </summary>
+        public static string FileUtils_ValidateFolderPath_No_access_rights_to_folder {
+            get {
+                return ResourceManager.GetString("FileUtils_ValidateFolderPath_No_access_rights_to_folder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pad naar bestandsmap mag niet leeg of ongedefinieerd zijn..
+        /// </summary>
+        public static string FileUtils_ValidateFolderPath_Path_cannot_be_empty {
+            get {
+                return ResourceManager.GetString("FileUtils_ValidateFolderPath_Path_cannot_be_empty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to op regel {0}.
         /// </summary>
         public static string TextFile_On_LineNumber_0_ {
Index: Core/Common/src/Core.Common.Utils/Properties/Resources.resx
===================================================================
diff -u -r36c6449038e383f66174db2c09a5bff079f758b2 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/src/Core.Common.Utils/Properties/Resources.resx	(.../Resources.resx)	(revision 36c6449038e383f66174db2c09a5bff079f758b2)
+++ Core/Common/src/Core.Common.Utils/Properties/Resources.resx	(.../Resources.resx)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -141,7 +141,7 @@
   <data name="TypeUtils_GetMemberName_0_is_not_a_valid_expression_for_this_method" xml:space="preserve">
     <value>'{0}' is geen geldige expressie voor deze methode.</value>
   </data>
-  <data name="Error_Writing_To_File_0_1" xml:space="preserve">
+  <data name="Error_Writing_to_File_0_CustomMessage_1_" xml:space="preserve">
     <value>Fout bij het schrijven naar bestand '{0}': {1}</value>
   </data>
   <data name="Error_Line_too_big_for_RAM" xml:space="preserve">
@@ -165,4 +165,19 @@
   <data name="FileReaderErrorMessageBuilder_Build_Error_while_reading_file_0_location_1_subject_2_errorMessage_3" xml:space="preserve">
     <value>Fout bij het lezen van bestand '{0}'{1}{2}: {3}</value>
   </data>
+  <data name="Error_Writing_to_Directory_0_CustomMessage_1_" xml:space="preserve">
+    <value>Fout bij het schrijven naar bestandsmap '{0}': {1}</value>
+  </data>
+  <data name="FileUtils_ValidateFolderPath_Path_cannot_be_empty" xml:space="preserve">
+    <value>Pad naar bestandsmap mag niet leeg of ongedefinieerd zijn.</value>
+  </data>
+  <data name="FileUtils_ValidateFolderPath_No_access_rights_to_folder" xml:space="preserve">
+    <value>Geen toegangsrechten tot bestandsmap.</value>
+  </data>
+  <data name="FileUtils_ValidateFolderPath_Folder_path_too_long" xml:space="preserve">
+    <value>Het pad naar bestandsmap is te lang.</value>
+  </data>
+  <data name="FileUtils_ValidateFolderPath_Folder_path_contains_invalid_character" xml:space="preserve">
+    <value>Het pad naar bestandsmap bevat een ':' op een ongeldige plek.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/test/Core.Common.TestUtil/FileDisposeHelper.cs
===================================================================
diff -u -rd4213a7531c7effcd982ca96e799c2f8231b7627 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/test/Core.Common.TestUtil/FileDisposeHelper.cs	(.../FileDisposeHelper.cs)	(revision d4213a7531c7effcd982ca96e799c2f8231b7627)
+++ Core/Common/test/Core.Common.TestUtil/FileDisposeHelper.cs	(.../FileDisposeHelper.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -108,7 +108,7 @@
         /// </exception>
         private static void CreateFile(string filePath)
         {
-            if (FileUtils.IsValidFilePath(filePath))
+            if (IOUtils.IsValidFilePath(filePath))
             {
                 try
                 {
@@ -146,7 +146,7 @@
         /// </exception>
         private static void DeleteFile(string filePath)
         {
-            if (FileUtils.IsValidFilePath(filePath))
+            if (IOUtils.IsValidFilePath(filePath))
             {
                 try
                 {
Index: Core/Common/test/Core.Common.Utils.Test/Builders/DirectoryWriterErrorMessageBuilderTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Utils.Test/Builders/DirectoryWriterErrorMessageBuilderTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Utils.Test/Builders/DirectoryWriterErrorMessageBuilderTest.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,46 @@
+// 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.IO;
+using Core.Common.Utils.Builders;
+using NUnit.Framework;
+
+namespace Core.Common.Utils.Test.Builders
+{
+    [TestFixture]
+    public class DirectoryWriterErrorMessageBuilderTest
+    {
+        [Test]
+        public void Build_WithMessage_ReturnsDirectoryWriterErrorMessage()
+        {
+            // Setup
+            string folderPath = Directory.GetCurrentDirectory();
+            string customMessage = "<Some custom message>";
+
+            // Call
+            string message = new DirectoryWriterErrorMessageBuilder(folderPath).Build(customMessage);
+
+            // Assert
+            string expectedMessage = $"Fout bij het schrijven naar bestandsmap '{folderPath}': {customMessage}";
+            Assert.AreEqual(expectedMessage, message);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -84,6 +84,7 @@
     <Compile Include="Attributes\ResourcesDisplayNameAttributeTest.cs" />
     <Compile Include="Attributes\ResourcesDescriptionAttributeTest.cs" />
     <Compile Include="Attributes\ResourcesCategoryAttributeTest.cs" />
+    <Compile Include="Builders\DirectoryWriterErrorMessageBuilderTest.cs" />
     <Compile Include="Builders\FileWriterErrorMessageBuilderTest.cs" />
     <Compile Include="Builders\FileReaderErrorMessageBuilderTest.cs" />
     <Compile Include="Drawing\GraphicsExtensionsTest.cs" />
@@ -96,7 +97,7 @@
     <Compile Include="Extensions\ComparableExtensionsTest.cs" />
     <Compile Include="Extensions\EnumerableExtensionsTest.cs" />
     <Compile Include="Extensions\StringExtensionsTest.cs" />
-    <Compile Include="FileUtilsTest.cs" />
+    <Compile Include="IOUtilsTest.cs" />
     <Compile Include="IO\EmbeddedResourceFileWriterTest.cs" />
     <Compile Include="NullableEnumTypeConverterTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Fisheye: Tag 16bd8076863c03907abeee60b16704aba1bdb1a0 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/FileUtilsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/IOUtilsTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Utils.Test/IOUtilsTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Utils.Test/IOUtilsTest.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,394 @@
+// 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.IO;
+using System.Text;
+using System.Threading;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+
+namespace Core.Common.Utils.Test
+{
+    [TestFixture]
+    public class IOUtilsTest
+    {
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void IsValidFolderPath_InvalidEmptyPath_ReturnFalse(string invalidPath)
+        {
+            // Call
+            bool isFolderPathValid = IOUtils.IsValidFolderPath(invalidPath);
+
+            // Assert
+            Assert.IsFalse(isFolderPathValid);
+        }
+
+        [Test]
+        public void IsValidFolderPath_PathTooLong_ReturnFalse()
+        {
+            // Setup
+            var stringBuilder = new StringBuilder();
+            stringBuilder.Append(@"C:\");
+            for (int i = 0; i < 300; i++)
+            {
+                stringBuilder.Append("A");
+            }
+            stringBuilder.Append(Path.DirectorySeparatorChar);
+            string tooLongFolderPath = stringBuilder.ToString();
+
+            // Call
+            bool isFolderPathValid = IOUtils.IsValidFolderPath(tooLongFolderPath);
+
+            // Assert
+            Assert.IsFalse(isFolderPathValid);
+        }
+
+        [Test]
+        public void IsValidFolderPath_InvalidColonCharacterInPath_ReturnFalse()
+        {
+            // Setup
+            string pathWithInvalidColonCharacter = @"C:\Left:Right";
+
+            // Call
+            bool isFolderPathValid = IOUtils.IsValidFolderPath(pathWithInvalidColonCharacter);
+
+            // Assert
+            Assert.IsFalse(isFolderPathValid);
+        }
+
+        [Test]
+        public void IsValidFolderPath_ValidPath_ReturnTrue()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils);
+
+            // Call
+            bool isFolderPathValid = IOUtils.IsValidFilePath(path);
+
+            // Assert
+            Assert.IsTrue(isFolderPathValid);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void ValidateFolderPath_InvalidEmptyPath_ThrowsArgumentException(string invalidPath)
+        {
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFolderPath(invalidPath);
+
+            // Assert
+            string message = $"Fout bij het schrijven naar bestandsmap '{invalidPath}': pad naar bestandsmap mag niet leeg of ongedefinieerd zijn.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, message);
+        }
+
+        [Test]
+        public void ValidateFolderPath_PathTooLong_ThrowsArgumentException()
+        {
+            // Setup
+            var stringBuilder = new StringBuilder();
+            stringBuilder.Append(@"C:\");
+            for (int i = 0; i < 300; i++)
+            {
+                stringBuilder.Append("A");
+            }
+            stringBuilder.Append(Path.DirectorySeparatorChar);
+            string tooLongFolderPath = stringBuilder.ToString();
+
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFolderPath(tooLongFolderPath);
+
+            // Assert
+            string message = $"Fout bij het schrijven naar bestandsmap '{tooLongFolderPath}': het pad naar bestandsmap is te lang.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, message);
+        }
+
+        [Test]
+        public void ValidateFolderPath_InvalidColonCharacterInPath_ThrowsArgumentException()
+        {
+            // Setup
+            string folderWithInvalidColonCharacter = @"C:\Left:Right";
+
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFolderPath(folderWithInvalidColonCharacter);
+
+            // Assert
+            string message = $"Fout bij het schrijven naar bestandsmap '{folderWithInvalidColonCharacter}': het pad naar bestandsmap bevat een ':' op een ongeldige plek.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, message);
+        }
+
+        [Test]
+        public void ValidateFolderPath_ValidPath_DoesNotThrow()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils);
+
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFolderPath(path);
+
+            // Assert
+            Assert.DoesNotThrow(call);
+        }
+
+        [Test]
+        public void ValidateFilePath_ValidPath_DoesNotThrowAnyExceptions()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "validFile.txt");
+
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFilePath(path);
+
+            // Assert
+            Assert.DoesNotThrow(call);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void ValidateFilePath_InvalidEmptyPath_ThrowsArgumentException(string invalidPath)
+        {
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFilePath(invalidPath);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentException>(call);
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': bestandspad mag niet leeg of ongedefinieerd zijn.", invalidPath);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void ValidateFilePath_PathContainingInvalidFileCharacters_ThrowsArgumentException()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "validFile.txt");
+            char[] invalidFileNameChars = Path.GetInvalidFileNameChars();
+            string invalidPath = path.Replace('d', invalidFileNameChars[0]);
+
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFilePath(invalidPath);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentException>(call);
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': bestandspad mag niet de volgende tekens bevatten: {1}",
+                                                invalidPath, string.Join(", ", invalidFileNameChars));
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void ValidateFilePath_PathEndsWithEmptyFileName_ThrowsArgumentException()
+        {
+            // Setup
+            string folderPath = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils) + Path.DirectorySeparatorChar;
+
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFilePath(folderPath);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentException>(call);
+            var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': bestandspad mag niet verwijzen naar een lege bestandsnaam.", folderPath);
+            Assert.AreEqual(expectedMessage, exception.Message);
+        }
+
+        [Test]
+        public void IsValidFilePath_ValidPath_ReturnsTrue()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "validFile.txt");
+
+            // Call
+            var valid = IOUtils.IsValidFilePath(path);
+
+            // Assert
+            Assert.IsTrue(valid);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void IsValidFilePath_InvalidEmptyPath_ReturnsFalse(string invalidPath)
+        {
+            // Call
+            bool valid = IOUtils.IsValidFilePath(invalidPath);
+
+            // Assert
+            Assert.IsFalse(valid);
+        }
+
+        [Test]
+        public void IsValidFilePath_PathContainingInvalidFileCharacters_ReturnsFalse()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "validFile.txt");
+            char[] invalidFileNameChars = Path.GetInvalidFileNameChars();
+            string invalidPath = path.Replace('d', invalidFileNameChars[0]);
+
+            // Call
+            bool valid = IOUtils.IsValidFilePath(invalidPath);
+
+            // Assert
+            Assert.IsFalse(valid);
+        }
+
+        [Test]
+        public void IsValidFilePath_PathIsActuallyFolder_ReturnsFalse()
+        {
+            // Setup
+            string folderPath = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils) + Path.DirectorySeparatorChar;
+
+            // Call
+            bool valid = IOUtils.IsValidFilePath(folderPath);
+
+            // Assert
+            Assert.IsFalse(valid);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void DeleteOldFiles_InvalidEmptyPath_ThrowsArgumentException(string invalidPath)
+        {
+            // Call
+            TestDelegate call = () => IOUtils.DeleteOldFiles(invalidPath, "", 0);
+
+            // Assert
+            string invalidParameterName = Assert.Throws<ArgumentException>(call).ParamName;
+            Assert.AreEqual("path", invalidParameterName);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void DeleteOldFiles_InvalidSearchPattern_ThrowsArgumentException(string invalidSearchPattern)
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils);
+
+            // Call
+            TestDelegate call = () => IOUtils.DeleteOldFiles(path, invalidSearchPattern, 0);
+
+            // Assert
+            string invalidParameterName = Assert.Throws<ArgumentException>(call).ParamName;
+            Assert.AreEqual("searchPattern", invalidParameterName);
+        }
+
+        [Test]
+        public void DeleteOldFiles_PathDoesNotExist_ThrowsIOException()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, "doesNotExist");
+
+            // Precondition
+            Assert.IsFalse(Directory.Exists(path));
+
+            // Call
+            TestDelegate call = () => IOUtils.DeleteOldFiles(path, "*.log", 0);
+
+            // Assert
+            IOException exception = Assert.Throws<IOException>(call);
+            var message = string.Format("Er is een fout opgetreden bij het verwijderen van bestanden in de map '{0}'.", path);
+            Assert.AreEqual(message, exception.Message);
+            Assert.IsInstanceOf<IOException>(exception.InnerException);
+        }
+
+        [Test]
+        public void DeleteOldFiles_ValidPathWithFile_DeletesFile()
+        {
+            // Setup
+            string path = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils);
+            string filePath = Path.Combine(path, "fileToDelete.log");
+
+            using (new FileDisposeHelper(filePath))
+            {
+                Thread.Sleep(1); // Sleep 1 ms to make sure File. Create has had enough time to create the file.
+
+                // Call
+                IOUtils.DeleteOldFiles(path, "*.log", 0);
+
+                // Assert
+                Thread.Sleep(1); // Sleep 1 ms to make sure File. Delete has had enough time to remove the file.
+                Assert.IsFalse(File.Exists(filePath));
+            }
+        }
+
+        [Test]
+        [TestCase("")]
+        [TestCase("   ")]
+        [TestCase(null)]
+        public void ValidateFilePathIsWritable_FilePathNullOrWhiteSpace_ThrowsArgumentException(string filePath)
+        {
+            // Call
+            TestDelegate call = () => IOUtils.ValidateFilePathIsWritable(filePath);
+
+            // Assert
+            ArgumentException exception = Assert.Throws<ArgumentException>(call);
+            Assert.AreEqual($"Fout bij het lezen van bestand '{filePath}': bestandspad mag niet leeg of ongedefinieerd zijn.", exception.Message);
+        }
+
+        [Test]
+        public void ValidateFilePathIsWritable_FileNotWritable_ThrowsArgumentException()
+        {
+            // Setup
+            string filename = Path.GetRandomFileName();
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, filename);
+
+            using (new FileDisposeHelper(filePath))
+            {
+                FileAttributes attributes = File.GetAttributes(filePath);
+                File.SetAttributes(filePath, attributes | FileAttributes.ReadOnly);
+
+                // Call
+                TestDelegate call = () => IOUtils.ValidateFilePathIsWritable(filePath);
+
+                // Assert
+                string expectedMessage = $"Er is een onverwachte fout opgetreden tijdens het schrijven van het bestand '{filePath}'.";
+                TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+
+                File.SetAttributes(filePath, attributes);
+            }
+        }
+
+        [Test]
+        public void ValidateFilePathIsWritable_FileWritable_DoesNotThrowException()
+        {
+            // Setup
+            string filename = Path.GetRandomFileName();
+            string filePath = TestHelper.GetTestDataPath(TestDataPath.Core.Common.Utils, filename);
+
+            using (new FileDisposeHelper(filePath))
+            {
+                // Call
+                TestDelegate call = () => IOUtils.ValidateFilePathIsWritable(filePath);
+
+                // Assert
+                Assert.DoesNotThrow(call);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj
===================================================================
diff -u -re13bcfb136c9a532fce9dc2f74bf9576321a90b0 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj	(.../Core.Components.DotSpatial.Forms.csproj)	(revision e13bcfb136c9a532fce9dc2f74bf9576321a90b0)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj	(.../Core.Components.DotSpatial.Forms.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -34,6 +34,10 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BruTile, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\BruTile.0.19.0\lib\net40\BruTile.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="DotSpatial.Controls, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Controls.dll</HintPath>
@@ -102,6 +106,7 @@
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </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: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -rc6ae22bb8ea36b96be9f859f3348b68c57d4b479 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision c6ae22bb8ea36b96be9f859f3348b68c57d4b479)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -25,6 +25,8 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Components.DotSpatial.Layer;
+using Core.Components.DotSpatial.Layer.BruTile;
+using Core.Components.DotSpatial.Layer.BruTile.Configurations;
 using Core.Components.DotSpatial.MapFunctions;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Forms;
@@ -41,6 +43,7 @@
     {
         private readonly Cursor defaultCursor = Cursors.Default;
         private readonly RecursiveObserver<MapDataCollection, MapDataCollection> mapDataCollectionObserver;
+        private readonly Observer backGroundMapDataObserver;
         private readonly IList<DrawnMapData> drawnMapDataList = new List<DrawnMapData>();
 
         private Map map;
@@ -49,6 +52,13 @@
         private MouseCoordinatesMapExtension mouseCoordinatesMapExtension;
         private MapDataCollection data;
 
+        private BruTileLayer backgroundLayer;
+        private WmtsMapData backgroundMapData;
+
+        private string layerSourceCapabilitiesUrl;
+        private string layerSelectedCapabilityId;
+        private string layerPreferredFormat;
+
         /// <summary>
         /// Creates a new instance of <see cref="MapControl"/>.
         /// </summary>
@@ -58,6 +68,7 @@
             TogglePanning();
 
             mapDataCollectionObserver = new RecursiveObserver<MapDataCollection, MapDataCollection>(HandleMapDataCollectionChange, mdc => mdc.Collection);
+            backGroundMapDataObserver = new Observer(HandleBackgroundMapDataChange);
         }
 
         public bool IsPanningEnabled { get; private set; }
@@ -74,22 +85,50 @@
             }
             set
             {
-                if (data != null)
+                if (HasMapData)
                 {
-                    ClearMapData();
+                    ClearAllMapData();
                 }
 
                 data = value;
 
                 mapDataCollectionObserver.Observable = data;
 
-                if (data != null)
+                if (HasMapData)
                 {
                     DrawInitialMapData();
                 }
             }
         }
 
+        public WmtsMapData BackgroundMapData
+        {
+            get
+            {
+                return backgroundMapData;
+            }
+            set
+            {
+                if (HasMapData)
+                {
+                    ClearAllMapData();
+
+                    layerSourceCapabilitiesUrl = null;
+                    layerSelectedCapabilityId = null;
+                    layerPreferredFormat = null;
+                }
+
+                backgroundMapData = value;
+
+                backGroundMapDataObserver.Observable = value;
+
+                if (HasMapData)
+                {
+                    DrawInitialMapData();
+                }
+            }
+        }
+
         public void ZoomToAllVisibleLayers()
         {
             ZoomToAllVisibleLayers(Data);
@@ -143,10 +182,98 @@
             map.Dispose();
             mouseCoordinatesMapExtension.Dispose();
             mapDataCollectionObserver.Dispose();
+            backGroundMapDataObserver.Dispose();
 
             base.Dispose(disposing);
         }
 
+        private bool HasMapData
+        {
+            get
+            {
+                return backgroundMapData != null || data != null;
+            }
+        }
+
+        private void HandleBackgroundMapDataChange()
+        {
+            if (backgroundLayer != null)
+            {
+                if (HasBackgroundMapDataConfigurationChanged())
+                {
+                    map.Layers.Remove(backgroundLayer);
+                    backgroundLayer.Dispose();
+
+                    InsertBackgroundLayer();
+                }
+                backgroundLayer.IsVisible = backgroundMapData.IsVisible;
+                backgroundLayer.Transparency = Convert.ToSingle(backgroundMapData.Transparency);
+            }
+            else
+            {
+                InsertBackgroundLayer();
+            }
+        }
+
+        private bool HasBackgroundMapDataConfigurationChanged()
+        {
+            return !Equals(backgroundMapData.SourceCapabilitiesUrl, layerSourceCapabilitiesUrl)
+                   || !Equals(backgroundMapData.SelectedCapabilityIdentifier, layerSelectedCapabilityId)
+                   || !Equals(backgroundMapData.PreferredFormat, layerPreferredFormat);
+        }
+
+        private void InsertBackgroundLayer()
+        {
+            if (backgroundMapData.IsConfigured)
+            {
+                InitializeBackgroundLayer();
+
+                InsertBackgroundLayerAndReprojectExistingLayers();
+            }
+            else
+            {
+                map.Projection = MapDataConstants.FeatureBasedMapDataCoordinateSystem;
+                ReprojectLayers(map.Layers);
+            }
+        }
+
+        private void InitializeBackgroundLayer()
+        {
+            WmtsLayerConfiguration configuration = WmtsLayerConfiguration.CreateInitializedConfiguration(backgroundMapData.SourceCapabilitiesUrl,
+                                                                                                         backgroundMapData.SelectedCapabilityIdentifier,
+                                                                                                         backgroundMapData.PreferredFormat);
+            backgroundLayer = new BruTileLayer(configuration)
+            {
+                IsVisible = backgroundMapData.IsVisible,
+                Transparency = Convert.ToSingle(backgroundMapData.Transparency)
+            };
+
+            layerSourceCapabilitiesUrl = backgroundMapData.SourceCapabilitiesUrl;
+            layerSelectedCapabilityId = backgroundMapData.SelectedCapabilityIdentifier;
+            layerPreferredFormat = backgroundMapData.PreferredFormat;
+        }
+
+        private void InsertBackgroundLayerAndReprojectExistingLayers()
+        {
+            IMapLayer[] existingMapLayers = map.Layers.ToArray();
+
+            map.Projection = backgroundLayer.Projection;
+            map.Layers.Insert(0, backgroundLayer);
+
+            ReprojectLayers(existingMapLayers);
+        }
+
+        private void ReprojectLayers(IEnumerable<IMapLayer> layersToReproject)
+        {
+            foreach (IMapLayer mapLayer in layersToReproject)
+            {
+                if (!mapLayer.Projection.Equals(map.Projection))
+                {
+                    mapLayer.Reproject(map.Projection);
+                }
+            }
+        }
+
         private static void AddPadding(Extent extent)
         {
             var padding = Math.Min(extent.Height, extent.Width) * 0.05;
@@ -247,13 +374,29 @@
 
         private void DrawInitialMapData()
         {
-            foreach (FeatureBasedMapData featureBasedMapData in Data.GetFeatureBasedMapDataRecursively())
+            if (BackgroundMapData != null && BackgroundMapData.IsConfigured)
             {
-                DrawMapData(featureBasedMapData);
+                InitializeBackgroundLayer();
+                map.Projection = backgroundLayer.Projection;
+                map.Layers.Add(backgroundLayer);
             }
+            else
+            {
+                layerSourceCapabilitiesUrl = null;
+                layerSelectedCapabilityId = null;
+                layerPreferredFormat = null;
+            }
+
+            if (Data != null)
+            {
+                foreach (FeatureBasedMapData featureBasedMapData in Data.GetFeatureBasedMapDataRecursively())
+                {
+                    DrawMapData(featureBasedMapData);
+                }
+            }
         }
 
-        private void ClearMapData()
+        private void ClearAllMapData()
         {
             foreach (DrawnMapData drawnMapData in drawnMapDataList)
             {
@@ -263,6 +406,7 @@
             drawnMapDataList.Clear();
 
             map.ClearLayers();
+            map.Projection = MapDataConstants.FeatureBasedMapDataCoordinateSystem;
         }
 
         private void HandleMapDataCollectionChange()
Fisheye: Tag 884543108a6db82b36fca454624a7e9aacaf801d refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial.Forms/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -re13bcfb136c9a532fce9dc2f74bf9576321a90b0 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision e13bcfb136c9a532fce9dc2f74bf9576321a90b0)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -95,9 +95,11 @@
     <Compile Include="Layer\BruTile\Configurations\CannotCreateTileCacheException.cs" />
     <Compile Include="Layer\BruTile\Configurations\CannotFindTileSourceException.cs" />
     <Compile Include="Layer\BruTile\Configurations\IConfiguration.cs" />
+    <Compile Include="Layer\BruTile\Configurations\ITileSourceFactory.cs" />
     <Compile Include="Layer\BruTile\Configurations\PersistentCacheConfiguration.cs" />
     <Compile Include="Layer\BruTile\Configurations\PersistentCacheStrategy.cs" />
     <Compile Include="Layer\BruTile\Configurations\BruTileReflectionHelper.cs" />
+    <Compile Include="Layer\BruTile\Configurations\TileSourceFactory.cs" />
     <Compile Include="Layer\BruTile\Configurations\WmtsLayerConfiguration.cs" />
     <Compile Include="Layer\BruTile\Projections\ReprojectExtensions.cs" />
     <Compile Include="Layer\BruTile\Projections\TileReprojector.cs" />
@@ -125,6 +127,11 @@
       <Name>Core.Common.Base</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}</Project>
+      <Name>Core.Common.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Core.Components.Gis\Core.Components.Gis.csproj">
       <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
       <Name>Core.Components.Gis</Name>
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileSettings.cs
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileSettings.cs	(.../BruTileSettings.cs)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileSettings.cs	(.../BruTileSettings.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using System.IO;
 using BruTile.Cache;
 using Core.Components.DotSpatial.Layer.BruTile.Configurations;
 
@@ -67,5 +69,11 @@
         /// Gets the <see cref="MemoryCache{T}.MaxTiles"/> value
         /// </summary>
         public static int MemoryCacheMaximum { get; } = 200;
+
+        /// <summary>
+        /// Gets the root directory path for the persistent cache.
+        /// </summary>
+        public static string PersistentCacheDirectoryRoot { get; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                                                                                  "WTI", "Ringtoets", "tilecaches");
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/BruTileReflectionHelper.cs
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/BruTileReflectionHelper.cs	(.../BruTileReflectionHelper.cs)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/BruTileReflectionHelper.cs	(.../BruTileReflectionHelper.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -44,12 +44,14 @@
         internal static ITileProvider GetProviderFromTileSource(ITileSource source)
         {
             FieldInfo fi = null;
-            Type sourceType = source.GetType();
-            if (sourceType == typeof(HttpTileSource))
+            // Note: This implementation respects inheritance. Cannot use 'source.GetType()'
+            // as that only grant access to fields declared in that type. Therefore the _provider
+            // field would be inaccessible if 'source' would be an extended type of those below.
+            if (source is HttpTileSource)
             {
                 fi = typeof(HttpTileSource).GetField("_provider", BindingFlags.Instance | BindingFlags.NonPublic);
             }
-            else if (sourceType == typeof(TileSource))
+            else if (source is TileSource)
             {
                 fi = typeof(TileSource).GetField("_provider", BindingFlags.Instance | BindingFlags.NonPublic);
             }
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/ITileSourceFactory.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/ITileSourceFactory.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/ITileSourceFactory.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,43 @@
+// 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.Collections.Generic;
+using BruTile;
+using BruTile.Wmts;
+
+namespace Core.Components.DotSpatial.Layer.BruTile.Configurations
+{
+    /// <summary>
+    /// Interface for objects responsible for creating <see cref="ITileSource"/> from a
+    /// given URL.
+    /// </summary>
+    public interface ITileSourceFactory
+    {
+        /// <summary>
+        /// Returns all tile sources based on the capabilities of a Web Map Tile Service.
+        /// </summary>
+        /// <param name="capabilitiesUrl">The URL to the 'GetCapabilities' part of the service.</param>
+        /// <returns>The tile sources.</returns>
+        /// <exception cref="CannotFindTileSourceException">Thrown when unable to retrieve
+        /// tile sources from the given service.</exception>
+        IEnumerable<ITileSource> GetWmtsTileSources(string capabilitiesUrl);
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/PersistentCacheConfiguration.cs
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -24,6 +24,7 @@
 using System.Data.SQLite;
 using System.IO;
 using BruTile.Cache;
+using Core.Common.Utils;
 
 namespace Core.Components.DotSpatial.Layer.BruTile.Configurations
 {
@@ -35,15 +36,21 @@
     /// </remarks>
     public abstract class PersistentCacheConfiguration
     {
-        private readonly string persistentCacheDirectoryPath;
+        protected readonly string persistentCacheDirectoryPath;
 
         /// <summary>
         /// Initialized a new instance of <see cref="PersistentCacheConfiguration"/>.
         /// </summary>
         /// <param name="persistentCacheDirectoryPath">The path to the directory for this
         /// cache to keep its data.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="persistentCacheDirectoryPath"/>
+        /// is invalid.</exception>
         protected PersistentCacheConfiguration(string persistentCacheDirectoryPath)
         {
+            if (!IOUtils.IsValidFolderPath(persistentCacheDirectoryPath))
+            {
+                throw new ArgumentException("Invalid folder path", nameof(persistentCacheDirectoryPath));
+            }
             this.persistentCacheDirectoryPath = persistentCacheDirectoryPath;
         }
 
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/TileSourceFactory.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/TileSourceFactory.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/TileSourceFactory.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -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 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.Collections.Generic;
+using System.IO;
+using System.Net;
+using BruTile;
+using BruTile.Wmts;
+
+namespace Core.Components.DotSpatial.Layer.BruTile.Configurations
+{
+    public class TileSourceFactory : ITileSourceFactory
+    {
+        private static ITileSourceFactory instance;
+
+        public static ITileSourceFactory Instance
+        {
+            get
+            {
+                return instance ?? (instance = new TileSourceFactory());
+            }
+            set
+            {
+                instance = value;
+            }
+        }
+
+        public IEnumerable<ITileSource> GetWmtsTileSources(string capabilitiesUrl)
+        {
+            try
+            {
+                WebRequest req = WebRequest.Create(capabilitiesUrl);
+                using (WebResponse resp = req.GetResponse())
+                {
+                    using (Stream s = resp.GetResponseStream())
+                    {
+                        return WmtsParser.Parse(s);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                string message = string.Format("Niet in staat om de databronnen op te halen bij de WTMS url '{0}'.", capabilitiesUrl);
+                throw new CannotFindTileSourceException(message, e);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/WmtsLayerConfiguration.cs
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/Configurations/WmtsLayerConfiguration.cs	(.../WmtsLayerConfiguration.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using BruTile;
@@ -38,53 +39,53 @@
     /// </remarks>
     public class WmtsLayerConfiguration : PersistentCacheConfiguration, IConfiguration
     {
-        private readonly string persistentCacheDirectoryPath;
+        private readonly string capabilitiesUri;
+        private readonly string capabilityIdentifier;
+        private readonly string preferredFormat;
 
-        private readonly Uri capabilitiesUri;
-        private readonly string capabilityName;
-
         /// <summary>
         /// Creates an instance of <see cref="WmtsLayerConfiguration"/>.
         /// </summary>
         /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
-        /// <param name="capabilityName">The capability name to get tiles from.</param>
+        /// <param name="capabilityIdentifier">The capability name to get tiles from.</param>
+        /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
         /// <param name="persistentCacheDirectoryPath">The directory path to the persistent tile cache.</param>
-        public WmtsLayerConfiguration(string wmtsCapabilitiesUrl, string capabilityName, string persistentCacheDirectoryPath)
-            : base(persistentCacheDirectoryPath)
+        /// <exception cref="ArgumentException">Thrown when <paramref name="persistentCacheDirectoryPath"/>
+        /// is an invalid folder path</exception>
+        public WmtsLayerConfiguration(string wmtsCapabilitiesUrl, string capabilityIdentifier, string preferredFormat,
+                                      string persistentCacheDirectoryPath) : base(persistentCacheDirectoryPath)
         {
-            capabilitiesUri = new Uri(wmtsCapabilitiesUrl);
-            this.capabilityName = capabilityName;
-            LegendText = capabilityName;
+            ValidateConfigurationParameters(wmtsCapabilitiesUrl, capabilityIdentifier, preferredFormat);
 
-            this.persistentCacheDirectoryPath = persistentCacheDirectoryPath;
+            capabilitiesUri = wmtsCapabilitiesUrl;
+            this.capabilityIdentifier = capabilityIdentifier;
+            this.preferredFormat = preferredFormat;
+            LegendText = capabilityIdentifier;
 
             Initialized = false;
         }
 
         /// <summary>
-        /// 
+        /// Creates a new initialized instance of <see cref="WmtsLayerConfiguration"/>.
         /// </summary>
-        /// <param name="persistentCacheDirectoryPath"></param>
-        /// <param name="name"></param>
-        /// <param name="tileSource"></param>
+        /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
+        /// <param name="tileSource">The tile source.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="tileSource"/>
         /// is <c>null</c>.</exception>
         /// <exception cref="CannotCreateTileCacheException">Thrown when creating the file
-        /// cache at <paramref name="persistentCacheDirectoryPath"/> failed.</exception>
-        [Obsolete("Do not use due to being unable to retrieve the 'Capabilities' URL. This means instances created with this constructor do not support Clone().")]
-        public WmtsLayerConfiguration(string persistentCacheDirectoryPath, string name, ITileSource tileSource)
-            : base(persistentCacheDirectoryPath)
+        /// cache failed.</exception>
+        private WmtsLayerConfiguration(string wmtsCapabilitiesUrl, ITileSource tileSource)
+            : base(SuggestTileCachePath(tileSource))
         {
-            this.persistentCacheDirectoryPath = persistentCacheDirectoryPath;
-
-            LegendText = name;
-            capabilityName = name;
-
             if (tileSource == null)
             {
                 throw new ArgumentNullException(nameof(tileSource));
             }
 
+            capabilitiesUri = wmtsCapabilitiesUrl;
+            capabilityIdentifier = ((WmtsTileSchema) tileSource.Schema).Identifier;
+            preferredFormat = tileSource.Schema.Format;
+
             InitializeFromTileSource(tileSource);
         }
 
@@ -98,9 +99,15 @@
 
         public TileFetcher TileFetcher { get; private set; }
 
+        public static WmtsLayerConfiguration CreateInitializedConfiguration(string capabilitiesUrl, string capabilityIdentifier, string preferredFormat)
+        {
+            ITileSource tileSource = GetConfiguredTileSource(capabilitiesUrl, capabilityIdentifier, preferredFormat);
+            return new WmtsLayerConfiguration(capabilitiesUrl, tileSource);
+        }
+
         public IConfiguration Clone()
         {
-            return new WmtsLayerConfiguration(capabilitiesUri.AbsolutePath, capabilityName, persistentCacheDirectoryPath);
+            return new WmtsLayerConfiguration(capabilitiesUri, capabilityIdentifier, persistentCacheDirectoryPath, preferredFormat);
         }
 
         public void Initialize()
@@ -110,55 +117,90 @@
                 return;
             }
 
-            ITileSource tileSource = GetConfiguredTileSource();
+            ITileSource tileSource = GetConfiguredTileSource(capabilitiesUri, capabilityIdentifier, preferredFormat);
 
             InitializeFromTileSource(tileSource);
         }
 
         /// <summary>
+        /// Validate the configuration parameters.
+        /// </summary>
+        /// <param name="wmtsCapabilitiesUrl">The capabilities url of the WMTS.</param>
+        /// <param name="capabilityIdentifier">The capability name to get tiles from.</param>
+        /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="preferredFormat"/>
+        /// is not specified as a MIME-type.</exception>
+        private static void ValidateConfigurationParameters(string wmtsCapabilitiesUrl, string capabilityIdentifier, string preferredFormat)
+        {
+            if (wmtsCapabilitiesUrl == null)
+            {
+                throw new ArgumentNullException(nameof(wmtsCapabilitiesUrl));
+            }
+            if (capabilityIdentifier == null)
+            {
+                throw new ArgumentNullException(nameof(capabilityIdentifier));
+            }
+            if (preferredFormat == null)
+            {
+                throw new ArgumentNullException(nameof(preferredFormat));
+            }
+            if (!preferredFormat.StartsWith("image/"))
+            {
+                throw new ArgumentException("Specified image format is not a MIME type.", nameof(preferredFormat));
+            }
+        }
+
+        /// <summary>
         /// Connects to the WMTS to retrieve the configured tile source.
         /// </summary>
+        /// <param name="capabilitiesUri">The URL of the tile source server.</param>
+        /// <param name="capabilityIdentifier">The identifier of the tile source.</param>
+        /// <param name="preferredFormat">The preferred tile image format, as MIME-type.</param>
         /// <returns>The tile source, or null if no matching tile source could be found.</returns>
         /// <exception cref="CannotFindTileSourceException">Thrown when unable to retrieve
         /// the configured tile source.</exception>
-        private ITileSource GetConfiguredTileSource()
+        private static ITileSource GetConfiguredTileSource(string capabilitiesUri, string capabilityIdentifier, string preferredFormat)
         {
-            IEnumerable<ITileSource> tileSources = GetTileSources(capabilitiesUri);
-            ITileSource tileSource = tileSources.FirstOrDefault(ts => ts.Name.Equals(capabilityName, StringComparison.InvariantCulture));
+            IEnumerable<ITileSource> tileSources = TileSourceFactory.Instance.GetWmtsTileSources(capabilitiesUri);
+            ITileSource tileSource = tileSources.FirstOrDefault(ts => IsMatch(ts, capabilityIdentifier, preferredFormat));
             if (tileSource == null)
             {
                 string message = string.Format("Niet in staat om de databron met naam '{0}' te kunnen vinden bij de WTMS url '{1}'.",
-                                               capabilitiesUri, capabilityName);
+                                               capabilitiesUri, capabilityIdentifier);
                 throw new CannotFindTileSourceException(message);
             }
             return tileSource;
         }
 
-        /// <summary>
-        /// Connects to the WMTS and retrieves all available tile sources.
-        /// </summary>
-        /// <param name="capabilitiesUrl">The capabilities URL.</param>
-        /// <returns>All available tile sources.</returns>
-        /// <exception cref="CannotFindTileSourceException">Thrown when an exception occurs
-        /// while retrieving the available tile sources.</exception>
-        private static IEnumerable<ITileSource> GetTileSources(Uri capabilitiesUrl)
+        private static bool IsMatch(ITileSource wmtsTileSource, string capabilityIdentifier, string preferredFormat)
         {
-            try
+            var schema = (WmtsTileSchema) wmtsTileSource.Schema;
+            return schema.Identifier.Equals(capabilityIdentifier)
+                   && schema.Format.Equals(preferredFormat);
+        }
+
+        private static string SuggestTileCachePath(ITileSource tileSource)
+        {
+            var tileSchema = (WmtsTileSchema) tileSource.Schema;
+            string host = tileSchema.Title;
+            string format = tileSchema.Format.Split('/')[1];
+            string layerStyle = tileSchema.Identifier;
+            if (!string.IsNullOrEmpty(tileSchema.Style))
             {
-                var req = WebRequest.Create(capabilitiesUrl);
-                using (var resp = req.GetResponse())
-                {
-                    using (var s = resp.GetResponseStream())
-                    {
-                        return WmtsParser.Parse(s);
-                    }
-                }
+                layerStyle += "_" + tileSchema.Style;
             }
-            catch (Exception e)
+
+            foreach (var c in Path.GetInvalidFileNameChars())
             {
-                string message = string.Format("Niet in staat om de databronnen op te halen bij de WTMS url '{0}'.", capabilitiesUrl);
-                throw new CannotFindTileSourceException(message, e);
+                host = host.Replace(c, '$');
             }
+            foreach (var c in Path.GetInvalidFileNameChars())
+            {
+                layerStyle = layerStyle.Replace(c, '$');
+            }
+
+            return Path.Combine(BruTileSettings.PersistentCacheDirectoryRoot, "Wmts", host, layerStyle, format);
         }
 
         /// <summary>
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/TileFetching/TileFetcher.cs
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/TileFetching/TileFetcher.cs	(.../TileFetcher.cs)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/TileFetching/TileFetcher.cs	(.../TileFetcher.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -206,7 +206,7 @@
         private void GetTileOnThread(object[] parameters)
         {
             var tileInfo = (TileInfo) parameters[0];
-            var tileRetrievedEvent = (AutoResetEvent) parameters[1];
+            var tileRetrievedEvent = !AsyncMode ? (AutoResetEvent) parameters[1] : null;
 
             GetTileOnThreadCore(tileInfo, tileRetrievedEvent);
         }
Index: Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs
===================================================================
diff -u -r7660d43cae4eda23b77c027f50dde28c23715c1b -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs	(.../IMapControl.cs)	(revision 7660d43cae4eda23b77c027f50dde28c23715c1b)
+++ Core/Components/src/Core.Components.Gis.Forms/IMapControl.cs	(.../IMapControl.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -50,6 +50,11 @@
         MapDataCollection Data { get; set; }
 
         /// <summary>
+        /// Gets or sets the data to show in the background of the <see cref="IMapControl"/>.
+        /// </summary>
+        WmtsMapData BackgroundMapData { get; set; }
+
+        /// <summary>
         /// Zooms to a level so that all visible layers are in view.
         /// </summary>
         void ZoomToAllVisibleLayers();
Index: Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs
===================================================================
diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs	(.../ShapeFileReaderBase.cs)	(revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/ShapeFileReaderBase.cs	(.../ShapeFileReaderBase.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -52,7 +52,7 @@
         /// points to a file that doesn't exist. </exception>
         protected ShapeFileReaderBase(string filePath)
         {
-            FileUtils.ValidateFilePath(filePath);
+            IOUtils.ValidateFilePath(filePath);
             if (!File.Exists(filePath))
             {
                 string message = new FileReaderErrorMessageBuilder(filePath)
Index: Core/Components/src/Core.Components.Gis.IO/Writers/ShapeFileWriterBase.cs
===================================================================
diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.Gis.IO/Writers/ShapeFileWriterBase.cs	(.../ShapeFileWriterBase.cs)	(revision b2b9fdf365e70928a05c57966eeed30d9050e528)
+++ Core/Components/src/Core.Components.Gis.IO/Writers/ShapeFileWriterBase.cs	(.../ShapeFileWriterBase.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -79,7 +79,7 @@
         /// <exception cref="CriticalFileWriteException">Thrown when the shapefile cannot be written.</exception>
         public void SaveAs(string filePath)
         {
-            FileUtils.ValidateFilePath(filePath);
+            IOUtils.ValidateFilePath(filePath);
 
             try
             {
Index: Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs
===================================================================
diff -u -r000b675444761bd16bc9aa7860c2af198b705bb0 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs	(.../WmtsMapData.cs)	(revision 000b675444761bd16bc9aa7860c2af198b705bb0)
+++ Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs	(.../WmtsMapData.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -109,17 +109,29 @@
 
         /// <summary>
         /// Creates a new instance of <see cref="WmtsMapData"/> configured to the 'brtachtergrondkaart'
-        /// of PDOK.
+        /// of PDOK in RD-new coordinate system.
         /// </summary>
         public static WmtsMapData CreateDefaultPdokMapData()
         {
             return new WmtsMapData(Resources.WmtsMapData_CreateDefaultPdokMapData_Name,
                                    "https://geodata.nationaalgeoregister.nl/wmts/top10nlv2?VERSION=1.0.0&request=GetCapabilities",
-                                   "brtachtergrondkaart",
+                                   "brtachtergrondkaart(EPSG:28992)",
                                    "image/png");
         }
 
         /// <summary>
+        /// Creates a new instance of <see cref="WmtsMapData"/> configured to the 'brtachtergrondkaart'
+        /// of PDOK in a ETRS89 / UTM zone 31 N coordinate system.
+        /// </summary>
+        public static WmtsMapData CreateAlternativePdokMapData()
+        {
+            return new WmtsMapData(Resources.WmtsMapData_CreateDefaultPdokMapData_Name,
+                                   "https://geodata.nationaalgeoregister.nl/wmts/top10nlv2?VERSION=1.0.0&request=GetCapabilities",
+                                   "brtachtergrondkaart(EPSG:25831:RWS)",
+                                   "image/png");
+        }
+
+        /// <summary>
         /// Creates a new instance of <see cref="WmtsMapData"/> that hasn't been configured.
         /// </summary>
         public static WmtsMapData CreateUnconnectedMapData()
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj
===================================================================
diff -u -re13bcfb136c9a532fce9dc2f74bf9576321a90b0 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision e13bcfb136c9a532fce9dc2f74bf9576321a90b0)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -105,6 +105,10 @@
       <Project>{318ba582-88c9-4816-a54a-a7e431461de3}</Project>
       <Name>Core.Components.Gis</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Core.Components.DotSpatial.TestUtil\Core.Components.DotSpatial.TestUtil.csproj">
+      <Project>{9b6f3987-eaf7-4733-80c1-3dcab44d87ae}</Project>
+      <Name>Core.Components.DotSpatial.TestUtil</Name>
+    </ProjectReference>
   </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: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -rc6ae22bb8ea36b96be9f859f3348b68c57d4b479 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision c6ae22bb8ea36b96be9f859f3348b68c57d4b479)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -24,15 +24,19 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
+using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
+using Core.Components.DotSpatial.Layer.BruTile;
 using Core.Components.DotSpatial.MapFunctions;
+using Core.Components.DotSpatial.TestUtil;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Forms;
 using Core.Components.Gis.Geometries;
 using DotSpatial.Controls;
 using DotSpatial.Data;
+using DotSpatial.Projections;
 using DotSpatial.Symbology;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -54,6 +58,7 @@
                 Assert.IsInstanceOf<Control>(map);
                 Assert.IsInstanceOf<IMapControl>(map);
                 Assert.IsNull(map.Data);
+                Assert.IsNull(map.BackgroundMapData);
                 Assert.IsTrue(map.IsPanningEnabled);
                 Assert.IsFalse(map.IsRectangleZoomingEnabled);
                 Assert.IsTrue(map.IsMouseCoordinatesVisible);
@@ -80,17 +85,519 @@
                 Assert.AreEqual(9, map.MapFunctions.Count);
                 Assert.AreEqual(1, map.MapFunctions.OfType<MapFunctionPan>().Count());
                 Assert.AreEqual(1, map.MapFunctions.OfType<MapFunctionSelectionZoom>().Count());
+
+                Assert.AreEqual(KnownCoordinateSystems.Projected.NationalGrids.Rijksdriehoekstelsel, map.Projection);
+                Assert.AreEqual(ActionMode.Never, map.ProjectionModeDefine);
+                Assert.IsTrue(map.ZoomOutFartherThanMaxExtent);
             }
         }
 
         [Test]
-        public void GivenMapControlWithoutData_WhenDataSetToMapDataCollection_ThenMapControlUpdated()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GivenMapControlWithoutBackgroundMapData_WhenBackgroundMapDataSet_ThenMapControlUpdated(bool isVisible)
         {
             // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            backgroundMapData.IsVisible = isVisible;
+            backgroundMapData.Transparency = (RoundedDouble) 0.25;
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
             using (var map = new MapControl())
             {
+                // When
+                map.BackgroundMapData = backgroundMapData;
+
+                // Then
                 var mapView = map.Controls.OfType<Map>().First();
-                var mapPointData = new MapPointData("Points");
+                Assert.AreEqual(1, mapView.Layers.Count);
+                BruTileLayer bruTileLayer = (BruTileLayer) mapView.Layers[0];
+                Assert.AreEqual(isVisible, bruTileLayer.IsVisible);
+                Assert.AreEqual(backgroundMapData.Transparency.Value, bruTileLayer.Transparency);
+
+                Assert.IsTrue(bruTileLayer.Projection.Equals(mapView.Projection),
+                              "The background layer's Project should define the Projection of 'mapView'.");
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithoutBackgroundMapData_WhenUnconfiguredBackgroundMapDataSet_NoChangedToMap()
+        {
+            // Given
+            using (var map = new MapControl())
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+                ProjectionInfo originalProjection = mapView.Projection;
+
+                WmtsMapData backgroundMapData = WmtsMapData.CreateUnconnectedMapData();
+
+                // When
+                map.BackgroundMapData = backgroundMapData;
+
+                // Then
+                Assert.AreEqual(0, mapView.Layers.Count);
+
+                Assert.AreEqual(originalProjection, mapView.Projection);
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithBackgroundMapData_WhenBackgroundMapDataSetToUnconfigured_ThenMapControlUpdated()
+        {
+            // Given
+            WmtsMapData originalBackGroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            originalBackGroundMapData.IsVisible = true;
+            originalBackGroundMapData.Transparency = (RoundedDouble) 0.25;
+
+            using (new UseCustomTileSourceFactoryConfig(originalBackGroundMapData))
+            using (var map = new MapControl())
+
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+                ProjectionInfo originalProjection = mapView.Projection;
+
+                map.BackgroundMapData = originalBackGroundMapData;
+
+                // Precondition
+                Assert.AreEqual(1, mapView.Layers.Count);
+                var layer = (BruTileLayer) mapView.Layers[0];
+                Assert.AreEqual(true, layer.IsVisible);
+                Assert.AreEqual(0.25, layer.Transparency);
+                Assert.AreEqual(layer.Projection, mapView.Projection);
+
+                // When
+                var newBackGroundMapData = WmtsMapData.CreateUnconnectedMapData();
+                map.BackgroundMapData = newBackGroundMapData;
+
+                // Then
+                Assert.AreEqual(0, mapView.Layers.Count);
+                Assert.IsTrue(originalProjection.Equals(mapView.Projection));
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithUnconfiguredBackgroundMapData_WhenBackgroundMapDataSet_ThenMapControlUpdated()
+        {
+            // Given
+            var newBackGroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            newBackGroundMapData.IsVisible = true;
+            newBackGroundMapData.Transparency = (RoundedDouble) 0.75;
+
+            using (new UseCustomTileSourceFactoryConfig(newBackGroundMapData))
+            using (var map = new MapControl())
+            {
+                WmtsMapData originalBackGroundMapData = WmtsMapData.CreateUnconnectedMapData();
+
+                var mapView = map.Controls.OfType<Map>().First();
+                ProjectionInfo originalProjection = mapView.Projection;
+
+                map.BackgroundMapData = originalBackGroundMapData;
+
+                // Precondition
+                Assert.AreEqual(0, mapView.Layers.Count);
+                Assert.IsTrue(originalProjection.Equals(mapView.Projection));
+
+                // When
+                map.BackgroundMapData = newBackGroundMapData;
+
+                // Then
+                Assert.AreEqual(1, mapView.Layers.Count);
+                var layer = (BruTileLayer) mapView.Layers[0];
+                Assert.AreEqual(true, layer.IsVisible);
+                Assert.AreEqual(0.75, layer.Transparency);
+                Assert.IsTrue(layer.Projection.Equals(mapView.Projection));
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithBackgroundData_WhenVisibilityPropertiesChangeAndNotified_ThenBackgroundLayerReused()
+        {
+            // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+            backgroundMapData.IsVisible = true;
+            backgroundMapData.Transparency = (RoundedDouble) 0.25;
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl
+            {
+                BackgroundMapData = backgroundMapData
+            })
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+                IMapLayer[] layersBeforeUpdate = mapView.Layers.ToArray();
+
+                // When
+                const bool newVisibilityValue = false;
+                const double newTransparencyValue = 0.75;
+                backgroundMapData.IsVisible = newVisibilityValue;
+                backgroundMapData.Transparency = (RoundedDouble) newTransparencyValue;
+                backgroundMapData.NotifyObservers();
+
+                // Then
+                CollectionAssert.AreEqual(layersBeforeUpdate, mapView.Layers);
+                var backgroundLayer = (BruTileLayer) layersBeforeUpdate[0];
+                Assert.AreEqual(newVisibilityValue, backgroundLayer.IsVisible);
+                Assert.AreEqual(newTransparencyValue, backgroundLayer.Transparency);
+            }
+        }
+
+        [Test]
+        public void GivenMapWithUnconfiguredBackgroundAndMapDataCollection_WhenBackgroundMapDataConfigured_ThenLayerIsReusedAndUpdatedFeaturesReprojected()
+        {
+            // Given
+            var newBackgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+            var startingBackgroundMapData = WmtsMapData.CreateUnconnectedMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(newBackgroundMapData))
+            using (var map = new MapControl
+            {
+                BackgroundMapData = startingBackgroundMapData
+            })
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+
+                var mapPointData = new MapPointData("Points")
+                {
+                    Features = new[]
+                    {
+                        new MapFeature(new[]
+                        {
+                            new MapGeometry(new[]
+                            {
+                                new[]
+                                {
+                                    new Point2D(1.1, 2.2)
+                                }
+                            })
+                        })
+                    }
+                };
+                var mapDataCollection = new MapDataCollection("Root collection");
+                mapDataCollection.Add(mapPointData);
+
+                map.Data = mapDataCollection;
+
+                // Precondition
+                IMapLayer[] layersBeforeUpdate = mapView.Layers.ToArray();
+                var pointFeatureLayer = (FeatureLayer) layersBeforeUpdate[0];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
+
+                // When
+                startingBackgroundMapData.Configure(newBackgroundMapData.SourceCapabilitiesUrl,
+                                                    newBackgroundMapData.SelectedCapabilityIdentifier,
+                                                    newBackgroundMapData.PreferredFormat);
+                startingBackgroundMapData.NotifyObservers();
+
+                // Then
+                Assert.AreEqual(2, mapView.Layers.Count);
+                CollectionAssert.AreEqual(layersBeforeUpdate, mapView.Layers.Skip(1));
+                Assert.IsInstanceOf<BruTileLayer>(mapView.Layers[0]);
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(523414.9114786592, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual(5313600.4932731427, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+            }
+        }
+
+        [Test]
+        public void GivenMapWithBackgroundAndMapDataCollection_WhenBackgroundMapDataConfigurationRemoved_ThenLayerIsReusedAndUpdatedFeaturesReprojected()
+        {
+            // Given
+            var startingBackgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(startingBackgroundMapData))
+            using (var map = new MapControl
+            {
+                BackgroundMapData = startingBackgroundMapData
+            })
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+
+                var mapPointData = new MapPointData("Points")
+                {
+                    Features = new[]
+                    {
+                        new MapFeature(new[]
+                        {
+                            new MapGeometry(new[]
+                            {
+                                new[]
+                                {
+                                    new Point2D(1.1, 2.2)
+                                }
+                            })
+                        })
+                    }
+                };
+                var mapDataCollection = new MapDataCollection("Root collection");
+                mapDataCollection.Add(mapPointData);
+
+                map.Data = mapDataCollection;
+
+                // Precondition
+                Assert.AreEqual(2, mapView.Layers.Count);
+                IMapLayer[] layersBeforeUpdate = mapView.Layers.ToArray();
+                Assert.IsInstanceOf<BruTileLayer>(mapView.Layers[0]);
+                var pointFeatureLayer = (FeatureLayer) layersBeforeUpdate[1];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(523414.9114786592, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual(5313600.4932731427, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+
+                // When
+                startingBackgroundMapData.RemoveConfiguration();
+                startingBackgroundMapData.NotifyObservers();
+
+                // Then
+                Assert.IsTrue(MapDataConstants.FeatureBasedMapDataCoordinateSystem.Equals(mapView.Projection));
+                Assert.AreEqual(1, mapView.Layers.Count);
+                CollectionAssert.DoesNotContain(mapView.Layers, layersBeforeUpdate[0]);
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X, 1e-6,
+                                "Minimal drift is acceptable (if it becomes a problem, we need to keep original coordinates in the layer).");
+                Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y, 1e-6,
+                                "Minimal drift is acceptable (if it becomes a problem, we need to keep original coordinates in the layer).");
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithData_WhenBackgroundMapDataSet_ThenDataLayersReprojected()
+        {
+            // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl())
+            {
+                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;
+
+                // Precondition
+                var mapView = map.Controls.OfType<Map>().First();
+                var pointFeatureLayer = (FeatureLayer) mapView.Layers[0];
+                Assert.AreEqual(1, mapView.Layers.Count);
+                Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
+
+                // When
+                map.BackgroundMapData = backgroundMapData;
+
+                // Then
+                Assert.AreEqual(2, mapView.Layers.Count);
+                Assert.IsInstanceOf<BruTileLayer>(mapView.Layers[0]);
+                pointFeatureLayer = (FeatureLayer) mapView.Layers[1];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(523414.9114786592, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual(5313600.4932731427, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithData_WhenUnconfiguredBackgroundMapDataSet_NoChangesToLayerConfiguration()
+        {
+            // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateUnconnectedMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl())
+            {
+                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;
+
+                // Precondition
+                var mapView = map.Controls.OfType<Map>().First();
+                var pointFeatureLayer = (FeatureLayer) mapView.Layers[0];
+                Assert.AreEqual(1, mapView.Layers.Count);
+                Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
+
+                // When
+                map.BackgroundMapData = backgroundMapData;
+
+                // Then
+                Assert.AreEqual(1, mapView.Layers.Count);
+                pointFeatureLayer = (FeatureLayer) mapView.Layers[0];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithDataAndBackground_WhenDifferentBackgroundMapDataSet_LayersReprojected()
+        {
+            // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateDefaultPdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl())
+            {
+                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;
+                map.BackgroundMapData = backgroundMapData;
+
+                // Precondition
+                var mapView = map.Controls.OfType<Map>().First();
+                Assert.AreEqual(2, mapView.Layers.Count);
+                Assert.IsInstanceOf<BruTileLayer>(mapView.Layers[0]);
+                var pointFeatureLayer = (FeatureLayer) mapView.Layers[1];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
+
+                // When
+                var differentBackgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+                using (new UseCustomTileSourceFactoryConfig(differentBackgroundMapData))
+                {
+                    map.BackgroundMapData = differentBackgroundMapData;
+
+                    // Then
+                    Assert.AreEqual(2, mapView.Layers.Count);
+                    Assert.IsInstanceOf<BruTileLayer>(mapView.Layers[0]);
+                    pointFeatureLayer = (FeatureLayer) mapView.Layers[1];
+                    Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                    Assert.AreEqual(523414.9114786592, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                    "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                    Assert.AreEqual(5313600.4932731427, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                    "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                }
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithDataAndBackground_WhenUnconfiguredBackgroundMapDataSet_LayersReprojected()
+        {
+            // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl())
+            {
+                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;
+                map.BackgroundMapData = backgroundMapData;
+
+                // Precondition
+                var mapView = map.Controls.OfType<Map>().First();
+                Assert.AreEqual(2, mapView.Layers.Count);
+                Assert.IsInstanceOf<BruTileLayer>(mapView.Layers[0]);
+                var pointFeatureLayer = (FeatureLayer) mapView.Layers[1];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(523414.9114786592, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual(5313600.4932731427, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+
+                // When
+                var differentBackgroundMapData = WmtsMapData.CreateUnconnectedMapData();
+                using (new UseCustomTileSourceFactoryConfig(differentBackgroundMapData))
+                {
+                    map.BackgroundMapData = differentBackgroundMapData;
+
+                    // Then
+                    Assert.AreEqual(1, mapView.Layers.Count);
+                    pointFeatureLayer = (FeatureLayer) mapView.Layers[0];
+                    Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                    Assert.AreEqual(1.1, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                    Assert.AreEqual(2.2, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
+                }
+            }
+        }
+
+        [Test]
+        public void GivenMapControlWithoutData_WhenDataSetToMapDataCollection_ThenMapControlUpdated()
+        {
+            // Given
+            using (var map = new MapControl())
+            {
+                var mapPointData = new MapPointData("Points")
+                {
+                    Features = new[]
+                    {
+                        new MapFeature(new[]
+                        {
+                            new MapGeometry(new[]
+                            {
+                                new[]
+                                {
+                                    new Point2D(1.1, 2.2)
+                                }
+                            })
+                        })
+                    }
+                };
                 var mapLineData = new MapLineData("Lines");
                 var mapPolygonData = new MapPolygonData("Polygons");
                 var mapDataCollection = new MapDataCollection("Root collection");
@@ -107,15 +614,81 @@
                 map.Data = mapDataCollection;
 
                 // Then
+                var mapView = map.Controls.OfType<Map>().First();
                 Assert.AreEqual(3, mapView.Layers.Count);
                 var featureLayers = mapView.Layers.Cast<FeatureLayer>().ToList();
                 Assert.AreEqual("Points", featureLayers[0].Name);
+                Assert.IsTrue(mapView.Projection.Equals(featureLayers[0].Projection));
+                Assert.AreEqual(1.1, featureLayers[0].FeatureSet.Features[0].BasicGeometry.Coordinates[0].X);
+                Assert.AreEqual(2.2, featureLayers[0].FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y);
                 Assert.AreEqual("Lines", featureLayers[1].Name);
+                Assert.IsTrue(mapView.Projection.Equals(featureLayers[1].Projection));
                 Assert.AreEqual("Polygons", featureLayers[2].Name);
+                Assert.IsTrue(mapView.Projection.Equals(featureLayers[2].Projection));
             }
         }
 
         [Test]
+        public void GivenMapControlWithBackground_WhenDataSetToMapDataCollection_FeatureLayersAreReprojected()
+        {
+            // Given
+            WmtsMapData backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl
+            {
+                BackgroundMapData = backgroundMapData
+            })
+            {
+                var mapPointData = new MapPointData("Points")
+                {
+                    Features = new[]
+                    {
+                        new MapFeature(new[]
+                        {
+                            new MapGeometry(new[]
+                            {
+                                new[]
+                                {
+                                    new Point2D(1.1, 2.2)
+                                }
+                            })
+                        })
+                    }
+                };
+                var mapLineData = new MapLineData("Lines");
+                var mapPolygonData = new MapPolygonData("Polygons");
+                var mapDataCollection = new MapDataCollection("Root collection");
+                var nestedMapDataCollection1 = new MapDataCollection("Nested collection 1");
+                var nestedMapDataCollection2 = new MapDataCollection("Nested collection 2");
+
+                mapDataCollection.Add(mapPointData);
+                mapDataCollection.Add(nestedMapDataCollection1);
+                nestedMapDataCollection1.Add(mapLineData);
+                nestedMapDataCollection1.Add(nestedMapDataCollection2);
+                nestedMapDataCollection2.Add(mapPolygonData);
+
+                // When
+                map.Data = mapDataCollection;
+
+                // Then
+                var mapView = map.Controls.OfType<Map>().First();
+                Assert.AreEqual(4, mapView.Layers.Count);
+                var featureLayers = mapView.Layers.Skip(1).Cast<FeatureLayer>().ToList();
+                Assert.AreEqual("Points", featureLayers[0].Name);
+                Assert.IsTrue(mapView.Projection.Equals(featureLayers[0].Projection));
+                Assert.AreEqual(523414.9114786592, featureLayers[0].FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual(5313600.4932731427, featureLayers[0].FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual("Lines", featureLayers[1].Name);
+                Assert.IsTrue(mapView.Projection.Equals(featureLayers[1].Projection));
+                Assert.AreEqual("Polygons", featureLayers[2].Name);
+                Assert.IsTrue(mapView.Projection.Equals(featureLayers[2].Projection));
+            }
+        }
+
+        [Test]
         public void GivenMapControlWithData_WhenDataSetToOtherMapDataCollection_ThenMapControlUpdated()
         {
             // Given
@@ -171,7 +744,7 @@
 
                 map.Data = mapDataCollection;
 
-                var layersBeforeUpdate = mapView.Layers.ToList();
+                IMapLayer[] layersBeforeUpdate = mapView.Layers.ToArray();
 
                 // When
                 mapLineData.Features = new MapFeature[0];
@@ -306,6 +879,76 @@
         }
 
         [Test]
+        public void GivenMapWithBackgroundAndMapDataCollection_WhenMapDataCollectionFeaturesUpdates_ThenLayerIsReusedAndUpdatedFeaturesReprojected()
+        {
+            // Given
+            var backgroundMapData = WmtsMapData.CreateAlternativePdokMapData();
+
+            using (new UseCustomTileSourceFactoryConfig(backgroundMapData))
+            using (var map = new MapControl
+            {
+                BackgroundMapData = backgroundMapData
+            })
+            {
+                var mapView = map.Controls.OfType<Map>().First();
+
+                var mapPointData = new MapPointData("Points")
+                {
+                    Features = new[]
+                    {
+                        new MapFeature(new[]
+                        {
+                            new MapGeometry(new[]
+                            {
+                                new[]
+                                {
+                                    new Point2D(1.1, 2.2)
+                                }
+                            })
+                        })
+                    }
+                };
+                var mapDataCollection = new MapDataCollection("Root collection");
+                mapDataCollection.Add(mapPointData);
+
+                map.Data = mapDataCollection;
+
+                // Precondition
+                IMapLayer[] layersBeforeUpdate = mapView.Layers.ToArray();
+                var pointFeatureLayer = (FeatureLayer) layersBeforeUpdate[1];
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(523414.9114786592, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+                Assert.AreEqual(5313600.4932731427, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000).");
+
+                // When
+                mapPointData.Features = new[]
+                {
+                    new MapFeature(new[]
+                    {
+                        new MapGeometry(new[]
+                        {
+                            new[]
+                            {
+                                new Point2D(12345.6789, 9876.54321)
+                            }
+                        })
+                    })
+                };
+                mapPointData.NotifyObservers();
+
+                // Then
+                CollectionAssert.AreEqual(layersBeforeUpdate, mapView.Layers);
+                Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection));
+                Assert.AreEqual(535419.87415209203, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].X,
+                                "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=12345.6789000&y=9876.5432100).");
+                Assert.AreEqual(5323846.0863087801, pointFeatureLayer.FeatureSet.Features[0].BasicGeometry.Coordinates[0].Y,
+                                "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=12345.6789000&y=9876.5432100).");
+            }
+        }
+
+        [Test]
         [Apartment(ApartmentState.STA)]
         public void ZoomToAllVisibleLayers_MapInFormWithEmptyDataSet_ViewInvalidatedLayersSame()
         {
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -r4fa89ba12aaa3185bb590edd7a3b645227b967ca -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 4fa89ba12aaa3185bb590edd7a3b645227b967ca)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -87,6 +87,7 @@
     <Compile Include="Converter\MapLineDataConverterTest.cs" />
     <Compile Include="Converter\MapPolygonDataConverterTest.cs" />
     <Compile Include="Converter\FeatureBasedMapDataConverterTest.cs" />
+    <Compile Include="Layer\BruTile\Configurations\TileSourceFactoryTest.cs" />
     <Compile Include="Layer\FeatureBasedMapDataLayerFactoryTest.cs" />
     <Compile Include="Converter\MapPointDataConverterTest.cs" />
     <Compile Include="Layer\MapLineDataLayerTest.cs" />
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/Configurations/TileSourceFactoryTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/Configurations/TileSourceFactoryTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/Configurations/TileSourceFactoryTest.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,53 @@
+// 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 Core.Components.DotSpatial.Layer.BruTile.Configurations;
+using NUnit.Framework;
+
+namespace Core.Components.DotSpatial.Test.Layer.BruTile.Configurations
+{
+    [TestFixture]
+    public class TileSourceFactoryTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var factory = new TileSourceFactory();
+
+            // Assert
+            Assert.IsInstanceOf<ITileSourceFactory>(factory);
+        }
+
+        [Test]
+        public void Instance_InstanceSetToNull_RetrunTileSourceFactory()
+        {
+            // Setup
+            TileSourceFactory.Instance = null;
+
+            // Call
+            ITileSourceFactory factory = TileSourceFactory.Instance;
+
+            // Assert
+            Assert.IsInstanceOf<TileSourceFactory>(factory);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/Core.Components.DotSpatial.TestUtil.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/Core.Components.DotSpatial.TestUtil.csproj	(.../Core.Components.DotSpatial.TestUtil.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/Core.Components.DotSpatial.TestUtil.csproj	(.../Core.Components.DotSpatial.TestUtil.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -38,21 +38,38 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BruTile, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\BruTile.0.19.0\lib\net40\BruTile.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="TestFeatureBasedMapData.cs" />
+    <Compile Include="TestTileSourceFactory.cs" />
+    <Compile Include="TestWmtsTileSource.cs" />
+    <Compile Include="UseCustomTileSourceFactoryConfig.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Base\Core.Common.Base.csproj">
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj">
+      <Project>{aa47e858-a2a7-470e-8b2d-c76ae8ed9ccd}</Project>
+      <Name>Core.Components.DotSpatial</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Components.Gis\Core.Components.Gis.csproj">
       <Project>{318BA582-88C9-4816-A54A-A7E431461DE3}</Project>
       <Name>Core.Components.Gis</Name>
@@ -62,7 +79,18 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
+    <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\stubTile.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/Resources.Designer.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/Resources.Designer.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Core.Components.DotSpatial.TestUtil.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Core.Components.DotSpatial.TestUtil.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap stubTile {
+            get {
+                object obj = ResourceManager.GetObject("stubTile", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/Resources.resx
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/Resources.resx	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/Resources.resx	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,124 @@
+<?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>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="stubTile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\stubTile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/Resources/stubTile.png
===================================================================
diff -u
Binary files differ
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/TestTileSourceFactory.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/TestTileSourceFactory.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/TestTileSourceFactory.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using BruTile;
+using BruTile.Wmts;
+using Core.Components.DotSpatial.Layer.BruTile.Configurations;
+using Core.Components.Gis.Data;
+
+namespace Core.Components.DotSpatial.TestUtil
+{
+    public class TestTileSourceFactory : ITileSourceFactory
+    {
+        private readonly TestWmtsTileSource wmtsTileSource;
+
+        public TestTileSourceFactory(WmtsMapData backgroundMapData)
+        {
+            if (backgroundMapData.IsConfigured)
+            {
+                wmtsTileSource = new TestWmtsTileSource(backgroundMapData);
+            }
+        }
+
+        public IEnumerable<ITileSource> GetWmtsTileSources(string capabilitiesUrl)
+        {
+            if (wmtsTileSource != null)
+            {
+                yield return wmtsTileSource;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/TestWmtsTileSource.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/TestWmtsTileSource.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/TestWmtsTileSource.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,100 @@
+// 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.Drawing.Imaging;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using BruTile;
+using BruTile.Web;
+using BruTile.Wmts;
+using Core.Components.DotSpatial.TestUtil.Properties;
+using Core.Components.Gis.Data;
+
+namespace Core.Components.DotSpatial.TestUtil
+{
+    /// <summary>
+    /// Defines a <see cref="ITileSource"/> suitable to most unit test cases related to
+    /// dealing with <see cref="WmtsMapData"/>.
+    /// </summary>
+    public class TestWmtsTileSource : HttpTileSource
+    {
+        private static byte[] pngTileDataStub;
+
+        /// <summary>
+        /// Create a new instance of <see cref="TestWmtsTileSource"/> suitable to work for
+        /// a given <see cref="WmtsMapData"/>.
+        /// </summary>
+        /// <param name="backgroundMapData">The map data to work with.</param>
+        public TestWmtsTileSource(WmtsMapData backgroundMapData)
+            : base(CreateWmtsTileSchema(backgroundMapData), null, "Stub schema", null, GetStubTile)
+        {
+            var imageFormatExtension = backgroundMapData.PreferredFormat.Split('/')[1];
+            if (imageFormatExtension != "png")
+            {
+                throw new NotImplementedException($"Please extend this class to support the '*.{imageFormatExtension}' extension.");
+            }
+        }
+
+        private static WmtsTileSchema CreateWmtsTileSchema(WmtsMapData backgroundMapData)
+        {
+            WmtsTileSchema schema = ConstructWmtsTileSchema();
+            schema.Title = backgroundMapData.Name;
+            schema.Format = backgroundMapData.PreferredFormat;
+            
+            schema.Resolutions["1"] = new Resolution("1", 1);
+
+            var regex1 = new Regex(@"(?<Layer>.+)\((?<TileMatrixSet>.+)\)");
+            Match match = regex1.Match(backgroundMapData.SelectedCapabilityIdentifier);
+            schema.Layer = match.Groups["Layer"].Value;
+            schema.TileMatrixSet = match.Groups["TileMatrixSet"].Value;
+
+            var regex2 = new Regex(@"EPSG:(?<SrsNumber>\d+)");
+            Match potentialMatch = regex2.Match(schema.TileMatrixSet);
+            schema.Srs = potentialMatch.Success ?
+                             $"EPSG:{potentialMatch.Groups["SrsNumber"]}" :
+                             "EPSG:3857";
+
+            return schema;
+        }
+
+        private static WmtsTileSchema ConstructWmtsTileSchema()
+        {
+            return (WmtsTileSchema) typeof(WmtsTileSchema)
+                .GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, Type.EmptyTypes, null)
+                .Invoke(null);
+        }
+
+        private static byte[] GetStubTile(Uri arg)
+        {
+            if (pngTileDataStub == null)
+            {
+                using (var stream = new MemoryStream())
+                {
+                    Resources.stubTile.Save(stream, ImageFormat.Png);
+                    pngTileDataStub = stream.ToArray();
+                }
+            }
+            return pngTileDataStub;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/UseCustomTileSourceFactoryConfig.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/UseCustomTileSourceFactoryConfig.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/UseCustomTileSourceFactoryConfig.cs	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,60 @@
+// 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 Core.Components.DotSpatial.Layer.BruTile.Configurations;
+using Core.Components.Gis.Data;
+
+namespace Core.Components.DotSpatial.TestUtil
+{
+    /// <summary>
+    /// Configures <see cref="TileSourceFactory.Instance"/> to temporarily use a different
+    /// instance.
+    /// </summary>
+    public sealed class UseCustomTileSourceFactoryConfig : IDisposable
+    {
+        private readonly ITileSourceFactory originalFactory;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="UseCustomTileSourceFactoryConfig"/>.
+        /// </summary>
+        /// <param name="factory">The temporary factory to be used.</param>
+        public UseCustomTileSourceFactoryConfig(ITileSourceFactory factory)
+        {
+            originalFactory = TileSourceFactory.Instance;
+            TileSourceFactory.Instance = factory;
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="UseCustomTileSourceFactoryConfig"/> that
+        /// initializes test stubs to work for a <see cref="WmtsMapData"/> instance.
+        /// </summary>
+        /// <param name="backgroundMapData">The map data to work with.</param>
+        public UseCustomTileSourceFactoryConfig(WmtsMapData backgroundMapData) : this(new TestTileSourceFactory(backgroundMapData))
+        {
+        }
+
+        public void Dispose()
+        {
+            TileSourceFactory.Instance = originalFactory;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/app.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/app.config	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/app.config	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/packages.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.TestUtil/packages.config	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.TestUtil/packages.config	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BruTile" version="0.19.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -65,6 +65,7 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Components/test/Core.Components.Gis.Test/Data/WmtsMapDataTest.cs
===================================================================
diff -u -r804df9b58213c186181b3ba38e487747c5860e4c -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Core/Components/test/Core.Components.Gis.Test/Data/WmtsMapDataTest.cs	(.../WmtsMapDataTest.cs)	(revision 804df9b58213c186181b3ba38e487747c5860e4c)
+++ Core/Components/test/Core.Components.Gis.Test/Data/WmtsMapDataTest.cs	(.../WmtsMapDataTest.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -162,14 +162,30 @@
             // Assert
             Assert.AreEqual("PDOK achtergrondkaart", mapData.Name);
             Assert.AreEqual("https://geodata.nationaalgeoregister.nl/wmts/top10nlv2?VERSION=1.0.0&request=GetCapabilities", mapData.SourceCapabilitiesUrl);
-            Assert.AreEqual("brtachtergrondkaart", mapData.SelectedCapabilityIdentifier);
+            Assert.AreEqual("brtachtergrondkaart(EPSG:28992)", mapData.SelectedCapabilityIdentifier);
             Assert.AreEqual("image/png", mapData.PreferredFormat);
             Assert.AreEqual(0.0, mapData.Transparency.Value);
             Assert.IsTrue(mapData.IsConfigured);
             Assert.IsTrue(mapData.IsVisible);
         }
 
         [Test]
+        public void CreateAlternativePdokMapData_ReturnsInitializedWmtsMapData()
+        {
+            // Call
+            WmtsMapData mapData = WmtsMapData.CreateAlternativePdokMapData();
+
+            // Assert
+            Assert.AreEqual("PDOK achtergrondkaart", mapData.Name);
+            Assert.AreEqual("https://geodata.nationaalgeoregister.nl/wmts/top10nlv2?VERSION=1.0.0&request=GetCapabilities", mapData.SourceCapabilitiesUrl);
+            Assert.AreEqual("brtachtergrondkaart(EPSG:25831:RWS)", mapData.SelectedCapabilityIdentifier);
+            Assert.AreEqual("image/png", mapData.PreferredFormat);
+            Assert.AreEqual(0.0, mapData.Transparency.Value);
+            Assert.IsTrue(mapData.IsConfigured);
+            Assert.IsTrue(mapData.IsVisible);
+        }
+
+        [Test]
         public void CreateUnconnectedMapData_ReturnsUnconfiguredWmtsMapData()
         {
             // Call
Index: Core/Components/test/Core.Components.Gis.Test/app.config
===================================================================
diff -u
--- Core/Components/test/Core.Components.Gis.Test/app.config	(revision 0)
+++ Core/Components/test/Core.Components.Gis.Test/app.config	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r4c580b17f584bdfcaae96992b11f90025647ca20 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 4c580b17f584bdfcaae96992b11f90025647ca20)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -21,6 +21,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Mime;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Components.Gis.Data;
@@ -147,7 +148,7 @@
 
                     SetMapDataFeatures();
 
-                    mapControl.Data = mapDataCollection;
+                    Map.Data = mapDataCollection;
                 }
             }
         }
Index: Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/DikeProfileDataReader.cs
===================================================================
diff -u -ra633912c0e5c538b2a0849eea7c1ab4957aaadeb -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/DikeProfileDataReader.cs	(.../DikeProfileDataReader.cs)	(revision a633912c0e5c538b2a0849eea7c1ab4957aaadeb)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/DikeProfileDataReader.cs	(.../DikeProfileDataReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -98,7 +98,7 @@
         /// <exception cref="CriticalFileValidationException">Thrown when the read id is not an accepted id.</exception>
         public DikeProfileData ReadDikeProfileData(string filePath)
         {
-            FileUtils.ValidateFilePath(filePath);
+            IOUtils.ValidateFilePath(filePath);
             if (!File.Exists(filePath))
             {
                 string message = new FileReaderErrorMessageBuilder(filePath)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/ProfileLocationReader.cs
===================================================================
diff -u -re60dbf2fd41434270cad4efba20446e19ede0d2e -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/ProfileLocationReader.cs	(.../ProfileLocationReader.cs)	(revision e60dbf2fd41434270cad4efba20446e19ede0d2e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/DikeProfiles/ProfileLocationReader.cs	(.../ProfileLocationReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -56,7 +56,7 @@
         /// </list></exception>
         public ProfileLocationReader(string shapeFilePath)
         {
-            FileUtils.ValidateFilePath(shapeFilePath);
+            IOUtils.ValidateFilePath(shapeFilePath);
             if (!File.Exists(shapeFilePath))
             {
                 string message = new FileReaderErrorMessageBuilder(shapeFilePath)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs
===================================================================
diff -u -r8aed37b83aa4d0b9a0932551f8727ceca83e5cc4 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs	(.../FailureMechanismSectionReader.cs)	(revision 8aed37b83aa4d0b9a0932551f8727ceca83e5cc4)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs	(.../FailureMechanismSectionReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -59,7 +59,7 @@
         /// </exception>
         public FailureMechanismSectionReader(string shapeFilePath)
         {
-            FileUtils.ValidateFilePath(shapeFilePath);
+            IOUtils.ValidateFilePath(shapeFilePath);
             filePath = shapeFilePath;
             polylineShapeFileReader = new PolylineShapeFileReader(filePath);
         }
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicDatabaseHelper.cs
===================================================================
diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicDatabaseHelper.cs	(.../HydraulicDatabaseHelper.cs)	(revision b2b9fdf365e70928a05c57966eeed30d9050e528)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicDatabaseHelper.cs	(.../HydraulicDatabaseHelper.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -50,7 +50,7 @@
         {
             try
             {
-                FileUtils.ValidateFilePath(filePath);
+                IOUtils.ValidateFilePath(filePath);
             }
             catch (ArgumentException e)
             {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Hydraulics/HydraulicBoundaryLocationsExporter.cs
===================================================================
diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/Hydraulics/HydraulicBoundaryLocationsExporter.cs	(.../HydraulicBoundaryLocationsExporter.cs)	(revision b2b9fdf365e70928a05c57966eeed30d9050e528)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Hydraulics/HydraulicBoundaryLocationsExporter.cs	(.../HydraulicBoundaryLocationsExporter.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -70,7 +70,7 @@
                 throw new ArgumentNullException(nameof(waveHeightName));
             }
 
-            FileUtils.ValidateFilePath(filePath);
+            IOUtils.ValidateFilePath(filePath);
 
             this.hydraulicBoundaryLocations = hydraulicBoundaryLocations;
             this.filePath = filePath;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineExporter.cs
===================================================================
diff -u -r4e578730273a943bb02a2861c694a2707c8ef852 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineExporter.cs	(.../ReferenceLineExporter.cs)	(revision 4e578730273a943bb02a2861c694a2707c8ef852)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineExporter.cs	(.../ReferenceLineExporter.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -49,7 +49,7 @@
         /// <exception cref="ArgumentException">Thrown when <paramref name="filePath"/> is invalid.</exception>
         public ReferenceLineExporter(ReferenceLine referenceLine, string id, string filePath)
         {
-            FileUtils.ValidateFilePath(filePath);
+            IOUtils.ValidateFilePath(filePath);
 
             this.referenceLine = referenceLine;
             this.filePath = filePath;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineReader.cs
===================================================================
diff -u -r065af7e201b59ec19a17c42e9d772f5e86b31338 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineReader.cs	(.../ReferenceLineReader.cs)	(revision 065af7e201b59ec19a17c42e9d772f5e86b31338)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineReader.cs	(.../ReferenceLineReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -57,7 +57,7 @@
         /// </exception>
         public ReferenceLine ReadReferenceLine(string shapeFilePath)
         {
-            FileUtils.ValidateFilePath(shapeFilePath);
+            IOUtils.ValidateFilePath(shapeFilePath);
             if (!File.Exists(shapeFilePath))
             {
                 string message = new FileReaderErrorMessageBuilder(shapeFilePath)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs
===================================================================
diff -u -r0df7cded06f5afbac08b97e025242ba55c90ec57 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs	(.../ReferenceLinesMetaReader.cs)	(revision 0df7cded06f5afbac08b97e025242ba55c90ec57)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs	(.../ReferenceLinesMetaReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -100,7 +100,7 @@
         /// <exception cref="CriticalFileReadException">Thrown when <paramref name="shapeFilePath"/> does not exist.</exception>
         private static void ValidateFilePath(string shapeFilePath)
         {
-            FileUtils.ValidateFilePath(shapeFilePath);
+            IOUtils.ValidateFilePath(shapeFilePath);
             if (!File.Exists(shapeFilePath))
             {
                 string message = new FileReaderErrorMessageBuilder(shapeFilePath)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocationReader.cs
===================================================================
diff -u -re5646456f4fb82606d19442702a09fff38786e8a -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocationReader.cs	(.../StructureLocationReader.cs)	(revision e5646456f4fb82606d19442702a09fff38786e8a)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructureLocationReader.cs	(.../StructureLocationReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -55,7 +55,7 @@
         /// </list></exception>
         public StructureLocationReader(string shapeFilePath)
         {
-            FileUtils.ValidateFilePath(shapeFilePath);
+            IOUtils.ValidateFilePath(shapeFilePath);
             if (!File.Exists(shapeFilePath))
             {
                 string message = new FileReaderErrorMessageBuilder(shapeFilePath)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresCharacteristicsCsvReader.cs
===================================================================
diff -u -r4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresCharacteristicsCsvReader.cs	(.../StructuresCharacteristicsCsvReader.cs)	(revision 4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresCharacteristicsCsvReader.cs	(.../StructuresCharacteristicsCsvReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -66,7 +66,7 @@
         /// <exception cref="ArgumentException">Thrown when <paramref name="path"/> is invalid.</exception>
         public StructuresCharacteristicsCsvReader(string path)
         {
-            FileUtils.ValidateFilePath(path);
+            IOUtils.ValidateFilePath(path);
 
             filePath = path;
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs
===================================================================
diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs	(.../HydraRingSettingsDatabaseHelper.cs)	(revision d73c509c93f18a87da76086c871eca2a2c903e12)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs	(.../HydraRingSettingsDatabaseHelper.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -51,7 +51,7 @@
         /// </exception>
         public static void AssignSettingsFromDatabase(HydraRingCalculationInput calculationInput, string hydraulicBoundaryDatabaseFilePath)
         {
-            FileUtils.ValidateFilePath(hydraulicBoundaryDatabaseFilePath);
+            IOUtils.ValidateFilePath(hydraulicBoundaryDatabaseFilePath);
 
             var locationId = calculationInput.HydraulicBoundaryLocationId;
             var settingsDatabaseFileName = HydraulicDatabaseHelper.GetHydraulicBoundarySettingsDatabase(hydraulicBoundaryDatabaseFilePath);
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsExporter.cs
===================================================================
diff -u -re261f847e5058d2f9612f091421a6a463cb17edf -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsExporter.cs	(.../DuneLocationsExporter.cs)	(revision e261f847e5058d2f9612f091421a6a463cb17edf)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.IO/DuneLocationsExporter.cs	(.../DuneLocationsExporter.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -54,7 +54,7 @@
                 throw new ArgumentNullException(nameof(duneLocations));
             }
 
-            FileUtils.ValidateFilePath(filePath);
+            IOUtils.ValidateFilePath(filePath);
 
             this.duneLocations = duneLocations;
             this.filePath = filePath;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs
===================================================================
diff -u -r6aaa17dbb25d6299115d68b221312aa1482d97a9 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs	(.../StochasticSoilModelCollection.cs)	(revision 6aaa17dbb25d6299115d68b221312aa1482d97a9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs	(.../StochasticSoilModelCollection.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -121,7 +121,7 @@
             {
                 throw new ArgumentNullException(nameof(filePath));
             }
-            if (!FileUtils.IsValidFilePath(filePath))
+            if (!IOUtils.IsValidFilePath(filePath))
             {
                 throw new ArgumentException($"'{filePath}' is not a valid filepath.", nameof(filePath));
             }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r5a453b9ac4ccaa5fc6f767036f0bcbf87ad05ff4 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 5a453b9ac4ccaa5fc6f767036f0bcbf87ad05ff4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -131,6 +131,7 @@
                     calculationGroupObserver.Observable = null;
                     calculationObserver.Observable = null;
 
+                    Map.BackgroundMapData = null;
                     Map.Data = null;
                 }
                 else
@@ -146,6 +147,7 @@
 
                     SetMapDataFeatures();
 
+                    Map.BackgroundMapData = data.Parent.BackgroundMapData;
                     Map.Data = mapDataCollection;
                 }
             }
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs
===================================================================
diff -u -r4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs	(.../CharacteristicPointsCsvReader.cs)	(revision 4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs	(.../CharacteristicPointsCsvReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -72,7 +72,7 @@
         /// <exception cref="ArgumentException">Thrown when <paramref name="path"/> is invalid.</exception>
         public CharacteristicPointsCsvReader(string path)
         {
-            FileUtils.ValidateFilePath(path);
+            IOUtils.ValidateFilePath(path);
 
             filePath = path;
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs
===================================================================
diff -u -r4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs	(.../PipingSurfaceLinesCsvReader.cs)	(revision 4fda2f3f6be17051ed305f0ea2d1b15fa87fc55f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs	(.../PipingSurfaceLinesCsvReader.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -76,7 +76,7 @@
         /// <exception cref="ArgumentException"><paramref name="path"/> is invalid.</exception>
         public PipingSurfaceLinesCsvReader(string path)
         {
-            FileUtils.ValidateFilePath(path);
+            IOUtils.ValidateFilePath(path);
 
             filePath = path;
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r6aaa17dbb25d6299115d68b221312aa1482d97a9 -r16bd8076863c03907abeee60b16704aba1bdb1a0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 6aaa17dbb25d6299115d68b221312aa1482d97a9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 16bd8076863c03907abeee60b16704aba1bdb1a0)
@@ -23,6 +23,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Components.DotSpatial.Forms;
 using Core.Components.Gis.Data;
@@ -154,12 +155,17 @@
         public void Data_EmptyPipingFailureMechanismContext_NoMapDataSet()
         {
             // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            var backgroundMapData = WmtsMapData.CreateUnconnectedMapData();
+            assessmentSection.Stub(s => s.BackgroundMapData).Return(backgroundMapData);
+            assessmentSection.Stub(s => s.Id).Return("A");
+            assessmentSection.Stub(s => s.Attach(Arg<IObserver>.Is.NotNull));
+            assessmentSection.Stub(s => s.Detach(Arg<IObserver>.Is.NotNull));
+            mocks.ReplayAll();
+
             using (var view = new PipingFailureMechanismView())
             {
-                var mockRepository = new MockRepository();
-                var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-                mockRepository.ReplayAll();
-
                 var failureMechanismContext = new PipingFailureMechanismContext(
                     new PipingFailureMechanism(), assessmentSection);
 
@@ -169,12 +175,72 @@
                 // Assert
                 Assert.AreSame(failureMechanismContext, view.Data);
                 AssertEmptyMapData(view.Map.Data);
+                Assert.AreSame(backgroundMapData, view.Map.BackgroundMapData);
+            }
+            mocks.VerifyAll();
+        }
 
-                mockRepository.VerifyAll();
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Data_AssessmentSectionWithBackgroundMapData_BackgroundMapDataSet(bool isConfigured)
+        {
+            WmtsMapData backgroundMapData = isConfigured ? WmtsMapData.CreateAlternativePdokMapData() : WmtsMapData.CreateUnconnectedMapData();
+
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.Stub(s => s.BackgroundMapData).Return(backgroundMapData);
+            assessmentSection.Stub(s => s.Id).Return("A");
+            assessmentSection.Stub(s => s.Attach(Arg<IObserver>.Is.NotNull));
+            assessmentSection.Stub(s => s.Detach(Arg<IObserver>.Is.NotNull));
+            mocks.ReplayAll();
+
+            // Setup
+            using (var view = new PipingFailureMechanismView())
+            {
+                var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection);
+
+                // Call
+                view.Data = failureMechanismContext;
+
+                // Assert
+                Assert.AreSame(backgroundMapData, view.Map.BackgroundMapData);
             }
+            mocks.VerifyAll();
         }
 
         [Test]
+        public void Data_SetToNull_ClearMapDataProperties()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.Stub(s => s.BackgroundMapData).Return(WmtsMapData.CreateUnconnectedMapData());
+            assessmentSection.Stub(s => s.Id).Return("A");
+            assessmentSection.Stub(s => s.Attach(Arg<IObserver>.Is.NotNull));
+            assessmentSection.Stub(s => s.Detach(Arg<IObserver>.Is.NotNull));
+            mocks.ReplayAll();
+
+            using (var view = new PipingFailureMechanismView())
+            {
+                view.Data = new PipingFailureMechanismContext(
+                    new PipingFailureMechanism(), assessmentSection);
+
+                // Precondition
+                Assert.IsNotNull(view.Map.Data);
+                Assert.IsNotNull(view.Map.BackgroundMapData);
+
+                // Call
+                view.Data = null;
+
+                // Assert
+                Assert.IsNull(view.Map.Data);
+                Assert.IsNull(view.Map.BackgroundMapData);
+            }
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void Data_PipingFailureMechanismContext_DataUpdatedToCollectionOfFilledMapData()
         {
             // Setup