X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Fboost%2Fgeometry%2Fsrs%2Fprojections%2Fproj%2Fmoll.hpp;h=e00bb2c760ff30cc44126934cb53ad19f76cc36f;hb=92f5a8d42d07f9929ae4fa7e01342fe8d96808a8;hp=6f02c7dea03793c7f921fa57537bec09a54ad8ae;hpb=a0324939f9d0e1905d5df8f57442f09dc70af83d;p=ceph.git diff --git a/ceph/src/boost/boost/geometry/srs/projections/proj/moll.hpp b/ceph/src/boost/boost/geometry/srs/projections/proj/moll.hpp index 6f02c7dea..e00bb2c76 100644 --- a/ceph/src/boost/boost/geometry/srs/projections/proj/moll.hpp +++ b/ceph/src/boost/boost/geometry/srs/projections/proj/moll.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_MOLL_HPP -#define BOOST_GEOMETRY_PROJECTIONS_MOLL_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_MOLL_HPP +#define BOOST_GEOMETRY_PROJECTIONS_MOLL_HPP + #include #include @@ -52,22 +51,14 @@ namespace boost { namespace geometry { -namespace srs { namespace par4 -{ - struct moll {}; - struct wag4 {}; - struct wag5 {}; - -}} //namespace srs::par4 - namespace projections { #ifndef DOXYGEN_NO_DETAIL namespace detail { namespace moll { - static const int MAX_ITER = 10; - static const double LOOP_TOL = 1e-7; + static const int max_iter = 10; + static const double loop_tol = 1e-7; template struct par_moll @@ -75,39 +66,29 @@ namespace projections T C_x, C_y, C_p; }; - // template class, using CRTP to implement forward/inverse - template - struct base_moll_spheroid : public base_t_fi, - CalculationType, Parameters> + template + struct base_moll_spheroid { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - par_moll m_proj_parm; - - inline base_moll_spheroid(const Parameters& par) - : base_t_fi, - CalculationType, Parameters>(*this, par) {} + par_moll 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 HALFPI = detail::HALFPI(); + static const T half_pi = detail::half_pi(); - CalculationType k, V; + T k, V; int i; k = this->m_proj_parm.C_p * sin(lp_lat); - 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 = this->m_proj_parm.C_x * lp_lon * cos(lp_lat); @@ -116,12 +97,18 @@ namespace projections // 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 const& xy_y, T& lp_lon, T& lp_lat) const { + static const T pi = detail::pi(); + lp_lat = aasin(xy_y / this->m_proj_parm.C_y); lp_lon = xy_x / (this->m_proj_parm.C_x * cos(lp_lat)); - lp_lat += lp_lat; - lp_lat = aasin((lp_lat + sin(lp_lat)) / this->m_proj_parm.C_p); + if (fabs(lp_lon) < pi) { + lp_lat += lp_lat; + lp_lat = aasin((lp_lat + sin(lp_lat)) / this->m_proj_parm.C_p); + } else { + lp_lon = lp_lat = HUGE_VAL; + } } static inline std::string get_name() @@ -139,6 +126,7 @@ namespace projections par.es = 0; sp = sin(p); r = sqrt(geometry::math::two_pi() * sp / (p2 + sin(p2))); + proj_parm.C_x = 2. * r / geometry::math::pi(); proj_parm.C_y = r / sp; proj_parm.C_p = p2 + sin(p2); @@ -184,12 +172,13 @@ namespace projections \par Example \image html ex_moll.gif */ - template - struct moll_spheroid : public detail::moll::base_moll_spheroid + template + struct moll_spheroid : public detail::moll::base_moll_spheroid { - inline moll_spheroid(const Parameters& par) : detail::moll::base_moll_spheroid(par) + template + inline moll_spheroid(Params const& , Parameters & par) { - detail::moll::setup_moll(this->m_par, this->m_proj_parm); + detail::moll::setup_moll(par, this->m_proj_parm); } }; @@ -205,12 +194,13 @@ namespace projections \par Example \image html ex_wag4.gif */ - template - struct wag4_spheroid : public detail::moll::base_moll_spheroid + template + struct wag4_spheroid : public detail::moll::base_moll_spheroid { - inline wag4_spheroid(const Parameters& par) : detail::moll::base_moll_spheroid(par) + template + inline wag4_spheroid(Params const& , Parameters & par) { - detail::moll::setup_wag4(this->m_par, this->m_proj_parm); + detail::moll::setup_wag4(par, this->m_proj_parm); } }; @@ -226,12 +216,13 @@ namespace projections \par Example \image html ex_wag5.gif */ - template - struct wag5_spheroid : public detail::moll::base_moll_spheroid + template + struct wag5_spheroid : public detail::moll::base_moll_spheroid { - inline wag5_spheroid(const Parameters& par) : detail::moll::base_moll_spheroid(par) + template + inline wag5_spheroid(Params const& , Parameters & par) { - detail::moll::setup_wag5(this->m_par, this->m_proj_parm); + detail::moll::setup_wag5(par, this->m_proj_parm); } }; @@ -240,47 +231,20 @@ namespace projections { // Static projection - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::moll, moll_spheroid, moll_spheroid) - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::wag4, wag4_spheroid, wag4_spheroid) - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::wag5, wag5_spheroid, wag5_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_moll, moll_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_wag4, wag4_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_wag5, wag5_spheroid) // Factory entry(s) - template - class moll_entry : public detail::factory_entry - { - public : - virtual base_v* create_new(const Parameters& par) const - { - return new base_v_fi, CalculationType, Parameters>(par); - } - }; - - template - class wag4_entry : public detail::factory_entry - { - public : - virtual base_v* create_new(const Parameters& par) const - { - return new base_v_fi, CalculationType, Parameters>(par); - } - }; - - template - class wag5_entry : public detail::factory_entry - { - public : - virtual base_v* create_new(const Parameters& par) const - { - return new base_v_fi, CalculationType, Parameters>(par); - } - }; - - template - inline void moll_init(detail::base_factory& factory) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(moll_entry, moll_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(wag4_entry, wag4_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(wag5_entry, wag5_spheroid) + + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(moll_init) { - factory.add_to_factory("moll", new moll_entry); - factory.add_to_factory("wag4", new wag4_entry); - factory.add_to_factory("wag5", new wag5_entry); + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(moll, moll_entry); + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(wag4, wag4_entry); + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(wag5, wag5_entry); } } // namespace detail