import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / srs / projections / proj / fahey.hpp

diff --git a/ceph/src/boost/boost/geometry/srs/projections/proj/fahey.hpp b/ceph/src/boost/boost/geometry/srs/projections/proj/fahey.hpp
index 8ea43ee94bd996aa21f21c5fb51e790a972fb6d3..e143436f921163b0bb00390908ffa844f8b674e4 100644 (file)
--- a/ceph/src/boost/boost/geometry/srs/projections/proj/fahey.hpp
+++ b/ceph/src/boost/boost/geometry/srs/projections/proj/fahey.hpp
@@ -1,13 +1,9 @@
-#ifndef BOOST_GEOMETRY_PROJECTIONS_FAHEY_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_FAHEY_HPP
-
-// Boost.Geometry - extensions-gis-projections (based on PROJ4)
-// This file is automatically generated. DO NOT EDIT.
+// Boost.Geometry - gis-projections (based on PROJ4)
 
 // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017.
-// Modifications copyright (c) 2017, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017, 2018, 2019.
+// Modifications copyright (c) 2017-2019, 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,
@@ -19,7 +15,7 @@
 // PROJ4 is maintained by Frank Warmerdam
 // PROJ4 is converted to Boost.Geometry by Barend Gehrels
 
-// Last updated version of proj: 4.9.1
+// Last updated version of proj: 5.0.0
 
 // Original copyright notice:
 
@@ -41,6 +37,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+#ifndef BOOST_GEOMETRY_PROJECTIONS_FAHEY_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_FAHEY_HPP
+
 #include <boost/geometry/srs/projections/impl/base_static.hpp>
 #include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
 #include <boost/geometry/srs/projections/impl/projects.hpp>
@@ -50,49 +49,34 @@
 namespace boost { namespace geometry
 {
 
-namespace srs { namespace par4
-{
-    struct fahey {};
-
-}} //namespace srs::par4
-
 namespace projections
 {
     #ifndef DOXYGEN_NO_DETAIL
     namespace detail { namespace fahey
     {
 
-            static const double TOL = 1e-6;
+            static const double tolerance = 1e-6;
 
-            // template class, using CRTP to implement forward/inverse
-            template <typename CalculationType, typename Parameters>
-            struct base_fahey_spheroid : public base_t_fi<base_fahey_spheroid<CalculationType, Parameters>,
-                     CalculationType, Parameters>
+            template <typename T, typename Parameters>
+            struct base_fahey_spheroid
             {
-
-                typedef CalculationType geographic_type;
-                typedef CalculationType cartesian_type;
-
-
-                inline base_fahey_spheroid(const Parameters& par)
-                    : base_t_fi<base_fahey_spheroid<CalculationType, Parameters>,
-                     CalculationType, Parameters>(*this, par) {}
-
                 // FORWARD(s_forward)  spheroid
                 // Project coordinates from geographic (lon, lat) to cartesian (x, y)
-                inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
+                inline void fwd(Parameters const& , T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
                 {
-                    xy_y = 1.819152 * ( xy_x = tan(0.5 * lp_lat) );
+                    xy_x = tan(0.5 * lp_lat);
+                    xy_y = 1.819152 * xy_x;
                     xy_x = 0.819152 * lp_lon * asqrt(1 - xy_x * xy_x);
                 }
 
                 // INVERSE(s_inverse)  spheroid
                 // Project coordinates from cartesian (x, y) to geographic (lon, lat)
-                inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
+                inline void inv(Parameters const& , T const& xy_x, T xy_y, T& lp_lon, T& lp_lat) const
                 {
-                    lp_lat = 2. * atan(xy_y /= 1.819152);
-                    lp_lon = fabs(xy_y = 1. - xy_y * xy_y) < TOL ? 0. :
-                        xy_x / (0.819152 * sqrt(xy_y));
+                    xy_y /= 1.819152;
+                    lp_lat = 2. * atan(xy_y);
+                    xy_y = 1. - xy_y * xy_y;
+                    lp_lon = fabs(xy_y) < tolerance ? 0. : xy_x / (0.819152 * sqrt(xy_y));
                 }
 
                 static inline std::string get_name()
@@ -124,12 +108,13 @@ namespace projections
         \par Example
         \image html ex_fahey.gif
     */
-    template <typename CalculationType, typename Parameters>
-    struct fahey_spheroid : public detail::fahey::base_fahey_spheroid<CalculationType, Parameters>
+    template <typename T, typename Parameters>
+    struct fahey_spheroid : public detail::fahey::base_fahey_spheroid<T, Parameters>
     {
-        inline fahey_spheroid(const Parameters& par) : detail::fahey::base_fahey_spheroid<CalculationType, Parameters>(par)
+        template <typename Params>
+        inline fahey_spheroid(Params const& , Parameters & par)
         {
-            detail::fahey::setup_fahey(this->m_par);
+            detail::fahey::setup_fahey(par);
         }
     };
 
@@ -138,23 +123,14 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::fahey, fahey_spheroid, fahey_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_fahey, fahey_spheroid)
 
         // Factory entry(s)
-        template <typename CalculationType, typename Parameters>
-        class fahey_entry : public detail::factory_entry<CalculationType, Parameters>
-        {
-            public :
-                virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
-                {
-                    return new base_v_fi<fahey_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
-                }
-        };
-
-        template <typename CalculationType, typename Parameters>
-        inline void fahey_init(detail::base_factory<CalculationType, Parameters>& factory)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(fahey_entry, fahey_spheroid)
+        
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(fahey_init)
         {
-            factory.add_to_factory("fahey", new fahey_entry<CalculationType, Parameters>);
+            BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(fahey, fahey_entry);
         }
 
     } // namespace detail