diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/putp2.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/putp2.hpp | 73 |
1 files changed, 34 insertions, 39 deletions
diff --git a/boost/geometry/srs/projections/proj/putp2.hpp b/boost/geometry/srs/projections/proj/putp2.hpp index 458ee81aa3..181afe5086 100644 --- a/boost/geometry/srs/projections/proj/putp2.hpp +++ b/boost/geometry/srs/projections/proj/putp2.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_PUTP2_HPP -#define BOOST_GEOMETRY_PROJECTIONS_PUTP2_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_PUTP2_HPP +#define BOOST_GEOMETRY_PROJECTIONS_PUTP2_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 putp2 {}; + struct putp2 {}; // Putnins P2 }} //namespace srs::par4 @@ -65,55 +64,51 @@ namespace projections static const double C_x = 1.89490; static const double C_y = 1.71848; static const double C_p = 0.6141848493043784; - static const double EPS = 1e-10; - static const int NITER = 10; - //static const double PI_DIV_3 = 1.0471975511965977; + static const double epsilon = 1e-10; + static const int n_iter = 10; + //static const double third_pi = 1.0471975511965977; // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_putp2_spheroid : public base_t_fi<base_putp2_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_putp2_spheroid + : public base_t_fi<base_putp2_spheroid<T, Parameters>, T, Parameters> { - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - inline base_putp2_spheroid(const Parameters& par) - : base_t_fi<base_putp2_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_putp2_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 PI_DIV_3 = detail::PI_DIV_3<CalculationType>(); + static const T third_pi = detail::third_pi<T>(); - CalculationType p, c, s, V; + T p, c, s, V; int i; p = C_p * sin(lp_lat); s = lp_lat * lp_lat; lp_lat *= 0.615709 + s * ( 0.00909953 + s * 0.0046292 ); - for (i = NITER; i ; --i) { + for (i = n_iter; i ; --i) { c = cos(lp_lat); s = sin(lp_lat); lp_lat -= V = (lp_lat + s * (c - 1.) - p) / (1. + c * (c - 1.) - s * s); - if (fabs(V) < EPS) + if (fabs(V) < epsilon) break; } if (!i) - lp_lat = lp_lat < 0 ? - PI_DIV_3 : PI_DIV_3; + lp_lat = lp_lat < 0 ? - third_pi : third_pi; xy_x = C_x * lp_lon * (cos(lp_lat) - 0.5); xy_y = C_y * sin(lp_lat); } // 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 c; + T c; lp_lat = aasin(xy_y / C_y); lp_lon = xy_x / (C_x * ((c = cos(lp_lat)) - 0.5)); @@ -149,10 +144,10 @@ namespace projections \par Example \image html ex_putp2.gif */ - template <typename CalculationType, typename Parameters> - struct putp2_spheroid : public detail::putp2::base_putp2_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct putp2_spheroid : public detail::putp2::base_putp2_spheroid<T, Parameters> { - inline putp2_spheroid(const Parameters& par) : detail::putp2::base_putp2_spheroid<CalculationType, Parameters>(par) + inline putp2_spheroid(const Parameters& par) : detail::putp2::base_putp2_spheroid<T, Parameters>(par) { detail::putp2::setup_putp2(this->m_par); } @@ -166,20 +161,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::putp2, putp2_spheroid, putp2_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class putp2_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class putp2_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<putp2_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<putp2_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void putp2_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void putp2_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("putp2", new putp2_entry<CalculationType, Parameters>); + factory.add_to_factory("putp2", new putp2_entry<T, Parameters>); } } // namespace detail |