Merge branch 'develop' into feature/point_order

Author: awulkiew

include/boost/geometry/algorithms/line_interpolate.hpp

@@ -3,6 +3,7 @@
 // Copyright (c) 2018, 2019 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -34,7 +35,7 @@ namespace boost { namespace geometry
 
 
 #ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace interpolate_point
+namespace detail { namespace line_interpolate
 {
 
 struct convert_and_push_back
@@ -64,7 +65,7 @@ struct convert_and_assign
     specified strategy
 */
 template <typename Policy>
-struct range
+struct interpolate_range
 {
     template
     <
@@ -141,20 +142,20 @@ struct range
 };
 
 template <typename Policy>
-struct segment
+struct interpolate_segment
 {
     template <typename Segment, typename Distance, typename Pointlike, typename Strategy>
     static inline void apply(Segment const& segment,
                              Distance const& max_distance,
                              Pointlike & point,
                              Strategy const& strategy)
     {
-        range<Policy>().apply(segment_view<Segment>(segment),
-                              max_distance, point, strategy);
+        interpolate_range<Policy>().apply(segment_view<Segment>(segment),
+                                          max_distance, point, strategy);
     }
 };
 
-}} // namespace detail::length
+}} // namespace detail::line_interpolate
 #endif // DOXYGEN_NO_DETAIL
 
 
@@ -182,33 +183,33 @@ struct line_interpolate
 
 template <typename Geometry, typename Pointlike>
 struct line_interpolate<Geometry, Pointlike, linestring_tag, point_tag>
-    : detail::interpolate_point::range
+    : detail::line_interpolate::interpolate_range
         <
-            detail::interpolate_point::convert_and_assign
+            detail::line_interpolate::convert_and_assign
         >
 {};
 
 template <typename Geometry, typename Pointlike>
 struct line_interpolate<Geometry, Pointlike, linestring_tag, multi_point_tag>
-    : detail::interpolate_point::range
+    : detail::line_interpolate::interpolate_range
         <
-            detail::interpolate_point::convert_and_push_back
+            detail::line_interpolate::convert_and_push_back
         >
 {};
 
 template <typename Geometry, typename Pointlike>
 struct line_interpolate<Geometry, Pointlike, segment_tag, point_tag>
-    : detail::interpolate_point::segment
+    : detail::line_interpolate::interpolate_segment
         <
-            detail::interpolate_point::convert_and_assign
+            detail::line_interpolate::convert_and_assign
         >
 {};
 
 template <typename Geometry, typename Pointlike>
 struct line_interpolate<Geometry, Pointlike, segment_tag, multi_point_tag>
-    : detail::interpolate_point::segment
+    : detail::line_interpolate::interpolate_segment
         <
-            detail::interpolate_point::convert_and_push_back
+            detail::line_interpolate::convert_and_push_back
         >
 {};
 

test/algorithms/line_interpolate.cpp

@@ -54,14 +54,19 @@ struct check_points<P, bg::multi_point_tag>
         typedef typename boost::range_iterator<Range const>::type iterator_t;
         typedef typename boost::range_value<Range const>::type point_t;
 
-        BOOST_CHECK_EQUAL(boost::size(r0), boost::size(r1));
+        std::size_t count0 = boost::size(r0);
+        std::size_t count1 = boost::size(r1);
 
-        for (iterator_t it0 = boost::begin(r0), it1 = boost::begin(r1);
-             it0 < boost::end(r0); it0++, it1++)
+        BOOST_CHECK_MESSAGE(count0 == count1, bg::wkt(r0) << " != " << bg::wkt(r1));
+        
+        if (count0 == count1)
         {
-            check_points<point_t>::apply(*it0, *it1);
+            for (iterator_t it0 = boost::begin(r0), it1 = boost::begin(r1);
+                 it0 < boost::end(r0); it0++, it1++)
+            {
+                check_points<point_t>::apply(*it0, *it1);
+            }
         }
-
     }
 };
 
@@ -351,7 +356,7 @@ int test_main(int, char* [])
     test_sph();
     test_sph(bg::strategy::line_interpolate::spherical<>(100));
 
-    typedef typename bg::srs::spheroid<double> stype;
+    typedef bg::srs::spheroid<double> stype;
 
     test_geo(bg::strategy::line_interpolate::geographic<bg::strategy::andoyer>());
     test_geo(bg::strategy::line_interpolate::geographic<bg::strategy::thomas>());