diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/collg.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/collg.hpp | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/boost/geometry/srs/projections/proj/collg.hpp b/boost/geometry/srs/projections/proj/collg.hpp index 0bc347a305..1dc5b3ce48 100644 --- a/boost/geometry/srs/projections/proj/collg.hpp +++ b/boost/geometry/srs/projections/proj/collg.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_COLLG_HPP -#define BOOST_GEOMETRY_PROJECTIONS_COLLG_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_COLLG_HPP +#define BOOST_GEOMETRY_PROJECTIONS_COLLG_HPP + #include <boost/geometry/util/math.hpp> #include <boost/geometry/srs/projections/impl/base_static.hpp> @@ -65,25 +64,20 @@ namespace projections static const double FXC = 1.12837916709551257390; static const double FYC = 1.77245385090551602729; - static const double ONEEPS = 1.0000001; + static const double one_plus_eps = 1.0000001; // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_collg_spheroid : public base_t_fi<base_collg_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_collg_spheroid + : public base_t_fi<base_collg_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - inline base_collg_spheroid(const Parameters& par) - : base_t_fi<base_collg_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_collg_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 { if ((xy_y = 1. - sin(lp_lat)) <= 0.) xy_y = 0.; @@ -95,15 +89,19 @@ 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 { + static T const half_pi = detail::half_pi<T>(); + lp_lat = xy_y / FYC - 1.; if (fabs(lp_lat = 1. - lp_lat * lp_lat) < 1.) lp_lat = asin(lp_lat); - else if (fabs(lp_lat) > ONEEPS) - BOOST_THROW_EXCEPTION( projection_exception(-20) ); - else - lp_lat = lp_lat < 0. ? -geometry::math::half_pi<double>() : geometry::math::half_pi<double>(); + else if (fabs(lp_lat) > one_plus_eps) { + BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) ); + } else { + lp_lat = lp_lat < 0. ? -half_pi : half_pi; + } + if ((lp_lon = 1. - sin(lp_lat)) <= 0.) lp_lon = 0.; else @@ -139,10 +137,10 @@ namespace projections \par Example \image html ex_collg.gif */ - template <typename CalculationType, typename Parameters> - struct collg_spheroid : public detail::collg::base_collg_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct collg_spheroid : public detail::collg::base_collg_spheroid<T, Parameters> { - inline collg_spheroid(const Parameters& par) : detail::collg::base_collg_spheroid<CalculationType, Parameters>(par) + inline collg_spheroid(const Parameters& par) : detail::collg::base_collg_spheroid<T, Parameters>(par) { detail::collg::setup_collg(this->m_par); } @@ -156,20 +154,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::collg, collg_spheroid, collg_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class collg_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class collg_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<collg_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<collg_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void collg_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void collg_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("collg", new collg_entry<CalculationType, Parameters>); + factory.add_to_factory("collg", new collg_entry<T, Parameters>); } } // namespace detail |