Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs
===================================================================
diff -u -r6c7f7aa26bfbb6caa020f05fb9f563eca3458447 -r9cbc101eb43fcbfc72e2ebb7c9ab3bf7807fa46e
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 6c7f7aa26bfbb6caa020f05fb9f563eca3458447)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision 9cbc101eb43fcbfc72e2ebb7c9ab3bf7807fa46e)
@@ -29,6 +29,7 @@
 using Core.Common.Geometry;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Styles;
+using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
 using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
@@ -41,10 +42,10 @@
     public static class PipingChartDataFactory
     {
         /// <summary>
-        /// Create <see cref="ChartData"/> with default styling based on a <see cref="RingtoetsPipingSurfaceLine"/>.
+        /// Create <see cref="ChartData"/> with default styling for a <see cref="RingtoetsPipingSurfaceLine"/>.
         /// </summary>
         /// <param name="getSurfaceLineFunc">The function for obtaining a <see cref="RingtoetsPipingSurfaceLine"/> for which to create <see cref="ChartData"/>.</param>
-        /// <returns><see cref="ChartData"/> based on the surface line obtained via <paramref name="getSurfaceLineFunc"/>.</returns>
+        /// <returns><see cref="ChartData"/> for the surface line obtained via <paramref name="getSurfaceLineFunc"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="getSurfaceLineFunc"/> is <c>null</c>.</exception>
         public static ChartData CreateSurfaceLine(Func<RingtoetsPipingSurfaceLine> getSurfaceLineFunc)
         {
@@ -78,55 +79,69 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="entryPoint"/>.
+        /// Create <see cref="ChartData"/> with default styling for an entry point.
         /// </summary>
-        /// <param name="entryPoint">The horizontal distance from the origin at which to place the entry point
-        /// on the  <paramref name="surfaceLine"/>.</param>
-        /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> to place the entry point on.</param>
-        /// <returns><see cref="ChartData"/> based on the <paramref name="entryPoint"/>.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="entryPoint"/> is <c>NaN</c>.</exception>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="surfaceLine"/> is <c>null</c>.</exception>
-        public static ChartData CreateEntryPoint(RoundedDouble entryPoint, RingtoetsPipingSurfaceLine surfaceLine)
+        /// <param name="getPipingInputFunc">The function for obtaining the <see cref="PipingInput"/> that holds the entry point for which to create <see cref="ChartData"/>.</param>
+        /// <returns><see cref="ChartData"/> based on the entry point of the <see cref="PipingInput"/> obtained via <paramref name="getPipingInputFunc"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="getPipingInputFunc"/> is <c>null</c>.</exception>
+        public static ChartData CreateEntryPoint(Func<PipingInput> getPipingInputFunc)
         {
-            if (double.IsNaN(entryPoint))
+            if (getPipingInputFunc == null)
             {
-                throw new ArgumentException("Entry point should have a value.", "entryPoint");
+                throw new ArgumentNullException("getPipingInputFunc");
             }
 
-            if (surfaceLine == null)
+            Func<IEnumerable<Point2D>> getPointsFunc = () =>
             {
-                throw new ArgumentNullException("surfaceLine");
-            }
+                var pipingInput = getPipingInputFunc();
 
-            return CreatePointWithZAtL(entryPoint, surfaceLine, Resources.PipingInput_EntryPointL_DisplayName, Color.Gold);
+                return pipingInput != null && pipingInput.SurfaceLine != null && !double.IsNaN(pipingInput.EntryPointL)
+                           ? new[]
+                           {
+                               new Point2D(pipingInput.EntryPointL, pipingInput.SurfaceLine.GetZAtL(pipingInput.EntryPointL))
+                           }
+                           : Enumerable.Empty<Point2D>();
+            };
+
+            return new ChartPointData(getPointsFunc, Resources.PipingInput_EntryPointL_DisplayName)
+            {
+                Style = new ChartPointStyle(Color.Gold, 8, Color.Transparent, 0, ChartPointSymbol.Triangle)
+            };
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="exitPoint"/>.
+        /// Create <see cref="ChartData"/> with default styling for an exit point.
         /// </summary>
-        /// <param name="exitPoint">The horizontal distance from the origin at which to place the exit point
-        /// on the  <paramref name="surfaceLine"/>.</param>
-        /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> to place the exit point on.</param>
-        /// <returns><see cref="ChartData"/> based on the <paramref name="exitPoint"/>.</returns>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="exitPoint"/> is <c>NaN</c>.</exception>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="surfaceLine"/> is <c>null</c>.</exception>
-        public static ChartData CreateExitPoint(RoundedDouble exitPoint, RingtoetsPipingSurfaceLine surfaceLine)
+        /// <param name="getPipingInputFunc">The function for obtaining the <see cref="PipingInput"/> that holds the exit point for which to create <see cref="ChartData"/>.</param>
+        /// <returns><see cref="ChartData"/> based on the exit point of the <see cref="PipingInput"/> obtained via <paramref name="getPipingInputFunc"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="getPipingInputFunc"/> is <c>null</c>.</exception>
+        public static ChartData CreateExitPoint(Func<PipingInput> getPipingInputFunc)
         {
-            if (double.IsNaN(exitPoint))
+            if (getPipingInputFunc == null)
             {
-                throw new ArgumentException("Exit point should have a value.", "exitPoint");
+                throw new ArgumentNullException("getPipingInputFunc");
             }
 
-            if (surfaceLine == null)
+            Func<IEnumerable<Point2D>> getPointsFunc = () =>
             {
-                throw new ArgumentNullException("surfaceLine");
-            }
+                var pipingInput = getPipingInputFunc();
 
-            return CreatePointWithZAtL(exitPoint, surfaceLine, Resources.PipingInput_ExitPointL_DisplayName, Color.Tomato);
+                return pipingInput != null && pipingInput.SurfaceLine != null && !double.IsNaN(pipingInput.ExitPointL)
+                           ? new[]
+                           {
+                               new Point2D(pipingInput.ExitPointL, pipingInput.SurfaceLine.GetZAtL(pipingInput.ExitPointL))
+                           }
+                           : Enumerable.Empty<Point2D>();
+            };
+
+            return new ChartPointData(getPointsFunc, Resources.PipingInput_ExitPointL_DisplayName)
+            {
+                Style = new ChartPointStyle(Color.Tomato, 8, Color.Transparent, 0, ChartPointSymbol.Triangle)
+            };
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DitchPolderSide"/>.
+        /// Create <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DitchPolderSide"/>.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> which contains a point which 
         /// characterizes the ditch at polder side, to create <see cref="ChartData"/> for.</param>
@@ -144,7 +159,7 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.BottomDitchPolderSide"/>.
+        /// Create <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.BottomDitchPolderSide"/>.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> which contains a point which 
         /// characterizes the bottom ditch at polder side, to create <see cref="ChartData"/> for.</param>
@@ -162,7 +177,7 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.BottomDitchDikeSide"/>.
+        /// Create <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.BottomDitchDikeSide"/>.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> which contains a point which 
         /// characterizes the bottom ditch at dike side, to create <see cref="ChartData"/> for.</param>
@@ -180,7 +195,7 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DitchDikeSide"/>.
+        /// Create <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DitchDikeSide"/>.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> which contains a point which 
         /// characterizes the ditch at dike side, to create <see cref="ChartData"/> for.</param>
@@ -198,7 +213,7 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DikeToeAtRiver"/>.
+        /// Create <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DikeToeAtRiver"/>.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> which contains a point which 
         /// characterizes the dike toe at river side, to create <see cref="ChartData"/> for.</param>
@@ -216,7 +231,7 @@
         }
 
         /// <summary>
-        /// Create a <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DikeToeAtPolder"/>.
+        /// Create <see cref="ChartData"/> with default styling based on the <paramref name="surfaceLine.DikeToeAtPolder"/>.
         /// </summary>
         /// <param name="surfaceLine">The <see cref="RingtoetsPipingSurfaceLine"/> which contains a point which 
         /// characterizes the dike toe at polder side, to create <see cref="ChartData"/> for.</param>
@@ -234,7 +249,7 @@
         }
 
         /// <summary>
-        /// Create an instance of <see cref="ChartData"/> with styling based on the color of <see name="SoilLayer.Color"/> of
+        /// Create <see cref="ChartData"/> with styling based on the color of <see name="SoilLayer.Color"/> of
         /// the <see cref="PipingSoilLayer"/> as index <paramref name="soilLayerIndex"/>. The <see cref="PipingSoilLayer"/> is drawn 
         /// for the full width of the <paramref name="surfaceLine"/> (as far as the <see cref="PipingSoilLayer"/> is visible below 
         /// the <paramref name="surfaceLine"/>).
@@ -354,19 +369,6 @@
             };
         }
 
-        private static ChartData CreatePointWithZAtL(RoundedDouble pointL, RingtoetsPipingSurfaceLine surfaceLine, string name, Color color)
-        {
-            var pointZ = surfaceLine.GetZAtL(pointL);
-
-            return new ChartPointData(() => new[]
-            {
-                new Point2D(pointL, pointZ)
-            }, name)
-            {
-                Style = new ChartPointStyle(color, 8, Color.Transparent, 0, ChartPointSymbol.Triangle)
-            };
-        }
-
         private static ChartData CreateCharacteristicPoint(Point3D worldPoint, RingtoetsPipingSurfaceLine surfaceLine, string name, Color color)
         {
             return CreateLocalPoint(worldPoint, surfaceLine, name, new ChartPointStyle(color, 8, Color.Transparent, 0, ChartPointSymbol.Circle));