Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / geometry / srs / projections / proj / isea.hpp

diff --git a/boost/geometry/srs/projections/proj/isea.hpp b/boost/geometry/srs/projections/proj/isea.hpp
index d8a4804..f1b887a 100644 (file)
--- a/boost/geometry/srs/projections/proj/isea.hpp
+++ b/boost/geometry/srs/projections/proj/isea.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017, 2018.
-// Modifications copyright (c) 2017-2018, 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,
@@ -207,17 +207,17 @@ namespace projections
 
             template <typename T>
             struct isea_dgg {
-                //isea_poly         polyhedron; /* ignored, icosahedron */
                 T                 o_lat, o_lon, o_az; /* orientation, radians */
-                int               pole; /* true if standard snyder */
-                //isea_topology     topology; /* ignored, hexagon */
+                T                 radius; /* radius of the earth in meters, ignored 1.0 */
+                unsigned long     serial;
+                //int               pole; /* true if standard snyder */
                 int               aperture; /* valid values depend on partitioning method */
                 int               resolution;
-                T                 radius; /* radius of the earth in meters, ignored 1.0 */
-                isea_address_form output; /* an isea_address_form */
                 int               triangle; /* triangle of last transformed point */
                 int               quad; /* quad of last transformed point */
-                unsigned long     serial;
+                //isea_poly         polyhedron; /* ignored, icosahedron */
+                //isea_topology     topology; /* ignored, hexagon */
+                isea_address_form output; /* an isea_address_form */
             };
 
             template <typename T>
@@ -232,9 +232,9 @@ namespace projections
 
             template <typename T>
             struct isea_address {
+                T      x,y; /* or i,j or lon,lat depending on type */
                 int    type; /* enum isea_address_form */
                 int    number;
-                T      x,y; /* or i,j or lon,lat depending on type */
             };
 
             /* ENDINC */
@@ -1114,20 +1114,14 @@ namespace projections
                 isea_dgg<T> dgg;
             };
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_isea_spheroid
-                : public base_t_f<base_isea_spheroid<T, Parameters>, T, Parameters>
             {
                 par_isea<T> m_proj_parm;
 
-                inline base_isea_spheroid(const Parameters& par)
-                    : base_t_f<base_isea_spheroid<T, Parameters>, T, Parameters>(*this, par)
-                {}
-
                 // FORWARD(s_forward)
                 // Project coordinates from geographic (lon, lat) to cartesian (x, y)
-                inline void fwd(T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
+                inline void fwd(Parameters const& , T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
                 {
                     isea_pt<T> out;
                     isea_geo<T> in;
@@ -1294,8 +1288,7 @@ namespace projections
     struct isea_spheroid : public detail::isea::base_isea_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline isea_spheroid(Params const& params, Parameters const& par)
-            : detail::isea::base_isea_spheroid<T, Parameters>(par)
+        inline isea_spheroid(Params const& params, Parameters const& )
         {
             detail::isea::setup_isea(params, this->m_proj_parm);
         }
@@ -1306,7 +1299,7 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_isea, isea_spheroid, isea_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_isea, isea_spheroid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(isea_entry, isea_spheroid)