// Boost.Geometry (aka GGL, Generic Geometry Library)
-// Copyright (c) 2014, Oracle and/or its affiliates.
+// Copyright (c) 2014-2021, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Licensed under the Boost Software License version 1.0.
// http://www.boost.org/users/license.html
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_LINEAR_TO_LINEAR_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_LINEAR_TO_LINEAR_HPP
-#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp>
+#include <boost/geometry/algorithms/detail/distance/strategy_utils.hpp>
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/algorithms/num_segments.hpp>
-#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/iterators/point_iterator.hpp>
#include <boost/geometry/iterators/segment_iterator.hpp>
-#include <boost/geometry/algorithms/num_points.hpp>
-#include <boost/geometry/algorithms/num_segments.hpp>
-
-#include <boost/geometry/algorithms/dispatch/distance.hpp>
-
-#include <boost/geometry/algorithms/detail/distance/range_to_geometry_rtree.hpp>
+#include <boost/geometry/strategies/distance.hpp>
namespace boost { namespace geometry
{
-template <typename Linear1, typename Linear2, typename Strategy>
+template <typename Linear1, typename Linear2, typename Strategies>
struct linear_to_linear
{
- typedef typename strategy::distance::services::return_type
- <
- Strategy,
- typename point_type<Linear1>::type,
- typename point_type<Linear2>::type
- >::type return_type;
+ typedef distance::return_t<Linear1, Linear2, Strategies> return_type;
static inline return_type apply(Linear1 const& linear1,
Linear2 const& linear2,
- Strategy const& strategy,
+ Strategies const& strategies,
bool = false)
{
if (geometry::num_points(linear1) == 1)
<
typename point_type<Linear1>::type,
Linear2,
- Strategy
- >::apply(*points_begin(linear1), linear2, strategy);
+ Strategies
+ >::apply(*points_begin(linear1), linear2, strategies);
}
if (geometry::num_points(linear2) == 1)
<
typename point_type<Linear2>::type,
Linear1,
- Strategy
- >::apply(*points_begin(linear2), linear1, strategy);
+ Strategies
+ >::apply(*points_begin(linear2), linear1, strategies);
}
if (geometry::num_segments(linear2) < geometry::num_segments(linear1))
<
geometry::segment_iterator<Linear2 const>,
Linear1,
- Strategy
+ Strategies
>::apply(geometry::segments_begin(linear2),
geometry::segments_end(linear2),
linear1,
- strategy);
+ strategies);
}
<
geometry::segment_iterator<Linear1 const>,
Linear2,
- Strategy
+ Strategies
>::apply(geometry::segments_begin(linear1),
geometry::segments_end(linear1),
linear2,
- strategy);
+ strategies);
}
};
namespace dispatch
{
-template <typename Linear1, typename Linear2, typename Strategy>
+template <typename Linear1, typename Linear2, typename Strategy, typename StrategyTag>
struct distance
<
Linear1, Linear2, Strategy,
linear_tag, linear_tag,
- strategy_tag_distance_point_segment, false
+ StrategyTag, false
> : detail::distance::linear_to_linear
<
Linear1, Linear2, Strategy