Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/LineHelper.cs
===================================================================
diff -u -r5982 -r6087
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/LineHelper.cs (.../LineHelper.cs) (revision 5982)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/LineHelper.cs (.../LineHelper.cs) (revision 6087)
@@ -35,7 +35,7 @@
///
///
///
- public static bool DetermineStrictIntersectionPoint(Line line1, Line line2, ref GeometryPoint intersectPoint)
+ public static bool DetermineStrictIntersectionPoint(Line line1, Line line2, ref Point2D intersectPoint)
{
var point1 = new Point2D(line1.BeginPoint.X, line1.BeginPoint.Z);
var point2 = new Point2D(line1.EndPoint.X, line1.EndPoint.Z);
@@ -54,38 +54,14 @@
return res == LineIntersection.Intersects;
}
- public static GeometryPoint DetermineIntersectionPointWithExtrapolation(GeometryPoint p1, GeometryPoint p2, GeometryPoint p3, GeometryPoint p4)
+ public static Point2D DetermineIntersectionPointWithExtrapolation(Point2D p1, Point2D p2, Point2D p3, Point2D p4)
{
- return IntersectionPointWithExtrapolation(p1, p2, p3, p4);
+ Point2D intersectPoint = null;
+ Routines2D.DetermineIf2DLinesIntersectWithExtrapolation(p1, p2, p3, p4, out intersectPoint);
+ return intersectPoint;
}
///
- /// Determines the intersection point of two lines, allowing the intersection point being extrapolated.
- ///
- ///
- ///
- ///
- ///
- /// Intersection point or null (parallel lines)
- private static GeometryPoint IntersectionPointWithExtrapolation(GeometryPoint p1, GeometryPoint p2, GeometryPoint p3, GeometryPoint p4)
- {
- GeometryPoint intersectPoint = null;
-
- var point1 = new Point2D(p1.X, p1.Z);
- var point2 = new Point2D(p2.X, p2.Z);
- var point3 = new Point2D(p3.X, p3.Z);
- var point4 = new Point2D(p4.X, p4.Z);
-
- Routines2D.DetermineIf2DLinesIntersectWithExtrapolation(point1, point2, point3, point4, out Point2D ip);
- if (ip != null)
- {
- intersectPoint = new GeometryPoint(ip.X, ip.Z);
- }
-
- return intersectPoint;
- }
-
- ///
/// Deletes the duplicated points.
///
/// List of points