diff options
Diffstat (limited to 'boost/geometry/strategies/spherical/intersection.hpp')
-rw-r--r-- | boost/geometry/strategies/spherical/intersection.hpp | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/boost/geometry/strategies/spherical/intersection.hpp b/boost/geometry/strategies/spherical/intersection.hpp index b5ae878b85..1cc7b20764 100644 --- a/boost/geometry/strategies/spherical/intersection.hpp +++ b/boost/geometry/strategies/spherical/intersection.hpp @@ -1,5 +1,7 @@ // Boost.Geometry +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. + // Copyright (c) 2016-2017, Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle @@ -118,7 +120,7 @@ struct ecef_segments { typedef area::spherical < - typename point_type<Geometry>::type, + typename coordinate_type<Geometry>::type, CalculationType > type; }; @@ -161,38 +163,12 @@ struct ecef_segments template <typename CoordinateType, typename SegmentRatio, typename Vector3d> struct segment_intersection_info { - typedef typename select_most_precise - < - CoordinateType, double - >::type promoted_type; - segment_intersection_info(CalcPolicy const& calc) : calc_policy(calc) {} - promoted_type comparable_length_a() const - { - return robust_ra.denominator(); - } - - promoted_type comparable_length_b() const - { - return robust_rb.denominator(); - } - - template <typename Point, typename Segment1, typename Segment2> - void assign_a(Point& point, Segment1 const& a, Segment2 const& b) const - { - assign(point, a, b); - } - template <typename Point, typename Segment1, typename Segment2> - void assign_b(Point& point, Segment1 const& a, Segment2 const& b) const - { - assign(point, a, b); - } - template <typename Point, typename Segment1, typename Segment2> - void assign(Point& point, Segment1 const& a, Segment2 const& b) const + void calculate(Point& point, Segment1 const& a, Segment2 const& b) const { if (ip_flag == ipi_inters) { |