diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/geocent.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/geocent.hpp | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/boost/geometry/srs/projections/proj/geocent.hpp b/boost/geometry/srs/projections/proj/geocent.hpp index bfcbb145fa..92fd8e1070 100644 --- a/boost/geometry/srs/projections/proj/geocent.hpp +++ b/boost/geometry/srs/projections/proj/geocent.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_GEOCENT_HPP -#define BOOST_GEOMETRY_PROJECTIONS_GEOCENT_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,13 +15,13 @@ // 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: // Purpose: Stub projection for geocentric. The transformation isn't -// really done here since this code is 2D. The real transformation -// is handled by pj_transform.c. +// really done here since this code is 2D. The real transformation +// is handled by pj_transform.c. // Author: Frank Warmerdam, warmerdam@pobox.com // Copyright (c) 2002, Frank Warmerdam @@ -47,6 +43,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +#ifndef BOOST_GEOMETRY_PROJECTIONS_GEOCENT_HPP +#define BOOST_GEOMETRY_PROJECTIONS_GEOCENT_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> @@ -57,7 +56,7 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct geocent {}; + struct geocent {}; // Geocentric }} //namespace srs::par4 @@ -68,22 +67,17 @@ namespace projections { // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_geocent_other : public base_t_fi<base_geocent_other<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_geocent_other + : public base_t_fi<base_geocent_other<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - inline base_geocent_other(const Parameters& par) - : base_t_fi<base_geocent_other<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_geocent_other<T, Parameters>, T, Parameters>(*this, par) + {} // FORWARD(forward) // 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 = lp_lon; xy_y = lp_lat; @@ -91,7 +85,7 @@ namespace projections // INVERSE(inverse) // 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 = xy_x; @@ -125,10 +119,10 @@ namespace projections \par Example \image html ex_geocent.gif */ - template <typename CalculationType, typename Parameters> - struct geocent_other : public detail::geocent::base_geocent_other<CalculationType, Parameters> + template <typename T, typename Parameters> + struct geocent_other : public detail::geocent::base_geocent_other<T, Parameters> { - inline geocent_other(const Parameters& par) : detail::geocent::base_geocent_other<CalculationType, Parameters>(par) + inline geocent_other(const Parameters& par) : detail::geocent::base_geocent_other<T, Parameters>(par) { detail::geocent::setup_geocent(this->m_par); } @@ -142,20 +136,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::geocent, geocent_other, geocent_other) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class geocent_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class geocent_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<geocent_other<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<geocent_other<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void geocent_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void geocent_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("geocent", new geocent_entry<CalculationType, Parameters>); + factory.add_to_factory("geocent", new geocent_entry<T, Parameters>); } } // namespace detail |