Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs
===================================================================
diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs	(.../MapDataFactory.cs)	(revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs	(.../MapDataFactory.cs)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -41,7 +41,6 @@
             new MapDataCollectionConverter(),
             new MapPointDataConverter(),
             new MapLineDataConverter(),
-            new MapMultiLineDataConverter(),
             new MapPolygonDataConverter()
         };
 
Fisheye: Tag e8ed2a7235a3d440d258ce5f76862196388c64bc refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r30b12b82918d500fe834eafd9f6cd9b2c5dbe60f -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 30b12b82918d500fe834eafd9f6cd9b2c5dbe60f)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -94,7 +94,6 @@
     <Compile Include="Converter\MapDataConverter.cs" />
     <Compile Include="Converter\MapDataFactory.cs" />
     <Compile Include="Converter\MapLineDataConverter.cs" />
-    <Compile Include="Converter\MapMultiLineDataConverter.cs" />
     <Compile Include="Converter\MapPointDataConverter.cs" />
     <Compile Include="Converter\MapPolygonDataConverter.cs" />
     <Compile Include="MapFunctions\MapFunctionPan.cs" />
Index: Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj
===================================================================
diff -u -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
+++ Core/Components/src/Core.Components.Gis/Core.Components.Gis.csproj	(.../Core.Components.Gis.csproj)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -44,7 +44,6 @@
     <Compile Include="Data\MapData.cs" />
     <Compile Include="Data\MapDataCollection.cs" />
     <Compile Include="Data\MapLineData.cs" />
-    <Compile Include="Data\MapMultiLineData.cs" />
     <Compile Include="Data\MapPointData.cs" />
     <Compile Include="Data\MapPolygonData.cs" />
     <Compile Include="Data\FeatureBasedMapData.cs" />
Fisheye: Tag e8ed2a7235a3d440d258ce5f76862196388c64bc refers to a dead (removed) revision in file `Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e8ed2a7235a3d440d258ce5f76862196388c64bc refers to a dead (removed) revision in file `Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapMultiLineDataConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -rc13e35419454e2ca1b1a252b31da36abecf652d4 -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision c13e35419454e2ca1b1a252b31da36abecf652d4)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -101,7 +101,6 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converter\MapMultiLineDataConverterTest.cs" />
     <Compile Include="Converter\MapDataCollectionConverterTest.cs" />
     <Compile Include="Converter\MapLineDataConverterTest.cs" />
     <Compile Include="Converter\MapPolygonDataConverterTest.cs" />
Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj
===================================================================
diff -u -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
+++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj	(.../Core.Components.Gis.Test.csproj)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -41,7 +41,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\MapMultiLineDataTest.cs" />
     <Compile Include="Data\MapDataCollectionTest.cs" />
     <Compile Include="Data\MapDataTest.cs" />
     <Compile Include="Data\MapLineDataTest.cs" />
Fisheye: Tag e8ed2a7235a3d440d258ce5f76862196388c64bc refers to a dead (removed) revision in file `Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs
===================================================================
diff -u -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -139,16 +139,6 @@
                 OnNodeChecked = PointBasedMapDataOnNodeChecked
             });
 
-            treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<MapMultiLineData>
-            {
-                Text = mapMultiLineData => mapMultiLineData.Name,
-                Image = mapMultiLineData => DotSpatialResources.LineIcon,
-                CanDrag = (mapMultiLineData, parentData) => true,
-                CanCheck = mapMultiLineData => true,
-                IsChecked = mapMultiLineData => mapMultiLineData.IsVisible,
-                OnNodeChecked = MapMultiLineDataOnNodeChecked
-            });
-
             treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<MapDataCollection>
             {
                 Text = mapDataCollection => mapDataCollection.Name,
@@ -163,18 +153,6 @@
 
         #region MapData
 
-        private static void MapMultiLineDataOnNodeChecked(MapMultiLineData mapMultiLineData, object parentData)
-        {
-            mapMultiLineData.IsVisible = !mapMultiLineData.IsVisible;
-            mapMultiLineData.NotifyObservers();
-
-            var observableParent = parentData as IObservable;
-            if (observableParent != null)
-            {
-                observableParent.NotifyObservers();
-            }
-        }
-
         private static void PointBasedMapDataOnNodeChecked(FeatureBasedMapData featureBasedMapData, object parentData)
         {
             featureBasedMapData.IsVisible = !featureBasedMapData.IsVisible;
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj
===================================================================
diff -u -r5e80369138024933a45f3e4ae721509dfb17d8fb -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj	(.../Core.Plugins.DotSpatial.Test.csproj)	(revision 5e80369138024933a45f3e4ae721509dfb17d8fb)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj	(.../Core.Plugins.DotSpatial.Test.csproj)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -67,7 +67,6 @@
     <Compile Include="Legend\MapLegendControllerTest.cs" />
     <Compile Include="Legend\MapLegendViewTest.cs" />
     <Compile Include="Legend\MapLineDataTreeNodeInfoTest.cs" />
-    <Compile Include="Legend\MapMultiLineDataTreeNodeInfoTest.cs" />
     <Compile Include="Legend\MapPointDataTreeNodeInfoTest.cs" />
     <Compile Include="Legend\MapPolygonDataTreeNodeInfoTest.cs" />
     <Compile Include="MapRibbonTest.cs" />
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLegendViewTest.cs
===================================================================
diff -u -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -140,21 +140,6 @@
         }
 
         [Test]
-        public void Data_MapMultiLineData_DataSet()
-        {
-            // Setup
-            var view = new MapLegendView(contextMenuBuilderProvider, parentWindow);
-            var mapData = new MapMultiLineData(Enumerable.Empty<IEnumerable<Point2D>>(), "test data");
-
-            // Call
-            view.Data = mapData;
-
-            // Assert
-            Assert.AreSame(mapData, view.Data);
-            Assert.IsInstanceOf<MapData>(view.Data);
-        }
-
-        [Test]
         public void Data_ForNull_NullSet()
         {
             // Setup
Fisheye: Tag e8ed2a7235a3d440d258ce5f76862196388c64bc refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapMultiLineDataTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -153,14 +153,22 @@
 
         private MapData GetSurfaceLinesMapData()
         {
-            IEnumerable<IEnumerable<Point2D>> surfaceLines = data.WrappedData.SurfaceLines.Select(sl => sl.Points.Select(p => new Point2D(p.X, p.Y)));
-            return new MapMultiLineData(surfaceLines, RingtoetsCommonDataResources.SurfaceLine_DisplayName);
+            var mapFeatures = new List<MapFeature>
+            {
+                new MapFeature(data.WrappedData.SurfaceLines.Select(surfaceLine => new MapGeometry(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)))))
+            };
+
+            return new MapLineData(mapFeatures, RingtoetsCommonDataResources.SurfaceLine_DisplayName);
         }
 
         private MapData GetSectionsMapData()
         {
-            IEnumerable<IEnumerable<Point2D>> sectionLines = data.WrappedData.Sections.Select(sl => sl.Points);
-            return new MapMultiLineData(sectionLines, Resources.FailureMechanism_Sections_DisplayName);
+            var mapFeatures = new List<MapFeature>
+            {
+                new MapFeature(data.WrappedData.Sections.Select(section => new MapGeometry(section.Points.Select(p => new Point2D(p.X, p.Y)))))
+            };
+
+            return new MapLineData(mapFeatures, Resources.FailureMechanism_Sections_DisplayName);
         }
 
         private MapData GetSectionsStartPointsMapData()
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e -re8ed2a7235a3d440d258ce5f76862196388c64bc
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision e8ed2a7235a3d440d258ce5f76862196388c64bc)
@@ -382,11 +382,19 @@
 
         private void AssertFailureMechanismSectionsMapData(IEnumerable<FailureMechanismSection> sections, MapData mapData)
         {
-            Assert.IsInstanceOf<MapMultiLineData>(mapData);
-            var sectionsMapLinesData = (MapMultiLineData)mapData;
-            foreach (var failureMechanismSection in sections)
+            Assert.IsInstanceOf<MapLineData>(mapData);
+            var sectionsMapLinesData = (MapLineData)mapData;
+            var sectionMapLinesFeatures = sectionsMapLinesData.Features.ToArray();
+            Assert.AreEqual(1, sectionMapLinesFeatures.Length);
+
+            var geometries = sectionMapLinesFeatures.First().MapGeometries.ToArray();
+            var sectionsArray = sections.ToArray();
+            Assert.AreEqual(sectionsArray.Length, geometries.Length);
+
+            for (int index = 0; index < sectionsArray.Length; index++)
             {
-                CollectionAssert.Contains(sectionsMapLinesData.Lines, failureMechanismSection.Points);
+                var failureMechanismSection = sectionsArray[index];
+                CollectionAssert.AreEquivalent(geometries[index].Points, failureMechanismSection.Points);
             }
             Assert.AreEqual("Vakindeling", mapData.Name);
         }
@@ -409,11 +417,19 @@
 
         private void AssertSurfacelinesMapData(IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, MapData mapData)
         {
-            Assert.IsInstanceOf<MapMultiLineData>(mapData);
-            var surfacelinesMapData = (MapMultiLineData)mapData;
-            foreach (var surfaceLine in surfaceLines)
+            Assert.IsInstanceOf<MapLineData>(mapData);
+            var surfacelinesMapData = (MapLineData)mapData;
+            var surfacelineFeatures = surfacelinesMapData.Features.ToArray();
+            Assert.AreEqual(1, surfacelineFeatures.Length);
+            
+            var geometries = surfacelineFeatures.First().MapGeometries.ToArray();
+            var surfaceLinesArray = surfaceLines.ToArray();
+            Assert.AreEqual(surfaceLinesArray.Length, geometries.Length);
+
+            for (int index = 0; index < surfaceLinesArray.Length; index++)
             {
-                CollectionAssert.Contains(surfacelinesMapData.Lines, surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)));
+                var surfaceLine = surfaceLinesArray[index];
+                CollectionAssert.AreEquivalent(geometries[index].Points, surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)));
             }
             Assert.AreEqual("Profielmetingen", mapData.Name);
         }