diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/mbt_fps.hpp')
-rw-r--r-- | boost/geometry/srs/projections/proj/mbt_fps.hpp | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/boost/geometry/srs/projections/proj/mbt_fps.hpp b/boost/geometry/srs/projections/proj/mbt_fps.hpp index 130590f8e5..25b59887e5 100644 --- a/boost/geometry/srs/projections/proj/mbt_fps.hpp +++ b/boost/geometry/srs/projections/proj/mbt_fps.hpp @@ -49,12 +49,6 @@ namespace boost { namespace geometry { -namespace srs { namespace par4 -{ - struct mbt_fps {}; // McBryde-Thomas Flat-Pole Sine (No. 2) - -}} //namespace srs::par4 - namespace projections { #ifndef DOXYGEN_NO_DETAIL @@ -84,7 +78,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 const& lp_lon, T lp_lat, T& xy_x, T& xy_y) const { static const T C1_2 = mbt_fps::C1_2<T>(); @@ -106,7 +100,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 t; @@ -147,7 +141,9 @@ namespace projections template <typename T, typename Parameters> struct mbt_fps_spheroid : public detail::mbt_fps::base_mbt_fps_spheroid<T, Parameters> { - inline mbt_fps_spheroid(const Parameters& par) : detail::mbt_fps::base_mbt_fps_spheroid<T, Parameters>(par) + template <typename Params> + inline mbt_fps_spheroid(Params const& , Parameters const& par) + : detail::mbt_fps::base_mbt_fps_spheroid<T, Parameters>(par) { detail::mbt_fps::setup_mbt_fps(this->m_par); } @@ -158,23 +154,14 @@ namespace projections { // Static projection - BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::mbt_fps, mbt_fps_spheroid, mbt_fps_spheroid) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_mbt_fps, mbt_fps_spheroid, mbt_fps_spheroid) // Factory entry(s) - template <typename T, typename Parameters> - class mbt_fps_entry : public detail::factory_entry<T, Parameters> - { - public : - virtual base_v<T, Parameters>* create_new(const Parameters& par) const - { - return new base_v_fi<mbt_fps_spheroid<T, Parameters>, T, Parameters>(par); - } - }; - - template <typename T, typename Parameters> - inline void mbt_fps_init(detail::base_factory<T, Parameters>& factory) + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(mbt_fps_entry, mbt_fps_spheroid) + + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(mbt_fps_init) { - factory.add_to_factory("mbt_fps", new mbt_fps_entry<T, Parameters>); + BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(mbt_fps, mbt_fps_entry) } } // namespace detail |