diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/putp6.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/putp6.hpp | 102 |
1 files changed, 45 insertions, 57 deletions
diff --git a/boost/geometry/srs/projections/proj/putp6.hpp b/boost/geometry/srs/projections/proj/putp6.hpp index 2dff641717..19ca6cc76d 100644 --- a/boost/geometry/srs/projections/proj/putp6.hpp +++ b/boost/geometry/srs/projections/proj/putp6.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_PUTP6_HPP -#define BOOST_GEOMETRY_PROJECTIONS_PUTP6_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,7 +37,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#include <boost/core/ignore_unused.hpp> +#ifndef BOOST_GEOMETRY_PROJECTIONS_PUTP6_HPP +#define BOOST_GEOMETRY_PROJECTIONS_PUTP6_HPP #include <boost/geometry/srs/projections/impl/base_static.hpp> #include <boost/geometry/srs/projections/impl/base_dynamic.hpp> @@ -54,8 +51,8 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct putp6 {}; - struct putp6p {}; + struct putp6 {}; // Putnins P6 + struct putp6p {}; // Putnins P6' }} //namespace srs::par4 @@ -65,8 +62,8 @@ namespace projections namespace detail { namespace putp6 { - static const double EPS = 1e-10; - static const int NITER = 10; + static const double epsilon = 1e-10; + static const int n_iter = 10; static const double CON_POLE = 1.732050807568877; template <typename T> @@ -76,34 +73,30 @@ namespace projections }; // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_putp6_spheroid : public base_t_fi<base_putp6_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_putp6_spheroid + : public base_t_fi<base_putp6_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - par_putp6<CalculationType> m_proj_parm; + par_putp6<T> m_proj_parm; inline base_putp6_spheroid(const Parameters& par) - : base_t_fi<base_putp6_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_putp6_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 { - CalculationType p, r, V; + T p, r, V; int i; p = this->m_proj_parm.B * sin(lp_lat); lp_lat *= 1.10265779; - for (i = NITER; i ; --i) { + for (i = n_iter; i ; --i) { r = sqrt(1. + lp_lat * lp_lat); lp_lat -= V = ( (this->m_proj_parm.A - r) * lp_lat - log(lp_lat + r) - p ) / (this->m_proj_parm.A - 2. * r); - if (fabs(V) < EPS) + if (fabs(V) < epsilon) break; } if (!i) @@ -114,9 +107,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 r; + T r; lp_lat = xy_y / this->m_proj_parm.C_y; r = sqrt(1. + lp_lat * lp_lat); @@ -130,14 +123,7 @@ namespace projections } }; - - template <typename Parameters, typename T> - inline void setup(Parameters& par, par_putp6<T>& proj_parm) - { - boost::ignore_unused(proj_parm); - par.es = 0.; - } - + // Putnins P6 template <typename Parameters, typename T> @@ -148,7 +134,8 @@ namespace projections proj_parm.A = 4.; proj_parm.B = 2.1471437182129378784; proj_parm.D = 2.; - setup(par, proj_parm); + + par.es = 0.; } // Putnins P6' @@ -160,7 +147,8 @@ namespace projections proj_parm.A = 6.; proj_parm.B = 5.61125; proj_parm.D = 3.; - setup(par, proj_parm); + + par.es = 0.; } }} // namespace detail::putp6 @@ -178,10 +166,10 @@ namespace projections \par Example \image html ex_putp6.gif */ - template <typename CalculationType, typename Parameters> - struct putp6_spheroid : public detail::putp6::base_putp6_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct putp6_spheroid : public detail::putp6::base_putp6_spheroid<T, Parameters> { - inline putp6_spheroid(const Parameters& par) : detail::putp6::base_putp6_spheroid<CalculationType, Parameters>(par) + inline putp6_spheroid(const Parameters& par) : detail::putp6::base_putp6_spheroid<T, Parameters>(par) { detail::putp6::setup_putp6(this->m_par, this->m_proj_parm); } @@ -199,10 +187,10 @@ namespace projections \par Example \image html ex_putp6p.gif */ - template <typename CalculationType, typename Parameters> - struct putp6p_spheroid : public detail::putp6::base_putp6_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct putp6p_spheroid : public detail::putp6::base_putp6_spheroid<T, Parameters> { - inline putp6p_spheroid(const Parameters& par) : detail::putp6::base_putp6_spheroid<CalculationType, Parameters>(par) + inline putp6p_spheroid(const Parameters& par) : detail::putp6::base_putp6_spheroid<T, Parameters>(par) { detail::putp6::setup_putp6p(this->m_par, this->m_proj_parm); } @@ -217,31 +205,31 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::putp6p, putp6p_spheroid, putp6p_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class putp6_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class putp6_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<putp6_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<putp6_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - class putp6p_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class putp6p_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<putp6p_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<putp6p_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void putp6_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void putp6_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("putp6", new putp6_entry<CalculationType, Parameters>); - factory.add_to_factory("putp6p", new putp6p_entry<CalculationType, Parameters>); + factory.add_to_factory("putp6", new putp6_entry<T, Parameters>); + factory.add_to_factory("putp6p", new putp6p_entry<T, Parameters>); } } // namespace detail |