Make Distance(PointF point) internal

Author: JimBobSquarePants

src/ImageSharp.Drawing/Shapes/ComplexPolygon.cs

@@ -125,26 +125,29 @@ public ComplexPolygon(params IPath[] paths)
         /// <inheritdoc/>
         int IPathInternals.MaxIntersections => this.maxIntersections;
 
-        /// <summary>
-        /// The distance of the point from the outline of the shape, if the value is negative it is inside the polygon bounds
-        /// </summary>
-        /// <param name="point">The point.</param>
-        /// <returns>
-        /// Returns the distance from thr shape to the point
-        /// </returns>
+        /// <inheritdoc/>
         /// <remarks>
-        /// Due to the clipping we did during construction we know that out shapes do not overlap at there edges
+        /// Due to the clipping we did during construction we know that out shapes do not overlap at their edges
         /// therefore for a point to be in more that one we must be in a hole of another, theoretically this could
         /// then flip again to be in a outline inside a hole inside an outline :)
         /// </remarks>
-        public PointInfo Distance(PointF point)
+        PointInfo IPathInternals.Distance(PointF point)
         {
             float dist = float.MaxValue;
             PointInfo pointInfo = default;
             bool inside = false;
             foreach (IPath shape in this.Paths)
             {
-                PointInfo d = shape.Distance(point);
+                PointInfo d;
+                if (shape is IPathInternals internals)
+                {
+                    d = internals.Distance(point);
+                }
+                else
+                {
+                    // TODO: How can I solve this?
+                    throw new NotImplementedException();
+                }
 
                 if (d.DistanceFromPath <= 0)
                 {

src/ImageSharp.Drawing/Shapes/EllipsePolygon.cs

@@ -91,7 +91,7 @@ private EllipsePolygon(CubicBezierLineSegment segment)
         public float Length => this.innerPath.Length;
 
         /// <inheritdoc />
-        public PointInfo Distance(PointF point)
+        PointInfo IPathInternals.Distance(PointF point)
         {
             PointInfo dist = this.innerPath.DistanceFromPath(point);
             bool isInside = this.innerPath.PointInPolygon(point);

src/ImageSharp.Drawing/Shapes/IPath.cs

@@ -26,15 +26,6 @@ public interface IPath
         /// </summary>
         float Length { get; }
 
-        /// <summary>
-        /// Calculates the distance along and away from the path for a specified point.
-        /// </summary>
-        /// <param name="point">The point along the path.</param>
-        /// <returns>
-        /// Returns details about the point and its distance away from the path.
-        /// </returns>
-        PointInfo Distance(PointF point);
-
         /// <summary>
         /// Converts the <see cref="IPath" /> into a simple linear path.
         /// </summary>

src/ImageSharp.Drawing/Shapes/IPathInternals.cs

@@ -53,6 +53,15 @@ int FindIntersections(
             Span<PointOrientation> orientations,
             IntersectionRule intersectionRule);
 
+        /// <summary>
+        /// Calculates the distance along and away from the path for a specified point.
+        /// </summary>
+        /// <param name="point">The point along the path.</param>
+        /// <returns>
+        /// Returns details about the point and its distance away from the path.
+        /// </returns>
+        PointInfo Distance(PointF point);
+
         /// <summary>
         /// Returns information about a point at a given distance along a path.
         /// </summary>

src/ImageSharp.Drawing/Shapes/Path.cs

@@ -89,7 +89,7 @@ public Path(params ILineSegment[] segments)
             this.innerPath ??= new InternalPath(this.lineSegments, this.IsClosed, this.RemoveCloseAndCollinearPoints);
 
         /// <inheritdoc />
-        public PointInfo Distance(PointF point)
+        PointInfo IPathInternals.Distance(PointF point)
         {
             PointInfo dist = this.InnerPath.DistanceFromPath(point);
 

src/ImageSharp.Drawing/Shapes/RectangularPolygon.cs

@@ -307,14 +307,8 @@ SegmentInfo IPathInternals.PointAlongPath(float distance)
             }
         }
 
-        /// <summary>
-        /// Calculates the distance along and away from the path for a specified point.
-        /// </summary>
-        /// <param name="point">The point along the path.</param>
-        /// <returns>
-        /// Returns details about the point and its distance away from the path.
-        /// </returns>
-        public PointInfo Distance(PointF point)
+        /// <inheritdoc/>
+        PointInfo IPathInternals.Distance(PointF point)
         {
             Vector2 vectorPoint = point;
 

tests/ImageSharp.Drawing.Tests/Shapes/PathTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Linq;
@@ -56,7 +56,7 @@ public void Bounds()
         [MemberData(nameof(PathDistanceTheoryData))]
         public void DistanceFromPath_Path(TestPoint point, float expectedDistance, float alongPath)
         {
-            var path = new Path(new LinearLineSegment(new PointF(0, 0), new PointF(10, 0), new PointF(10, 10), new PointF(0, 10)));
+            IPathInternals path = new Path(new LinearLineSegment(new PointF(0, 0), new PointF(10, 0), new PointF(10, 10), new PointF(0, 10)));
             PointInfo info = path.Distance(point);
             Assert.Equal(expectedDistance, info.DistanceFromPath);
             Assert.Equal(alongPath, info.DistanceAlongPath);

tests/ImageSharp.Drawing.Tests/Shapes/PolygonTests.cs

@@ -69,7 +69,7 @@ public void PointInPolygon(TestPoint[] controlPoints, TestPoint point, bool isIn
         [MemberData(nameof(DistanceTheoryData))]
         public void Distance(TestPoint[] controlPoints, TestPoint point, float expected)
         {
-            var shape = new Polygon(new LinearLineSegment(controlPoints.Select(x => (PointF)x).ToArray()));
+            IPathInternals shape = new Polygon(new LinearLineSegment(controlPoints.Select(x => (PointF)x).ToArray()));
             Assert.Equal(expected, shape.Distance(point).DistanceFromPath);
         }
 
@@ -104,7 +104,7 @@ public void Distance(TestPoint[] controlPoints, TestPoint point, float expected)
         [MemberData(nameof(PathDistanceTheoryData))]
         public void DistanceFromPath_Path(TestPoint point, float expectedDistance, float alongPath)
         {
-            IPath path = new Polygon(new LinearLineSegment(new PointF(0, 0), new PointF(10, 0), new PointF(10, 10), new PointF(0, 10)));
+            IPathInternals path = new Polygon(new LinearLineSegment(new PointF(0, 0), new PointF(10, 0), new PointF(10, 10), new PointF(0, 10)));
             PointInfo info = path.Distance(point);
             Assert.Equal(expectedDistance, info.DistanceFromPath);
             Assert.Equal(alongPath, info.DistanceAlongPath);

tests/ImageSharp.Drawing.Tests/Shapes/RectangleTests.cs

@@ -112,7 +112,7 @@ public void PointInPolygon(TestPoint location, TestSize size, TestPoint point, b
         [MemberData(nameof(DistanceTheoryData))]
         public void Distance(TestPoint location, TestSize size, TestPoint point, float expectecDistance)
         {
-            IPath shape = new RectangularPolygon(location, size);
+            IPathInternals shape = new RectangularPolygon(location, size);
 
             Assert.Equal(expectecDistance, shape.Distance(point).DistanceFromPath);
         }
@@ -121,7 +121,7 @@ public void Distance(TestPoint location, TestSize size, TestPoint point, float e
         [MemberData(nameof(PathDistanceTheoryData))]
         public void DistanceFromPath_Path(TestPoint point, float expectecDistance, float alongPath)
         {
-            IPath shape = new RectangularPolygon(0, 0, 10, 10);
+            IPathInternals shape = new RectangularPolygon(0, 0, 10, 10);
             PointInfo info = shape.Distance(point);
             Assert.Equal(expectecDistance, info.DistanceFromPath);
             Assert.Equal(alongPath, info.DistanceAlongPath);