diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/urmfps.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/urmfps.hpp | 83 |
1 files changed, 39 insertions, 44 deletions
diff --git a/boost/geometry/srs/projections/proj/urmfps.hpp b/boost/geometry/srs/projections/proj/urmfps.hpp index 14840057dc..d4b303ba37 100644 --- a/boost/geometry/srs/projections/proj/urmfps.hpp +++ b/boost/geometry/srs/projections/proj/urmfps.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_URMFPS_HPP -#define BOOST_GEOMETRY_PROJECTIONS_URMFPS_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_URMFPS_HPP +#define BOOST_GEOMETRY_PROJECTIONS_URMFPS_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,8 +51,8 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct urmfps {}; - struct wag1 {}; + struct urmfps {}; // Urmaev Flat-Polar Sinusoidal + struct wag1 {}; // Wagner I (Kavraisky VI) }} //namespace srs::par4 @@ -73,23 +72,19 @@ namespace projections }; // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_urmfps_spheroid : public base_t_fi<base_urmfps_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_urmfps_spheroid + : public base_t_fi<base_urmfps_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - par_urmfps<CalculationType> m_proj_parm; + par_urmfps<T> m_proj_parm; inline base_urmfps_spheroid(const Parameters& par) - : base_t_fi<base_urmfps_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_urmfps_spheroid<T, Parameters>, T, Parameters>(*this, par) + {} // FORWARD(s_forward) sphere // 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 { lp_lat = aasin(this->m_proj_parm.n * sin(lp_lat)); xy_x = C_x * lp_lon * cos(lp_lat); @@ -98,7 +93,7 @@ namespace projections // INVERSE(s_inverse) sphere // 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 { xy_y /= this->m_proj_parm.C_y; lp_lat = aasin(sin(xy_y) / this->m_proj_parm.n); @@ -124,12 +119,12 @@ namespace projections template <typename Parameters, typename T> inline void setup_urmfps(Parameters& par, par_urmfps<T>& proj_parm) { - if (pj_param(par.params, "tn").i) { - proj_parm.n = pj_param(par.params, "dn").f; + if (pj_param_f(par.params, "n", proj_parm.n)) { if (proj_parm.n <= 0. || proj_parm.n > 1.) - BOOST_THROW_EXCEPTION( projection_exception(-40) ); + BOOST_THROW_EXCEPTION( projection_exception(error_n_out_of_range) ); } else - BOOST_THROW_EXCEPTION( projection_exception(-40) ); + BOOST_THROW_EXCEPTION( projection_exception(error_n_out_of_range) ); + setup(par, proj_parm); } @@ -158,10 +153,10 @@ namespace projections \par Example \image html ex_urmfps.gif */ - template <typename CalculationType, typename Parameters> - struct urmfps_spheroid : public detail::urmfps::base_urmfps_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct urmfps_spheroid : public detail::urmfps::base_urmfps_spheroid<T, Parameters> { - inline urmfps_spheroid(const Parameters& par) : detail::urmfps::base_urmfps_spheroid<CalculationType, Parameters>(par) + inline urmfps_spheroid(const Parameters& par) : detail::urmfps::base_urmfps_spheroid<T, Parameters>(par) { detail::urmfps::setup_urmfps(this->m_par, this->m_proj_parm); } @@ -179,10 +174,10 @@ namespace projections \par Example \image html ex_wag1.gif */ - template <typename CalculationType, typename Parameters> - struct wag1_spheroid : public detail::urmfps::base_urmfps_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct wag1_spheroid : public detail::urmfps::base_urmfps_spheroid<T, Parameters> { - inline wag1_spheroid(const Parameters& par) : detail::urmfps::base_urmfps_spheroid<CalculationType, Parameters>(par) + inline wag1_spheroid(const Parameters& par) : detail::urmfps::base_urmfps_spheroid<T, Parameters>(par) { detail::urmfps::setup_wag1(this->m_par, this->m_proj_parm); } @@ -197,31 +192,31 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::wag1, wag1_spheroid, wag1_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class urmfps_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class urmfps_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<urmfps_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<urmfps_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - class wag1_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class wag1_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<wag1_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<wag1_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void urmfps_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void urmfps_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("urmfps", new urmfps_entry<CalculationType, Parameters>); - factory.add_to_factory("wag1", new wag1_entry<CalculationType, Parameters>); + factory.add_to_factory("urmfps", new urmfps_entry<T, Parameters>); + factory.add_to_factory("wag1", new wag1_entry<T, Parameters>); } } // namespace detail |