Index: Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/FeatureBasedMapDataConverter.cs	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -0,0 +1,188 @@
+// 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.Drawing;
+using System.Globalization;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
+using DotSpatial.Controls;
+using DotSpatial.Data;
+using DotSpatial.Symbology;
+using DotSpatial.Topology;
+
+namespace Core.Components.DotSpatial.Converter
+{
+    /// <summary>
+    /// Abstract base class for transforming <see cref="MapData"/> into <see cref="IMapFeatureLayer"/>.
+    /// </summary>
+    /// <typeparam name="TMapData">The type of map data to convert.</typeparam>
+    /// <typeparam name="TMapFeatureLayer">The type of map feature layer to set the converted data to.</typeparam>
+    public abstract class FeatureBasedMapDataConverter<TMapData, TMapFeatureLayer> : IFeatureBasedMapDataConverter
+        where TMapData : MapData
+        where TMapFeatureLayer : IMapFeatureLayer
+    {
+        /// <remarks>
+        /// Needed because DotSpatial can't handle special characters.
+        /// Therefore we create an id as column name for the data table in the featureSet.
+        /// We need this lookup to match the selected attribute from the MapData with the created id.
+        /// </remarks>
+        private readonly Dictionary<string, string> columnLookup;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="FeatureBasedMapDataConverter{TMapData,TMapFeatureLayer}"/>
+        /// </summary>
+        protected FeatureBasedMapDataConverter()
+        {
+            columnLookup = new Dictionary<string, string>();
+        }
+
+        public bool CanConvertMapData(MapData data)
+        {
+            return data is TMapData;
+        }
+
+        public IMapFeatureLayer Convert(MapData data)
+        {
+            ValidateParameters(data);
+
+            return Convert((TMapData) data);
+        }
+
+        public void ConvertLayerFeatures(MapData data, IMapFeatureLayer layer)
+        {
+            ValidateParameters(data);
+
+            ConvertLayerFeatures((TMapData) data, (TMapFeatureLayer) layer);
+        }
+
+        public void ConvertLayerProperties(MapData data, IMapFeatureLayer layer)
+        {
+            ValidateParameters(data);
+
+            ConvertLayerProperties((TMapData) data, (TMapFeatureLayer) layer);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="IMapFeatureLayer"/> based on the <paramref name="data"/> that was given.
+        /// </summary>
+        /// <param name="data">The data to transform into a <see cref="IMapFeatureLayer"/>.</param>
+        /// <returns>A new <see cref="IMapFeatureLayer"/>.</returns>
+        protected abstract IMapFeatureLayer Convert(TMapData data);
+
+        /// <summary>
+        /// Converts all feature related data from <paramref name="data"/> to <paramref name="layer"/>.
+        /// Any features already part of <paramref name="layer"/> are cleared.
+        /// </summary>
+        /// <param name="data">The data to convert the feature related data from.</param>
+        /// <param name="layer">The layer to convert the feature related data to.</param>
+        protected abstract void ConvertLayerFeatures(TMapData data, TMapFeatureLayer layer);
+
+        /// <summary>
+        /// Converts all general properties (like <see cref="MapData.Name"/> and <see cref="MapData.IsVisible"/>) 
+        /// from <paramref name="data"/> to <paramref name="layer"/>.
+        /// </summary>
+        /// <param name="data">The data to convert the general properties from.</param>
+        /// <param name="layer">The layer to convert the general properties to.</param>
+        protected abstract void ConvertLayerProperties(TMapData data, TMapFeatureLayer layer);
+
+        /// <summary>
+        /// Converts an <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> to an
+        /// <see cref="IEnumerable{T}"/> of <see cref="Coordinate"/>.
+        /// </summary>
+        /// <param name="points">The <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> to convert.</param>
+        /// <returns>The converted <see cref="IEnumerable{T}"/> of <see cref="Coordinate"/>.</returns>
+        protected static IEnumerable<Coordinate> ConvertPoint2DElementsToCoordinates(IEnumerable<Point2D> points)
+        {
+            return points.Select(point => new Coordinate(point.X, point.Y));
+        }
+
+        /// <summary>
+        /// Adds <see cref="MapFeature.MetaData"/> as attributes to the given <see cref="Feature"/> and to the <see cref="IFeatureSet.DataTable"/>.
+        /// </summary>
+        /// <param name="ringtoetsMapFeature">The <see cref="MapFeature"/> to get the meta data from.</param>
+        /// <param name="featureSet">The <see cref="IFeatureSet"/> to add the attributes to.</param>
+        /// <param name="feature">The <see cref="Feature"/> to add the attributes to.</param>
+        protected void AddMetaDataAsAttributes(MapFeature ringtoetsMapFeature, IFeatureSet featureSet, Feature feature)
+        {
+            var columnKey = 1;
+            foreach (var attribute in ringtoetsMapFeature.MetaData)
+            {
+                string attributeName = attribute.Key;
+
+                var columnName = columnKey.ToString();
+                if (!columnLookup.ContainsKey(attributeName))
+                {
+                    columnLookup.Add(attributeName, columnName);
+
+                    if (!featureSet.DataTable.Columns.Contains(columnName))
+                    {
+                        featureSet.DataTable.Columns.Add(columnName, typeof(string));
+                    }
+                }
+
+                feature.DataRow[columnName] = attribute.Value;
+                columnKey++;
+            }
+        }
+
+        /// <summary>
+        /// Gets a new <see cref="MapLabelLayer"/>.
+        /// </summary>
+        /// <param name="featureSet">The <see cref="IFeatureSet"/> to add the <see cref="MapLabelLayer"/> to.</param>
+        /// <param name="showLabels">Indicator whether to show the labels or not.</param>
+        /// <param name="labelToShow">The key of the attribute to show the labels for.</param>
+        /// <returns>A new <see cref="MapLabelLayer"/>.</returns>
+        protected MapLabelLayer GetLabelLayer(IFeatureSet featureSet, bool showLabels, string labelToShow)
+        {
+            var labelLayer = new MapLabelLayer();
+
+            if (featureSet.DataTable.Columns.Count > 0 && showLabels)
+            {
+                labelLayer.Symbology.Categories[0].Symbolizer = new LabelSymbolizer
+                {
+                    Orientation = ContentAlignment.MiddleRight,
+                    OffsetX = 5
+                };
+                labelLayer.Symbology.Categories[0].Expression = string.Format(CultureInfo.CurrentCulture, "[{0}]", columnLookup[labelToShow]);
+            }
+
+            return labelLayer;
+        }
+
+        private void ValidateParameters(MapData data)
+        {
+            if (data == null)
+            {
+                throw new ArgumentNullException("data", @"Null data cannot be converted into a feature layer.");
+            }
+
+            if (!CanConvertMapData(data))
+            {
+                var message = string.Format("The data of type {0} cannot be converted by this converter.", data.GetType());
+                throw new ArgumentException(message);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs	(revision 0)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/IFeatureBasedMapDataConverter.cs	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -0,0 +1,65 @@
+// 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.Gis.Data;
+using DotSpatial.Controls;
+
+namespace Core.Components.DotSpatial.Converter
+{
+    /// <summary>
+    /// The interface for a converter which converts <see cref="MapData"/> into <see cref="IMapFeatureLayer"/>.
+    /// </summary>
+    public interface IFeatureBasedMapDataConverter
+    {
+        /// <summary>
+        /// Checks whether the <see cref="IFeatureBasedMapDataConverter"/> can convert the <paramref name="data"/>.
+        /// </summary>
+        /// <param name="data">The <see cref="MapData"/> to check for.</param>
+        /// <returns><c>true</c> if the <paramref name="data"/> can be converted by the
+        /// <see cref="IFeatureBasedMapDataConverter"/>, <c>false</c> otherwise.</returns>
+        bool CanConvertMapData(MapData data);
+
+        /// <summary>
+        /// Creates a <see cref="IMapFeatureLayer"/> based on the <paramref name="data"/> that was given.
+        /// </summary>
+        /// <param name="data">The data to transform into a <see cref="IMapFeatureLayer"/>.</param>
+        /// <returns>A new <see cref="IMapFeatureLayer"/>.</returns>
+        /// <exception cref="ArgumentException">Thrown when <see cref="CanConvertMapData"/> returns <c>false</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> is <c>null</c>.</exception>
+        IMapFeatureLayer Convert(MapData data);
+
+        /// <summary>
+        /// Converts all feature related data from <paramref name="data"/> to <paramref name="layer"/>.
+        /// </summary>
+        /// <param name="data">The data to convert the feature related data from.</param>
+        /// <param name="layer">The layer to convert the feature related data to.</param>
+        void ConvertLayerFeatures(MapData data, IMapFeatureLayer layer);
+
+        /// <summary>
+        /// Converts all general properties (like <see cref="MapData.Name"/> and <see cref="MapData.IsVisible"/>) 
+        /// from <paramref name="data"/> to <paramref name="layer"/>.
+        /// </summary>
+        /// <param name="data">The data to convert the general properties from.</param>
+        /// <param name="layer">The layer to convert the general properties to.</param>
+        void ConvertLayerProperties(MapData data, IMapFeatureLayer layer);
+    }
+}
\ No newline at end of file
Fisheye: Tag d72d28f9d51c5bc4c7bb0f49509e3656465cc22c refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d72d28f9d51c5bc4c7bb0f49509e3656465cc22c refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs
===================================================================
diff -u -r0f65a6bd78c76390d84a1fe459a1de44bf7fb27c -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs	(.../MapFeatureLayerFactory.cs)	(revision 0f65a6bd78c76390d84a1fe459a1de44bf7fb27c)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapFeatureLayerFactory.cs	(.../MapFeatureLayerFactory.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -40,14 +40,14 @@
         /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
         public static IMapFeatureLayer Create(MapData data)
         {
-            var converters = new Collection<IMapDataConverter>
+            var converters = new Collection<IFeatureBasedMapDataConverter>
             {
                 new MapPointDataConverter(),
                 new MapLineDataConverter(),
                 new MapPolygonDataConverter()
             };
 
-            foreach (IMapDataConverter converter in converters.Where(c => c.CanConvertMapData(data)))
+            foreach (IFeatureBasedMapDataConverter converter in converters.Where(c => c.CanConvertMapData(data)))
             {
                 return converter.Convert(data);
             }
@@ -63,7 +63,7 @@
         /// <exception cref="NotSupportedException">Thrown when the given <paramref name="data"/> type is not supported.</exception>
         public static void ConvertLayerFeatures(MapData data, IMapFeatureLayer layer)
         {
-            var converter = GetMapDataConverter(data);
+            var converter = GetFeatureBasedMapDataConverter(data);
             if (converter != null)
             {
                 converter.ConvertLayerFeatures(data, layer);
@@ -82,7 +82,7 @@
         /// <param name="layer">The layer to convert the general properties to.</param>
         public static void ConvertLayerProperties(MapData data, IMapFeatureLayer layer)
         {
-            var converter = GetMapDataConverter(data);
+            var converter = GetFeatureBasedMapDataConverter(data);
             if (converter != null)
             {
                 converter.ConvertLayerProperties(data, layer);
@@ -93,9 +93,9 @@
             }
         }
 
-        private static IMapDataConverter GetMapDataConverter(MapData data)
+        private static IFeatureBasedMapDataConverter GetFeatureBasedMapDataConverter(MapData data)
         {
-            return new Collection<IMapDataConverter>
+            return new Collection<IFeatureBasedMapDataConverter>
             {
                 new MapPointDataConverter(),
                 new MapLineDataConverter(),
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs
===================================================================
diff -u -rd2eecf88d4da2c824ccfa6eb81cf0a75733eccde -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision d2eecf88d4da2c824ccfa6eb81cf0a75733eccde)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs	(.../MapLineDataConverter.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -35,7 +35,7 @@
     /// <summary>
     /// The converter that converts <see cref="MapLineData"/> into a <see cref="MapLineLayer"/>.
     /// </summary>
-    public class MapLineDataConverter : MapDataConverter<MapLineData, MapLineLayer>
+    public class MapLineDataConverter : FeatureBasedMapDataConverter<MapLineData, MapLineLayer>
     {
         protected override IMapFeatureLayer Convert(MapLineData data)
         {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs
===================================================================
diff -u -rd2eecf88d4da2c824ccfa6eb81cf0a75733eccde -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision d2eecf88d4da2c824ccfa6eb81cf0a75733eccde)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs	(.../MapPointDataConverter.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -33,7 +33,7 @@
     /// <summary>
     /// The converter that converts <see cref="MapPointData"/> into a <see cref="MapPointLayer"/>.
     /// </summary>
-    public class MapPointDataConverter : MapDataConverter<MapPointData, MapPointLayer>
+    public class MapPointDataConverter : FeatureBasedMapDataConverter<MapPointData, MapPointLayer>
     {
         protected override IMapFeatureLayer Convert(MapPointData data)
         {
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs
===================================================================
diff -u -rd2eecf88d4da2c824ccfa6eb81cf0a75733eccde -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision d2eecf88d4da2c824ccfa6eb81cf0a75733eccde)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs	(.../MapPolygonDataConverter.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -33,7 +33,7 @@
     /// <summary>
     /// The converter that converts <see cref="MapPolygonData"/> into a <see cref="MapPolygonLayer"/>.
     /// </summary>
-    public class MapPolygonDataConverter : MapDataConverter<MapPolygonData, MapPolygonLayer>
+    public class MapPolygonDataConverter : FeatureBasedMapDataConverter<MapPolygonData, MapPolygonLayer>
     {
         protected override IMapFeatureLayer Convert(MapPolygonData data)
         {
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r675771641656abfb56ef89be86bad7bd21684016 -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 675771641656abfb56ef89be86bad7bd21684016)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -63,8 +63,8 @@
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Converter\IMapDataConverter.cs" />
-    <Compile Include="Converter\MapDataConverter.cs" />
+    <Compile Include="Converter\IFeatureBasedMapDataConverter.cs" />
+    <Compile Include="Converter\FeatureBasedMapDataConverter.cs" />
     <Compile Include="Converter\MapFeatureLayerFactory.cs" />
     <Compile Include="Converter\MapDataHelper.cs" />
     <Compile Include="Converter\MapLineDataConverter.cs" />
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(revision 0)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -0,0 +1,130 @@
+// 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.Common.TestUtil;
+using Core.Components.DotSpatial.Converter;
+using Core.Components.DotSpatial.TestUtil;
+using Core.Components.Gis.Data;
+using DotSpatial.Controls;
+using NUnit.Framework;
+
+namespace Core.Components.DotSpatial.Test.Converter
+{
+    [TestFixture]
+    public class FeatureBasedMapDataConverterTest
+    {
+        [Test]
+        public void CanConvertMapData_DifferentInheritingTypes_OnlySupportsExactType()
+        {
+            // Setup
+            var testConverter = new TestFeatureBasedMapDataConverter<Class>();
+
+            // Call
+            var mapDataResult = testConverter.CanConvertMapData(new TestMapData("test data"));
+            var classResult = testConverter.CanConvertMapData(new Class("test data"));
+            var childResult = testConverter.CanConvertMapData(new Child("test data"));
+
+            // Assert
+            Assert.IsFalse(mapDataResult);
+            Assert.IsTrue(classResult);
+            Assert.IsTrue(childResult);
+        }
+
+        [Test]
+        public void Convert_DataNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var testConverter = new TestFeatureBasedMapDataConverter<Class>();
+
+            // Call
+            TestDelegate test = () => testConverter.Convert(null);
+
+            // Assert
+            const string expectedMessage = "Null data cannot be converted into a feature layer.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, expectedMessage);
+        }
+
+        [Test]
+        public void Convert_DataCannotBeConverted_ThrowsArgumentException()
+        {
+            // Setup
+            var testConverter = new TestFeatureBasedMapDataConverter<Class>();
+            var testMapData = new TestMapData("test data");
+
+            // Precondition
+            Assert.IsFalse(testConverter.CanConvertMapData(testMapData));
+
+            // Call
+            TestDelegate test = () => testConverter.Convert(testMapData);
+
+            // Assert
+            var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType());
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+        }
+
+        [Test]
+        public void Convert_DataCanBeConverted_ReturnsResult()
+        {
+            // Setup
+            var testConverter = new TestFeatureBasedMapDataConverter<TestMapData>();
+            var testMapData = new TestMapData("test data");
+
+            // Precondition
+            Assert.IsTrue(testConverter.CanConvertMapData(testMapData));
+
+            // Call
+            var result = testConverter.Convert(testMapData);
+
+            // Assert
+            Assert.IsNotNull(result);
+        }
+
+        private class Class : MapData
+        {
+            public Class(string name) : base(name) {}
+        }
+
+        private class Child : Class
+        {
+            public Child(string name) : base(name) {}
+        }
+
+        private class TestFeatureBasedMapDataConverter<TMapData> : FeatureBasedMapDataConverter<TMapData, MapPointLayer>
+            where TMapData : MapData
+        {
+            protected override void ConvertLayerFeatures(TMapData data, MapPointLayer layer)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override void ConvertLayerProperties(TMapData data, MapPointLayer layer)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IMapFeatureLayer Convert(TMapData data)
+            {
+                return new MapPointLayer();
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag d72d28f9d51c5bc4c7bb0f49509e3656465cc22c refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs
===================================================================
diff -u -ra47c2cb4b8278ff844e007477b0510a4d1a4956a -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision a47c2cb4b8278ff844e007477b0510a4d1a4956a)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -52,7 +52,7 @@
             var converter = new MapLineDataConverter();
 
             // Assert
-            Assert.IsInstanceOf<MapDataConverter<MapLineData, MapLineLayer>>(converter);
+            Assert.IsInstanceOf<FeatureBasedMapDataConverter<MapLineData, MapLineLayer>>(converter);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs
===================================================================
diff -u -ra47c2cb4b8278ff844e007477b0510a4d1a4956a -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision a47c2cb4b8278ff844e007477b0510a4d1a4956a)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs	(.../MapPointDataConverterTest.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -51,7 +51,7 @@
             var converter = new MapPointDataConverter();
 
             // Assert
-            Assert.IsInstanceOf<MapDataConverter<MapPointData, MapPointLayer>>(converter);
+            Assert.IsInstanceOf<FeatureBasedMapDataConverter<MapPointData, MapPointLayer>>(converter);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs
===================================================================
diff -u -ra47c2cb4b8278ff844e007477b0510a4d1a4956a -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision a47c2cb4b8278ff844e007477b0510a4d1a4956a)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs	(.../MapPolygonDataConverterTest.cs)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -51,7 +51,7 @@
             var converter = new MapPolygonDataConverter();
 
             // Assert
-            Assert.IsInstanceOf<MapDataConverter<MapPolygonData, MapPolygonLayer>>(converter);
+            Assert.IsInstanceOf<FeatureBasedMapDataConverter<MapPolygonData, MapPolygonLayer>>(converter);
         }
 
         [Test]
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -r675771641656abfb56ef89be86bad7bd21684016 -rd72d28f9d51c5bc4c7bb0f49509e3656465cc22c
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 675771641656abfb56ef89be86bad7bd21684016)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision d72d28f9d51c5bc4c7bb0f49509e3656465cc22c)
@@ -81,7 +81,7 @@
     <Compile Include="Converter\MapDataHelperTest.cs" />
     <Compile Include="Converter\MapLineDataConverterTest.cs" />
     <Compile Include="Converter\MapPolygonDataConverterTest.cs" />
-    <Compile Include="Converter\MapDataConverterTest.cs" />
+    <Compile Include="Converter\FeatureBasedMapDataConverterTest.cs" />
     <Compile Include="Converter\MapFeatureLayerFactoryTest.cs" />
     <Compile Include="Converter\MapPointDataConverterTest.cs" />
     <Compile Include="MapFunctions\MapFunctionSelectionZoomTest.cs" />