diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/urmfps.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/urmfps.hpp | 61 |
1 files changed, 20 insertions, 41 deletions
diff --git a/boost/geometry/srs/projections/proj/urmfps.hpp b/boost/geometry/srs/projections/proj/urmfps.hpp index d4b303ba37..aa7982758a 100644 --- a/boost/geometry/srs/projections/proj/urmfps.hpp +++ b/boost/geometry/srs/projections/proj/urmfps.hpp @@ -49,13 +49,6 @@ namespace boost { namespace geometry { -namespace srs { namespace par4 -{ - struct urmfps {}; // Urmaev Flat-Polar Sinusoidal - struct wag1 {}; // Wagner I (Kavraisky VI) - -}} //namespace srs::par4 - namespace projections { #ifndef DOXYGEN_NO_DETAIL @@ -84,7 +77,7 @@ namespace projections // FORWARD(s_forward) sphere // 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 const& lp_lon, T lp_lat, T& xy_x, T& xy_y) const { lp_lat = aasin(this->m_proj_parm.n * sin(lp_lat)); xy_x = C_x * lp_lon * cos(lp_lat); @@ -93,7 +86,7 @@ namespace projections // INVERSE(s_inverse) sphere // 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 xy_y, T& lp_lon, T& lp_lat) const { xy_y /= this->m_proj_parm.C_y; lp_lat = aasin(sin(xy_y) / this->m_proj_parm.n); @@ -116,10 +109,10 @@ namespace projections // Urmaev Flat-Polar Sinusoidal - template <typename Parameters, typename T> - inline void setup_urmfps(Parameters& par, par_urmfps<T>& proj_parm) + template <typename Params, typename Parameters, typename T> + inline void setup_urmfps(Params const& params, Parameters& par, par_urmfps<T>& proj_parm) { - if (pj_param_f(par.params, "n", proj_parm.n)) { + if (pj_param_f<srs::spar::n>(params, "n", srs::dpar::n, proj_parm.n)) { if (proj_parm.n <= 0. || proj_parm.n > 1.) BOOST_THROW_EXCEPTION( projection_exception(error_n_out_of_range) ); } else @@ -156,9 +149,11 @@ namespace projections template <typename T, typename Parameters> struct urmfps_spheroid : public detail::urmfps::base_urmfps_spheroid<T, Parameters> { - inline urmfps_spheroid(const Parameters& par) : detail::urmfps::base_urmfps_spheroid<T, Parameters>(par) + template <typename Params> + inline urmfps_spheroid(Params const& params, Parameters const& par) + : detail::urmfps::base_urmfps_spheroid<T, Parameters>(par) { - detail::urmfps::setup_urmfps(this->m_par, this->m_proj_parm); + detail::urmfps::setup_urmfps(params, this->m_par, this->m_proj_parm); } }; @@ -177,7 +172,9 @@ namespace projections template <typename T, typename Parameters> struct wag1_spheroid : public detail::urmfps::base_urmfps_spheroid<T, Parameters> { - inline wag1_spheroid(const Parameters& par) : detail::urmfps::base_urmfps_spheroid<T, Parameters>(par) + template <typename Params> + inline wag1_spheroid(Params const& , Parameters const& par) + : detail::urmfps::base_urmfps_spheroid<T, Parameters>(par) { detail::urmfps::setup_wag1(this->m_par, this->m_proj_parm); } @@ -188,35 +185,17 @@ namespace projections { // Static projection - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::urmfps, urmfps_spheroid, urmfps_spheroid) - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::wag1, wag1_spheroid, wag1_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_urmfps, urmfps_spheroid, urmfps_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_wag1, wag1_spheroid, wag1_spheroid) // Factory entry(s) - template <typename T, typename Parameters> - class urmfps_entry : public detail::factory_entry<T, Parameters> - { - public : - virtual base_v<T, Parameters>* create_new(const Parameters& par) const - { - return new base_v_fi<urmfps_spheroid<T, Parameters>, T, Parameters>(par); - } - }; - - template <typename T, typename Parameters> - class wag1_entry : public detail::factory_entry<T, Parameters> - { - public : - virtual base_v<T, Parameters>* create_new(const Parameters& par) const - { - return new base_v_fi<wag1_spheroid<T, Parameters>, T, Parameters>(par); - } - }; - - template <typename T, typename Parameters> - inline void urmfps_init(detail::base_factory<T, Parameters>& factory) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(urmfps_entry, urmfps_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(wag1_entry, wag1_spheroid) + + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(urmfps_init) { - factory.add_to_factory("urmfps", new urmfps_entry<T, Parameters>); - factory.add_to_factory("wag1", new wag1_entry<T, Parameters>); + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(urmfps, urmfps_entry) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(wag1, wag1_entry) } } // namespace detail |