diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/mbt_fps.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/mbt_fps.hpp | 72 |
1 files changed, 33 insertions, 39 deletions
diff --git a/boost/geometry/srs/projections/proj/mbt_fps.hpp b/boost/geometry/srs/projections/proj/mbt_fps.hpp index 3823725f1c..130590f8e5 100644 --- a/boost/geometry/srs/projections/proj/mbt_fps.hpp +++ b/boost/geometry/srs/projections/proj/mbt_fps.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_MBT_FPS_HPP -#define BOOST_GEOMETRY_PROJECTIONS_MBT_FPS_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. +// Modifications copyright (c) 2017-2018, 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_MBT_FPS_HPP +#define BOOST_GEOMETRY_PROJECTIONS_MBT_FPS_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> @@ -52,7 +51,7 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct mbt_fps {}; + struct mbt_fps {}; // McBryde-Thomas Flat-Pole Sine (No. 2) }} //namespace srs::par4 @@ -62,8 +61,8 @@ namespace projections namespace detail { namespace mbt_fps { - 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; static const double C1 = 0.45503; static const double C2 = 1.36509; static const double C3 = 1.41546; @@ -72,37 +71,32 @@ namespace projections //static const double C1_2 = 0.33333333333333333333333333; template <typename T> - inline T C1_2() { return detail::THIRD<T>(); } + inline T C1_2() { return detail::third<T>(); } // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_mbt_fps_spheroid : public base_t_fi<base_mbt_fps_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_mbt_fps_spheroid + : public base_t_fi<base_mbt_fps_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - inline base_mbt_fps_spheroid(const Parameters& par) - : base_t_fi<base_mbt_fps_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_mbt_fps_spheroid<T, Parameters>, T, 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(T& lp_lon, T& lp_lat, T& xy_x, T& xy_y) const { - static const CalculationType C1_2 = mbt_fps::C1_2<CalculationType>(); + static const T C1_2 = mbt_fps::C1_2<T>(); - CalculationType k, V, t; + T k, V, t; int i; k = C3 * sin(lp_lat); - for (i = MAX_ITER; i ; --i) { + for (i = max_iter; i ; --i) { t = lp_lat / C2; lp_lat -= V = (C1 * sin(t) + sin(lp_lat) - k) / (C1_2 * cos(t) + cos(lp_lat)); - if (fabs(V) < LOOP_TOL) + if (fabs(V) < loop_tol) break; } t = lp_lat / C2; @@ -112,9 +106,9 @@ 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(T& xy_x, T& xy_y, T& lp_lon, T& lp_lat) const { - CalculationType t; + T t; lp_lat = C2 * (t = aasin(xy_y / C_y)); lp_lon = xy_x / (C_x * (1. + 3. * cos(lp_lat)/cos(t))); @@ -150,10 +144,10 @@ namespace projections \par Example \image html ex_mbt_fps.gif */ - template <typename CalculationType, typename Parameters> - struct mbt_fps_spheroid : public detail::mbt_fps::base_mbt_fps_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct mbt_fps_spheroid : public detail::mbt_fps::base_mbt_fps_spheroid<T, Parameters> { - inline mbt_fps_spheroid(const Parameters& par) : detail::mbt_fps::base_mbt_fps_spheroid<CalculationType, Parameters>(par) + inline mbt_fps_spheroid(const Parameters& par) : detail::mbt_fps::base_mbt_fps_spheroid<T, Parameters>(par) { detail::mbt_fps::setup_mbt_fps(this->m_par); } @@ -167,20 +161,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::mbt_fps, mbt_fps_spheroid, mbt_fps_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class mbt_fps_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class mbt_fps_entry : public detail::factory_entry<T, Parameters> { public : - virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const + virtual base_v<T, Parameters>* create_new(const Parameters& par) const { - return new base_v_fi<mbt_fps_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<mbt_fps_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void mbt_fps_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void mbt_fps_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("mbt_fps", new mbt_fps_entry<CalculationType, Parameters>); + factory.add_to_factory("mbt_fps", new mbt_fps_entry<T, Parameters>); } } // namespace detail |