-#ifndef BOOST_GEOMETRY_PROJECTIONS_WINK2_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_WINK2_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,
// 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:
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
+#ifndef BOOST_GEOMETRY_PROJECTIONS_WINK2_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_WINK2_HPP
+
#include <boost/geometry/util/math.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>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_param.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry
{
-namespace srs { namespace par4
-{
- struct wink2 {};
-
-}} //namespace srs::par4
-
namespace projections
{
#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace wink2
{
- static const int MAX_ITER = 10;
-
- static const double LOOP_TOL = 1e-7;
- //static const double TWO_D_PI = 0.636619772367581343;
+ static const int max_iter = 10;
+ static const double loop_tol = 1e-7;
template <typename T>
struct par_wink2
T cosphi1;
};
- // template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_wink2_spheroid : public base_t_f<base_wink2_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_wink2_spheroid
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
- par_wink2<CalculationType> m_proj_parm;
-
- inline base_wink2_spheroid(const Parameters& par)
- : base_t_f<base_wink2_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>(*this, par) {}
+ par_wink2<T> m_proj_parm;
// 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 lp_lat, T& xy_x, T& xy_y) const
{
- static const CalculationType ONEPI = detail::ONEPI<CalculationType>();
- static const CalculationType HALFPI = detail::HALFPI<CalculationType>();
- static const CalculationType FORTPI = detail::FORTPI<CalculationType>();
- static const CalculationType TWO_D_PI = detail::TWO_D_PI<CalculationType>();
+ static const T pi = detail::pi<T>();
+ static const T half_pi = detail::half_pi<T>();
+ static const T fourth_pi = detail::fourth_pi<T>();
+ static const T two_div_pi = detail::two_div_pi<T>();
- CalculationType k, V;
+ T k, V;
int i;
- xy_y = lp_lat * TWO_D_PI;
- k = ONEPI * sin(lp_lat);
+ xy_y = lp_lat * two_div_pi;
+ k = pi * sin(lp_lat);
lp_lat *= 1.8;
- for (i = MAX_ITER; i ; --i) {
+ for (i = max_iter; i ; --i) {
lp_lat -= V = (lp_lat + sin(lp_lat) - k) /
(1. + cos(lp_lat));
- if (fabs(V) < LOOP_TOL)
+ if (fabs(V) < loop_tol)
break;
}
if (!i)
- lp_lat = (lp_lat < 0.) ? -HALFPI : HALFPI;
+ lp_lat = (lp_lat < 0.) ? -half_pi : half_pi;
else
lp_lat *= 0.5;
xy_x = 0.5 * lp_lon * (cos(lp_lat) + this->m_proj_parm.cosphi1);
- xy_y = FORTPI * (sin(lp_lat) + xy_y);
+ xy_y = fourth_pi * (sin(lp_lat) + xy_y);
}
static inline std::string get_name()
};
// Winkel II
- template <typename Parameters, typename T>
- inline void setup_wink2(Parameters& par, par_wink2<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_wink2(Params const& params, Parameters& par, par_wink2<T>& proj_parm)
{
- proj_parm.cosphi1 = cos(pj_param(par.params, "rlat_1").f);
+ proj_parm.cosphi1 = cos(pj_get_param_r<T, srs::spar::lat_1>(params, "lat_1", srs::dpar::lat_1));
par.es = 0.;
}
\par Example
\image html ex_wink2.gif
*/
- template <typename CalculationType, typename Parameters>
- struct wink2_spheroid : public detail::wink2::base_wink2_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct wink2_spheroid : public detail::wink2::base_wink2_spheroid<T, Parameters>
{
- inline wink2_spheroid(const Parameters& par) : detail::wink2::base_wink2_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline wink2_spheroid(Params const& params, Parameters & par)
{
- detail::wink2::setup_wink2(this->m_par, this->m_proj_parm);
+ detail::wink2::setup_wink2(params, par, this->m_proj_parm);
}
};
{
// Static projection
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::wink2, wink2_spheroid, wink2_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_wink2, wink2_spheroid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class wink2_entry : public detail::factory_entry<CalculationType, Parameters>
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(wink2_entry, wink2_spheroid)
+
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(wink2_init)
{
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_f<wink2_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- inline void wink2_init(detail::base_factory<CalculationType, Parameters>& factory)
- {
- factory.add_to_factory("wink2", new wink2_entry<CalculationType, Parameters>);
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(wink2, wink2_entry)
}
-
+
} // namespace detail
#endif // doxygen
projects / ceph.git / blobdiff