Move projections from extensions.

extensions/test/gis/Jamfile.v2

@@ -5,11 +5,14 @@
 # Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 # Copyright (c) 2015 Adam Wulkiewicz, Lodz, Poland.
 #
+# This file was modified by Oracle on 2017.
+# Modifications copyright (c) 2017, Oracle and/or its affiliates.
+# 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
 # http://www.boost.org/LICENSE_1_0.txt)
 
 build-project io ;
 build-project latlong ;
-build-project projections ;
 

include/boost/geometry/algorithms/convert.hpp

@@ -5,6 +5,10 @@
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 // Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2017.
+// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -29,10 +33,8 @@
 
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
-#include <boost/geometry/algorithms/append.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
 #include <boost/geometry/algorithms/for_each.hpp>
-#include <boost/geometry/algorithms/detail/assign_values.hpp>
 #include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
@@ -153,7 +155,23 @@ struct range_to_range
             geometry::closure<Range1>::value
         >::type view_type;
 
+    struct default_policy
+    {
+        template <typename Point1, typename Point2>
+        static inline void apply(Point1 const& point1, Point2 & point2)
+        {
+            geometry::detail::conversion::convert_point_to_point(point1, point2);
+        }
+    };
+
     static inline void apply(Range1 const& source, Range2& destination)
+    {
+        apply(source, destination, default_policy());
+    }
+
+    template <typename ConvertPointPolicy>
+    static inline ConvertPointPolicy apply(Range1 const& source, Range2& destination,
+                                           ConvertPointPolicy convert_point)
     {
         geometry::clear(destination);
 
@@ -179,8 +197,12 @@ struct range_to_range
             it != boost::end(view) && i < n;
             ++it, ++i)
         {
-            geometry::append(destination, *it);
+            typename boost::range_value<Range2>::type point;
+            convert_point.apply(*it, point);
+            range::push_back(destination, point);
         }
+
+        return convert_point;
     }
 };
 

include/boost/geometry/algorithms/detail/azimuth.hpp

@@ -15,18 +15,22 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_AZIMUTH_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_AZIMUTH_HPP
 
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/radian_access.hpp>
 #include <boost/geometry/core/tags.hpp>
 
-#include <boost/geometry/util/math.hpp>
-
-#include <boost/geometry/algorithms/not_implemented.hpp>
-
 #include <boost/geometry/formulas/spherical.hpp>
 #include <boost/geometry/formulas/vincenty_inverse.hpp>
 
+#include <boost/geometry/srs/spheroid.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+
 namespace boost { namespace geometry
 {
 

include/boost/geometry/algorithms/detail/envelope/segment.hpp

@@ -27,7 +27,6 @@
 #include <boost/geometry/core/coordinate_system.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/core/srs.hpp>
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/radian_access.hpp>
 #include <boost/geometry/core/tags.hpp>

include/boost/geometry/core/radius.hpp

@@ -223,8 +223,8 @@ template <typename Geometry, std::size_t Dimension>
 struct radius_access<srs_sphere_tag, Geometry, Dimension, boost::false_type>
     : detail::radius_access<srs_sphere_tag, Geometry, Dimension>
 {
-    BOOST_STATIC_ASSERT(Dimension == 0);
-    //BOOST_STATIC_ASSERT(Dimension < 3);
+    //BOOST_STATIC_ASSERT(Dimension == 0);
+    BOOST_STATIC_ASSERT(Dimension < 3);
 };
 
 template <typename Geometry>
@@ -237,8 +237,8 @@ template <typename Geometry, std::size_t Dimension>
 struct radius_access<srs_spheroid_tag, Geometry, Dimension, boost::false_type>
     : detail::radius_access<srs_spheroid_tag, Geometry, Dimension>
 {
-    BOOST_STATIC_ASSERT(Dimension == 0 || Dimension == 2);
-    //BOOST_STATIC_ASSERT(Dimension < 3);
+    //BOOST_STATIC_ASSERT(Dimension == 0 || Dimension == 2);
+    BOOST_STATIC_ASSERT(Dimension < 3);
 };
 
 } // namespace core_dispatch