Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -r2aeb951ddc6e2137897569a2de4c55c9fb7e2420
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 2aeb951ddc6e2137897569a2de4c55c9fb7e2420)
@@ -22,10 +22,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Geometry;
+using Core.Common.Geometry;
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.Common.Forms.Views
@@ -60,6 +63,88 @@
                        : new MapFeature[0];
         }
 
+        /// <summary>
+        /// Create section features based on the provided <paramref name="sections"/>.
+        /// </summary>
+        /// <param name="sections">The collection of <see cref="FailureMechanismSection"/> to create the section features for.</param>
+        /// <returns>An array of features or an empty array when <paramref name="sections"/> is <c>null</c> or empty.</returns>
+        public static MapFeature[] CreateFailureMechanismSectionFeatures(IEnumerable<FailureMechanismSection> sections)
+        {
+            return sections != null && sections.Any()
+                       ? new[]
+                       {
+                           new MapFeature(sections.Select(section => new MapGeometry(new[]
+                           {
+                               section.Points.Select(p => new Point2D(p.X, p.Y))
+                           })))
+                       }
+                       : new MapFeature[0];
+        }
+
+        /// <summary>
+        /// Create section start point features based on the provided <paramref name="sections"/>.
+        /// </summary>
+        /// <param name="sections">The collection of <see cref="FailureMechanismSection"/> to create the section start point features for.</param>
+        /// <returns>An array of features or an empty array when <paramref name="sections"/> is <c>null</c> or empty.</returns>
+        public static MapFeature[] CreateFailureMechanismSectionStartPointFeatures(IEnumerable<FailureMechanismSection> sections)
+        {
+            return sections != null && sections.Any()
+                       ? GetMapFeatures(sections.Select(sl => sl.GetStart()))
+                       : new MapFeature[0];
+        }
+
+        /// <summary>
+        /// Create section end point features based on the provided <paramref name="sections"/>.
+        /// </summary>
+        /// <param name="sections">The collection of <see cref="FailureMechanismSection"/> to create the section end point features for.</param>
+        /// <returns>An array of features or an empty array when <paramref name="sections"/> is <c>null</c> or empty.</returns>
+        public static MapFeature[] CreateFailureMechanismSectionEndPointFeatures(IEnumerable<FailureMechanismSection> sections)
+        {
+            return sections != null && sections.Any()
+                       ? GetMapFeatures(sections.Select(sl => sl.GetLast()))
+                       : new MapFeature[0];
+        }
+
+        /// <summary>
+        /// Create features for the foreshore and dike geometry of the <paramref name="dikeProfiles"/>.
+        /// </summary>
+        /// <param name="dikeProfiles">The profiles to create features for.</param>
+        /// <returns>An array of features or an empty array when <paramref name="dikeProfiles"/> is <c>null</c> or empty.</returns>
+        public static MapFeature[] CreateDikeProfilesFeatures(IEnumerable<DikeProfile> dikeProfiles)
+        {
+            return dikeProfiles != null && dikeProfiles.Any()
+                       ? new[]
+                       {
+                           new MapFeature(dikeProfiles.Select(dp => new MapGeometry(GetWorldPoints(dp.ForeshoreProfile)))),
+                           new MapFeature(dikeProfiles.Select(dp => new MapGeometry(GetWorldPoints(dp)))), 
+                       }
+                       : new MapFeature[0];
+        }
+
+        private static IEnumerable<IEnumerable<Point2D>> GetWorldPoints(DikeProfile dikeProfile)
+        {
+            return new[]
+            {
+                AdvancedMath2D.FromXToXY(
+                dikeProfile.DikeGeometry.Select(p => p.Point.X).ToArray(), 
+                dikeProfile.WorldReferencePoint, 
+                dikeProfile.X0,
+                dikeProfile.Orientation)
+            };
+        }
+
+        private static IEnumerable<IEnumerable<Point2D>> GetWorldPoints(ForeshoreProfile foreshoreProfile)
+        {
+            return new[]
+            {
+                AdvancedMath2D.FromXToXY(
+                foreshoreProfile.Geometry.Select(p => p.X).ToArray(), 
+                foreshoreProfile.WorldReferencePoint, 
+                foreshoreProfile.X0,
+                foreshoreProfile.Orientation)
+            };
+        }
+
         private static MapFeature[] GetMapFeatures(IEnumerable<Point2D> points)
         {
             return new[]