diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/denoy.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/denoy.hpp | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/boost/geometry/srs/projections/proj/denoy.hpp b/boost/geometry/srs/projections/proj/denoy.hpp index afedae8734..9d54487f6f 100644 --- a/boost/geometry/srs/projections/proj/denoy.hpp +++ b/boost/geometry/srs/projections/proj/denoy.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP -#define BOOST_GEOMETRY_PROJECTIONS_DENOY_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_DENOY_HPP +#define BOOST_GEOMETRY_PROJECTIONS_DENOY_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> @@ -62,36 +61,31 @@ namespace projections { static const double C0 = 0.95; - //static const double C1 = -.08333333333333333333; - //static const double C3 = .00166666666666666666; + //static const double C1 = -0.08333333333333333333; + //static const double C3 = 0.00166666666666666666; static const double D1 = 0.9; static const double D5 = 0.03; template <typename T> - inline T C1() { return -.0833333333333333333333333333333; } + inline T C1() { return -0.0833333333333333333333333333333; } template <typename T> - inline T C3() { return .0016666666666666666666666666666; } + inline T C3() { return 0.0016666666666666666666666666666; } // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_denoy_spheroid : public base_t_f<base_denoy_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_denoy_spheroid + : public base_t_f<base_denoy_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - inline base_denoy_spheroid(const Parameters& par) - : base_t_f<base_denoy_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_f<base_denoy_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 { - static const CalculationType C1 = denoy::C1<CalculationType>(); - static const CalculationType C3 = denoy::C3<CalculationType>(); + static const T C1 = denoy::C1<T>(); + static const T C3 = denoy::C3<T>(); xy_y = lp_lat; xy_x = lp_lon; @@ -111,7 +105,7 @@ namespace projections template <typename Parameters> inline void setup_denoy(Parameters& par) { - par.es = 0.; + par.es = 0.0; } }} // namespace detail::denoy @@ -130,10 +124,10 @@ namespace projections \par Example \image html ex_denoy.gif */ - template <typename CalculationType, typename Parameters> - struct denoy_spheroid : public detail::denoy::base_denoy_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct denoy_spheroid : public detail::denoy::base_denoy_spheroid<T, Parameters> { - inline denoy_spheroid(const Parameters& par) : detail::denoy::base_denoy_spheroid<CalculationType, Parameters>(par) + inline denoy_spheroid(const Parameters& par) : detail::denoy::base_denoy_spheroid<T, Parameters>(par) { detail::denoy::setup_denoy(this->m_par); } @@ -147,20 +141,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::denoy, denoy_spheroid, denoy_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class denoy_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class denoy_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_f<denoy_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_f<denoy_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void denoy_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void denoy_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("denoy", new denoy_entry<CalculationType, Parameters>); + factory.add_to_factory("denoy", new denoy_entry<T, Parameters>); } } // namespace detail |