diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/tcea.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/tcea.hpp | 76 |
1 files changed, 31 insertions, 45 deletions
diff --git a/boost/geometry/srs/projections/proj/tcea.hpp b/boost/geometry/srs/projections/proj/tcea.hpp index b87574e947..3eafcc262a 100644 --- a/boost/geometry/srs/projections/proj/tcea.hpp +++ b/boost/geometry/srs/projections/proj/tcea.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_TCEA_HPP -#define BOOST_GEOMETRY_PROJECTIONS_TCEA_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_TCEA_HPP +#define BOOST_GEOMETRY_PROJECTIONS_TCEA_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> @@ -51,7 +50,7 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct tcea {}; + struct tcea {}; // Transverse Cylindrical Equal Area }} //namespace srs::par4 @@ -60,42 +59,30 @@ namespace projections #ifndef DOXYGEN_NO_DETAIL namespace detail { namespace tcea { - template <typename T> - struct par_tcea - { - T rk0; - }; - // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_tcea_spheroid : public base_t_fi<base_tcea_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_tcea_spheroid + : public base_t_fi<base_tcea_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - par_tcea<CalculationType> m_proj_parm; - inline base_tcea_spheroid(const Parameters& par) - : base_t_fi<base_tcea_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_tcea_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 { - xy_x = this->m_proj_parm.rk0 * cos(lp_lat) * sin(lp_lon); + xy_x = cos(lp_lat) * sin(lp_lon) / this->m_par.k0; xy_y = this->m_par.k0 * (atan2(tan(lp_lat), cos(lp_lon)) - this->m_par.phi0); } // 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; - xy_y = xy_y * this->m_proj_parm.rk0 + this->m_par.phi0; + xy_y = xy_y / this->m_par.k0 + this->m_par.phi0; xy_x *= this->m_par.k0; t = sqrt(1. - xy_x * xy_x); lp_lat = asin(t * sin(xy_y)); @@ -110,10 +97,9 @@ namespace projections }; // Transverse Cylindrical Equal Area - template <typename Parameters, typename T> - inline void setup_tcea(Parameters& par, par_tcea<T>& proj_parm) + template <typename Parameters> + inline void setup_tcea(Parameters& par) { - proj_parm.rk0 = 1 / par.k0; par.es = 0.; } @@ -132,12 +118,12 @@ namespace projections \par Example \image html ex_tcea.gif */ - template <typename CalculationType, typename Parameters> - struct tcea_spheroid : public detail::tcea::base_tcea_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct tcea_spheroid : public detail::tcea::base_tcea_spheroid<T, Parameters> { - inline tcea_spheroid(const Parameters& par) : detail::tcea::base_tcea_spheroid<CalculationType, Parameters>(par) + inline tcea_spheroid(const Parameters& par) : detail::tcea::base_tcea_spheroid<T, Parameters>(par) { - detail::tcea::setup_tcea(this->m_par, this->m_proj_parm); + detail::tcea::setup_tcea(this->m_par); } }; @@ -149,20 +135,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::tcea, tcea_spheroid, tcea_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class tcea_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class tcea_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<tcea_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<tcea_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void tcea_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void tcea_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("tcea", new tcea_entry<CalculationType, Parameters>); + factory.add_to_factory("tcea", new tcea_entry<T, Parameters>); } } // namespace detail |