diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/hammer.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/hammer.hpp | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/boost/geometry/srs/projections/proj/hammer.hpp b/boost/geometry/srs/projections/proj/hammer.hpp index 9fd5bd34b1..6518fd8245 100644 --- a/boost/geometry/srs/projections/proj/hammer.hpp +++ b/boost/geometry/srs/projections/proj/hammer.hpp @@ -48,12 +48,6 @@ namespace boost { namespace geometry { -namespace srs { namespace par4 -{ - struct hammer {}; // Hammer & Eckert-Greifendorff - -}} //namespace srs::par4 - namespace projections { #ifndef DOXYGEN_NO_DETAIL @@ -81,7 +75,7 @@ namespace projections // FORWARD(s_forward) spheroid // Project coordinates from geographic (lon, lat) to cartesian (x, y) - inline void fwd(T& lp_lon, T& lp_lat, T& xy_x, T& xy_y) const + inline void fwd(T lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const { T cosphi, d; @@ -92,7 +86,7 @@ namespace projections // INVERSE(s_inverse) spheroid // Project coordinates from cartesian (x, y) to geographic (lon, lat) - inline void inv(T& xy_x, T& xy_y, T& lp_lon, T& lp_lat) const + inline void inv(T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const { T z; @@ -115,17 +109,17 @@ namespace projections }; // Hammer & Eckert-Greifendorff - template <typename Parameters, typename T> - inline void setup_hammer(Parameters& par, par_hammer<T>& proj_parm) + template <typename Params, typename Parameters, typename T> + inline void setup_hammer(Params const& params, Parameters& par, par_hammer<T>& proj_parm) { T tmp; - if (pj_param_f(par.params, "W", tmp)) { + if (pj_param_f<srs::spar::w>(params, "W", srs::dpar::w, tmp)) { if ((proj_parm.w = fabs(tmp)) <= 0.) BOOST_THROW_EXCEPTION( projection_exception(error_w_or_m_zero_or_less) ); } else proj_parm.w = .5; - if (pj_param_f(par.params, "M", tmp)) { + if (pj_param_f<srs::spar::m>(params, "M", srs::dpar::m, tmp)) { if ((proj_parm.m = fabs(tmp)) <= 0.) BOOST_THROW_EXCEPTION( projection_exception(error_w_or_m_zero_or_less) ); } else @@ -159,9 +153,11 @@ namespace projections template <typename T, typename Parameters> struct hammer_spheroid : public detail::hammer::base_hammer_spheroid<T, Parameters> { - inline hammer_spheroid(const Parameters& par) : detail::hammer::base_hammer_spheroid<T, Parameters>(par) + template <typename Params> + inline hammer_spheroid(Params const& params, Parameters const& par) + : detail::hammer::base_hammer_spheroid<T, Parameters>(par) { - detail::hammer::setup_hammer(this->m_par, this->m_proj_parm); + detail::hammer::setup_hammer(params, this->m_par, this->m_proj_parm); } }; @@ -170,23 +166,14 @@ namespace projections { // Static projection - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::hammer, hammer_spheroid, hammer_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_hammer, hammer_spheroid, hammer_spheroid) // Factory entry(s) - template <typename T, typename Parameters> - class hammer_entry : public detail::factory_entry<T, Parameters> - { - public : - virtual base_v<T, Parameters>* create_new(const Parameters& par) const - { - return new base_v_fi<hammer_spheroid<T, Parameters>, T, Parameters>(par); - } - }; - - template <typename T, typename Parameters> - inline void hammer_init(detail::base_factory<T, Parameters>& factory) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(hammer_entry, hammer_spheroid) + + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(hammer_init) { - factory.add_to_factory("hammer", new hammer_entry<T, Parameters>); + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(hammer, hammer_entry) } } // namespace detail |