diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/wink1.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/wink1.hpp | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/boost/geometry/srs/projections/proj/wink1.hpp b/boost/geometry/srs/projections/proj/wink1.hpp index 36ecc95500..5fdd739629 100644 --- a/boost/geometry/srs/projections/proj/wink1.hpp +++ b/boost/geometry/srs/projections/proj/wink1.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_WINK1_HPP -#define BOOST_GEOMETRY_PROJECTIONS_WINK1_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_WINK1_HPP +#define BOOST_GEOMETRY_PROJECTIONS_WINK1_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 wink1 {}; + struct wink1 {}; // Winkel I }} //namespace srs::par4 @@ -68,23 +67,19 @@ namespace projections }; // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_wink1_spheroid : public base_t_fi<base_wink1_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_wink1_spheroid + : public base_t_fi<base_wink1_spheroid<T, Parameters>, T, Parameters> { - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - par_wink1<CalculationType> m_proj_parm; + par_wink1<T> m_proj_parm; inline base_wink1_spheroid(const Parameters& par) - : base_t_fi<base_wink1_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_wink1_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 = .5 * lp_lon * (this->m_proj_parm.cosphi1 + cos(lp_lat)); xy_y = lp_lat; @@ -92,7 +87,7 @@ 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 { lp_lat = xy_y; lp_lon = 2. * xy_x / (this->m_proj_parm.cosphi1 + cos(lp_lat)); @@ -109,7 +104,7 @@ namespace projections template <typename Parameters, typename T> inline void setup_wink1(Parameters& par, par_wink1<T>& proj_parm) { - proj_parm.cosphi1 = cos(pj_param(par.params, "rlat_ts").f); + proj_parm.cosphi1 = cos(pj_get_param_r(par.params, "lat_ts")); par.es = 0.; } @@ -130,10 +125,10 @@ namespace projections \par Example \image html ex_wink1.gif */ - template <typename CalculationType, typename Parameters> - struct wink1_spheroid : public detail::wink1::base_wink1_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct wink1_spheroid : public detail::wink1::base_wink1_spheroid<T, Parameters> { - inline wink1_spheroid(const Parameters& par) : detail::wink1::base_wink1_spheroid<CalculationType, Parameters>(par) + inline wink1_spheroid(const Parameters& par) : detail::wink1::base_wink1_spheroid<T, Parameters>(par) { detail::wink1::setup_wink1(this->m_par, this->m_proj_parm); } @@ -147,20 +142,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::wink1, wink1_spheroid, wink1_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class wink1_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class wink1_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<wink1_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<wink1_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void wink1_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void wink1_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("wink1", new wink1_entry<CalculationType, Parameters>); + factory.add_to_factory("wink1", new wink1_entry<T, Parameters>); } } // namespace detail |