1 files changed, 26 insertions, 15 deletions

diff --git a/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
index c249ff57ff..2a374bf0b0 100644
--- a/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+++ b/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -2,12 +2,14 @@
 
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014-2017, 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
 
-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_FOLLOW_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_FOLLOW_LINEAR_LINEAR_HPP
@@ -183,7 +185,8 @@ protected:
         typename TurnIterator,
         typename TurnOperationIterator,
         typename SegmentIdentifier,
-        typename OutputIterator
+        typename OutputIterator,
+        typename SideStrategy
     >
     static inline OutputIterator
     process_turn(TurnIterator it,
@@ -193,7 +196,8 @@ protected:
                  Linestring const& linestring,
                  LinestringOut& current_piece,
                  SegmentIdentifier& current_segment_id,
-                 OutputIterator oit)
+                 OutputIterator oit,
+                 SideStrategy const& strategy)
     {
         // We don't rescale linear/linear
         detail::no_rescale_policy robust_policy;
@@ -208,7 +212,7 @@ protected:
                 action::enter(current_piece, linestring,
                               current_segment_id,
                               op_it->seg_id.segment_index,
-                              it->point, *op_it, robust_policy, oit);
+                              it->point, *op_it, strategy, robust_policy, oit);
             }
             ++enter_count;
         }
@@ -223,7 +227,7 @@ protected:
                 action::leave(current_piece, linestring,
                               current_segment_id,
                               op_it->seg_id.segment_index,
-                              it->point, *op_it, robust_policy, oit);
+                              it->point, *op_it, strategy, robust_policy, oit);
             }
         }
         else if ( FollowIsolatedPoints
@@ -249,14 +253,16 @@ protected:
     template
     <
         typename SegmentIdentifier,
-        typename OutputIterator
+        typename OutputIterator,
+        typename SideStrategy
     >
     static inline OutputIterator
     process_end(bool entered,
                 Linestring const& linestring,
                 SegmentIdentifier const& current_segment_id,
                 LinestringOut& current_piece,
-                OutputIterator oit)
+                OutputIterator oit,
+                SideStrategy const& strategy)
     {
         if ( action::is_entered(entered) )
         {
@@ -269,6 +275,7 @@ protected:
                 >::apply(linestring,
                          current_segment_id,
                          static_cast<signed_size_type>(boost::size(linestring) - 1),
+                         strategy,
                          robust_policy,
                          current_piece);
         }
@@ -283,11 +290,12 @@ protected:
     }
 
 public:
-    template <typename TurnIterator, typename OutputIterator>
+    template <typename TurnIterator, typename OutputIterator, typename SideStrategy>
     static inline OutputIterator
     apply(Linestring const& linestring, Linear const&,
           TurnIterator first, TurnIterator beyond,
-          OutputIterator oit)
+          OutputIterator oit,
+          SideStrategy const& strategy)
     {
         // Iterate through all intersection points (they are
         // ordered along the each line)
@@ -304,7 +312,8 @@ public:
                                entered, enter_count, 
                                linestring,
                                current_piece, current_segment_id,
-                               oit);
+                               oit,
+                               strategy);
         }
 
 #if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
@@ -318,7 +327,8 @@ public:
 
         return process_end(entered, linestring,
                            current_segment_id, current_piece,
-                           oit);
+                           oit,
+                           strategy);
     }
 };
 
@@ -413,11 +423,12 @@ protected:
     };
 
 public:
-    template <typename TurnIterator, typename OutputIterator>
+    template <typename TurnIterator, typename OutputIterator, typename SideStrategy>
     static inline OutputIterator
     apply(MultiLinestring const& multilinestring, Linear const& linear,
           TurnIterator first, TurnIterator beyond,
-          OutputIterator oit)
+          OutputIterator oit,
+          SideStrategy const& strategy)
     {
         BOOST_GEOMETRY_ASSERT( first != beyond );
 
@@ -447,7 +458,7 @@ public:
                                        has_other_multi_id(current_multi_id));
 
             oit = Base::apply(*(ls_first + current_multi_id),
-                              linear, per_ls_current, per_ls_next, oit);
+                              linear, per_ls_current, per_ls_next, oit, strategy);
 
             signed_size_type next_multi_id = -1;
             linestring_iterator ls_next = ls_beyond;