Imported Upstream version 1.65.0upstream/1.65.0

Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 47 insertions, 9 deletions

diff --git a/boost/geometry/algorithms/point_on_surface.hpp b/boost/geometry/algorithms/point_on_surface.hpp
index e9041f937b..3f4d0f4afe 100644
--- a/boost/geometry/algorithms/point_on_surface.hpp
+++ b/boost/geometry/algorithms/point_on_surface.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
 // Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014.
-// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014, 2017.
+// Modifications copyright (c) 2014-2017 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -33,6 +33,7 @@
 #include <boost/geometry/algorithms/detail/extreme_points.hpp>
 
 #include <boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp>
+#include <boost/geometry/strategies/side.hpp>
 
 
 namespace boost { namespace geometry
@@ -241,8 +242,9 @@ inline void replace_extremes_for_self_tangencies(Extremes& extremes, Intruders&
     extremes = triangle;
 }
 
-template <int Dimension, typename Geometry, typename Point>
-inline bool calculate_point_on_surface(Geometry const& geometry, Point& point)
+template <int Dimension, typename Geometry, typename Point, typename SideStrategy>
+inline bool calculate_point_on_surface(Geometry const& geometry, Point& point,
+                                       SideStrategy const& strategy)
 {
     typedef typename geometry::point_type<Geometry>::type point_type;
     typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
@@ -250,7 +252,7 @@ inline bool calculate_point_on_surface(Geometry const& geometry, Point& point)
 
     typedef std::vector<std::vector<point_type> > intruders_type;
     intruders_type intruders;
-    geometry::extreme_points<Dimension>(geometry, extremes, intruders);
+    geometry::extreme_points<Dimension>(geometry, extremes, intruders, strategy);
 
     if (extremes.size() < 3)
     {
@@ -291,22 +293,58 @@ inline bool calculate_point_on_surface(Geometry const& geometry, Point& point)
 \tparam Geometry geometry type. This also defines the type of the output point
 \param geometry Geometry to take point from
 \param point Point to assign
+\param strategy side strategy
  */
-template <typename Geometry, typename Point>
-inline void point_on_surface(Geometry const& geometry, Point & point)
+template <typename Geometry, typename Point, typename SideStrategy>
+inline void point_on_surface(Geometry const& geometry, Point & point,
+                             SideStrategy const& strategy)
 {
     concepts::check<Point>();
     concepts::check<Geometry const>();
 
     // First try in Y-direction (which should always succeed for valid polygons)
-    if (! detail::point_on_surface::calculate_point_on_surface<1>(geometry, point))
+    if (! detail::point_on_surface::calculate_point_on_surface<1>(geometry, point, strategy))
     {
         // For invalid polygons, we might try X-direction
-        detail::point_on_surface::calculate_point_on_surface<0>(geometry, point);
+        detail::point_on_surface::calculate_point_on_surface<0>(geometry, point, strategy);
     }
 }
 
 /*!
+\brief Assigns a Point guaranteed to lie on the surface of the Geometry
+\tparam Geometry geometry type. This also defines the type of the output point
+\param geometry Geometry to take point from
+\param point Point to assign
+ */
+template <typename Geometry, typename Point>
+inline void point_on_surface(Geometry const& geometry, Point & point)
+{
+    typedef typename strategy::side::services::default_strategy
+        <
+            typename cs_tag<Geometry>::type
+        >::type strategy_type;
+
+    point_on_surface(geometry, point, strategy_type());
+}
+
+
+/*!
+\brief Returns point guaranteed to lie on the surface of the Geometry
+\tparam Geometry geometry type. This also defines the type of the output point
+\param geometry Geometry to take point from
+\param strategy side strategy
+\return The Point guaranteed to lie on the surface of the Geometry
+ */
+template<typename Geometry, typename SideStrategy>
+inline typename geometry::point_type<Geometry>::type
+return_point_on_surface(Geometry const& geometry, SideStrategy const& strategy)
+{
+    typename geometry::point_type<Geometry>::type result;
+    geometry::point_on_surface(geometry, result, strategy);
+    return result;
+}
+
+/*!
 \brief Returns point guaranteed to lie on the surface of the Geometry
 \tparam Geometry geometry type. This also defines the type of the output point
 \param geometry Geometry to take point from