diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/latlong.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/latlong.hpp | 126 |
1 files changed, 62 insertions, 64 deletions
diff --git a/boost/geometry/srs/projections/proj/latlong.hpp b/boost/geometry/srs/projections/proj/latlong.hpp index e806381f2d..4c2d00a805 100644 --- a/boost/geometry/srs/projections/proj/latlong.hpp +++ b/boost/geometry/srs/projections/proj/latlong.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_LATLONG_HPP -#define BOOST_GEOMETRY_PROJECTIONS_LATLONG_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 implementation for lat/long coordinates. We -// don't actually change the coordinates, but we want proj=latlong -// to act sort of like a projection. +// don't actually change the coordinates, but we want proj=latlong +// to act sort of like a projection. // Author: Frank Warmerdam, warmerdam@pobox.com // Copyright (c) 2000, 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_LATLONG_HPP +#define BOOST_GEOMETRY_PROJECTIONS_LATLONG_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> @@ -58,10 +57,10 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct lonlat {}; - struct latlon {}; - struct latlong {}; - struct longlat {}; + struct lonlat {}; // Lat/long (Geodetic) + struct latlon {}; // Lat/long (Geodetic alias) + struct latlong {}; // Lat/long (Geodetic alias) + struct longlat {}; // Lat/long (Geodetic alias) }} //namespace srs::par4 @@ -74,33 +73,32 @@ namespace projections /* very loosely based upon DMA code by Bradford W. Drew */ // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_latlong_other : public base_t_fi<base_latlong_other<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_latlong_other + : public base_t_fi<base_latlong_other<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - inline base_latlong_other(const Parameters& par) - : base_t_fi<base_latlong_other<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_latlong_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 / this->m_par.a; - xy_y = lp_lat / this->m_par.a; + // TODO: in the original code a is not used + // different mechanism is probably used instead + xy_x = lp_lon / this->m_par.a; + xy_y = lp_lat / this->m_par.a; } // 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 * this->m_par.a; - lp_lon = xy_x * this->m_par.a; + // TODO: in the original code a is not used + // different mechanism is probably used instead + lp_lat = xy_y * this->m_par.a; + lp_lon = xy_x * this->m_par.a; } static inline std::string get_name() @@ -158,10 +156,10 @@ namespace projections \par Example \image html ex_lonlat.gif */ - template <typename CalculationType, typename Parameters> - struct lonlat_other : public detail::latlong::base_latlong_other<CalculationType, Parameters> + template <typename T, typename Parameters> + struct lonlat_other : public detail::latlong::base_latlong_other<T, Parameters> { - inline lonlat_other(const Parameters& par) : detail::latlong::base_latlong_other<CalculationType, Parameters>(par) + inline lonlat_other(const Parameters& par) : detail::latlong::base_latlong_other<T, Parameters>(par) { detail::latlong::setup_lonlat(this->m_par); } @@ -176,10 +174,10 @@ namespace projections \par Example \image html ex_latlon.gif */ - template <typename CalculationType, typename Parameters> - struct latlon_other : public detail::latlong::base_latlong_other<CalculationType, Parameters> + template <typename T, typename Parameters> + struct latlon_other : public detail::latlong::base_latlong_other<T, Parameters> { - inline latlon_other(const Parameters& par) : detail::latlong::base_latlong_other<CalculationType, Parameters>(par) + inline latlon_other(const Parameters& par) : detail::latlong::base_latlong_other<T, Parameters>(par) { detail::latlong::setup_latlon(this->m_par); } @@ -194,10 +192,10 @@ namespace projections \par Example \image html ex_latlong.gif */ - template <typename CalculationType, typename Parameters> - struct latlong_other : public detail::latlong::base_latlong_other<CalculationType, Parameters> + template <typename T, typename Parameters> + struct latlong_other : public detail::latlong::base_latlong_other<T, Parameters> { - inline latlong_other(const Parameters& par) : detail::latlong::base_latlong_other<CalculationType, Parameters>(par) + inline latlong_other(const Parameters& par) : detail::latlong::base_latlong_other<T, Parameters>(par) { detail::latlong::setup_latlong(this->m_par); } @@ -212,10 +210,10 @@ namespace projections \par Example \image html ex_longlat.gif */ - template <typename CalculationType, typename Parameters> - struct longlat_other : public detail::latlong::base_latlong_other<CalculationType, Parameters> + template <typename T, typename Parameters> + struct longlat_other : public detail::latlong::base_latlong_other<T, Parameters> { - inline longlat_other(const Parameters& par) : detail::latlong::base_latlong_other<CalculationType, Parameters>(par) + inline longlat_other(const Parameters& par) : detail::latlong::base_latlong_other<T, Parameters>(par) { detail::latlong::setup_longlat(this->m_par); } @@ -232,53 +230,53 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::longlat, longlat_other, longlat_other) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class lonlat_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class lonlat_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<lonlat_other<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<lonlat_other<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - class latlon_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class latlon_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<latlon_other<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<latlon_other<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - class latlong_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class latlong_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<latlong_other<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<latlong_other<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - class longlat_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class longlat_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<longlat_other<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<longlat_other<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void latlong_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void latlong_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("lonlat", new lonlat_entry<CalculationType, Parameters>); - factory.add_to_factory("latlon", new latlon_entry<CalculationType, Parameters>); - factory.add_to_factory("latlong", new latlong_entry<CalculationType, Parameters>); - factory.add_to_factory("longlat", new longlat_entry<CalculationType, Parameters>); + factory.add_to_factory("lonlat", new lonlat_entry<T, Parameters>); + factory.add_to_factory("latlon", new latlon_entry<T, Parameters>); + factory.add_to_factory("latlong", new latlong_entry<T, Parameters>); + factory.add_to_factory("longlat", new longlat_entry<T, Parameters>); } } // namespace detail |