Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs
===================================================================
diff -u -r5047fad63b41f7f79bc8a1690fc69045e7233666 -r2117ba3d745d5776cefdf94dc86ac8d5950aa31e
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs	(.../OpenMapViewCommand.cs)	(revision 5047fad63b41f7f79bc8a1690fc69045e7233666)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs	(.../OpenMapViewCommand.cs)	(revision 2117ba3d745d5776cefdf94dc86ac8d5950aa31e)
@@ -5,6 +5,8 @@
 using Core.Common.Controls.Commands;
 using Core.Common.Gui;
 using Core.Components.Gis.Data;
+using Core.Components.Gis.Features;
+using Core.Components.Gis.Geometries;
 
 namespace Demo.Ringtoets.Commands
 {
@@ -42,52 +44,52 @@
 
         public void Execute(params object[] arguments)
         {
-            var polygons1 = new MapPolygonData(new Collection<Point2D>
+            var polygons1 = new MapPolygonData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(4.764723, 52.990274),
                 new Point2D(4.713888, 53.056108),
                 new Point2D(4.883333, 53.184168)
-            }, "Texel");
+            }), "Texel");
 
-            var polygons2 = new MapPolygonData(new Collection<Point2D>
+            var polygons2 = new MapPolygonData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(4.957224, 53.23778),
                 new Point2D(4.879999, 53.214441),
                 new Point2D(5.10639, 53.303331)
-            }, "Vlieland");
+            }), "Vlieland");
 
-            var polygons3 = new MapPolygonData(new Collection<Point2D>
+            var polygons3 = new MapPolygonData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(5.213057, 53.35),
                 new Point2D(5.16889, 53.373888),
                 new Point2D(5.581945, 53.447779)
-            }, "Terschelling");
+            }), "Terschelling");
 
-            var polygons4 = new MapPolygonData(new Collection<Point2D>
+            var polygons4 = new MapPolygonData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(5.699167, 53.462778),
                 new Point2D(5.956114, 53.462778),
                 new Point2D(5.633055, 53.441668)
-            }, "Ameland");
+            }), "Ameland");
 
-            var polygons5 = new MapPolygonData(new Collection<Point2D>
+            var polygons5 = new MapPolygonData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(6.135, 53.453608),
                 new Point2D(6.14889, 53.497499),
                 new Point2D(6.341112, 53.502779)
-            }, "Schiermonnikoog");
+            }), "Schiermonnikoog");
 
-            var pointsRandstad = new MapPointData(new Collection<Point2D>
+            var pointsRandstad = new MapPointData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(4.4818, 51.9242),
                 new Point2D(4.7167, 52.0167),
                 new Point2D(5.1146, 52.0918),
                 new Point2D(4.3007, 52.0705),
                 new Point2D(4.8952, 52.3702),
                 new Point2D(4.3667, 52.0167)
-            }, "Randstad");
+            }), "Randstad");
 
-            var linesRandstad = new MapLineData(new Collection<Point2D>
+            var linesRandstad = new MapLineData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(4.4818, 51.9242),
                 new Point2D(4.7167, 52.0167),
@@ -98,9 +100,9 @@
                 new Point2D(4.3667, 52.0167),
                 new Point2D(5.1146, 52.0918),
                 new Point2D(4.8952, 52.3702)
-            }, "Snelwegen randstad");
+            }), "Snelwegen randstad");
 
-            var lines = new MapLineData(new Collection<Point2D>
+            var lines = new MapLineData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(5.763887, 52.415277),
                 new Point2D(5.573057, 52.368052),
@@ -111,9 +113,9 @@
                 new Point2D(5.855558, 52.544168),
                 new Point2D(5.855558, 52.492495),
                 new Point2D(5.763887, 52.415277)
-            }, "Kustlijn Flevoland");
+            }), "Kustlijn Flevoland");
 
-            var polygonNetherlands = new MapPolygonData(new Collection<Point2D>
+            var polygonNetherlands = new MapPolygonData(GetFeatureWithPoints(new Collection<Point2D>
             {
                 new Point2D(6.871668, 53.416109),
                 new Point2D(7.208364, 53.242807),
@@ -154,12 +156,23 @@
                 new Point2D(4.58, 52.471666),
                 new Point2D(4.734167, 52.955553),
                 new Point2D(6.871668, 53.416109)
-            }, "Continentaal Nederland");
+            }), "Continentaal Nederland");
 
             documentViewController.DocumentViewsResolver.OpenViewForData(new MapDataCollection(new List<MapData>
             {
                 polygons1, polygons2, polygons3, polygons4, polygons5, lines, polygonNetherlands, linesRandstad, pointsRandstad
             }, "Demo kaart Nederland"));
         }
+
+        private IEnumerable<MapFeature> GetFeatureWithPoints(Collection<Point2D> points)
+        {
+            return new Collection<MapFeature> 
+            {
+                new MapFeature(new Collection<MapGeometry>
+                {
+                    new MapGeometry(points)
+                })
+            };
+        }
     }
 }
\ No newline at end of file