summaryrefslogtreecommitdiff
path: root/boost/geometry/srs/projections/proj/mbtfpp.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/geometry/srs/projections/proj/mbtfpp.hpp')
-rw-r--r--boost/geometry/srs/projections/proj/mbtfpp.hpp90
1 files changed, 41 insertions, 49 deletions
diff --git a/boost/geometry/srs/projections/proj/mbtfpp.hpp b/boost/geometry/srs/projections/proj/mbtfpp.hpp
index 123d1e4b02..cd09fdf181 100644
--- a/boost/geometry/srs/projections/proj/mbtfpp.hpp
+++ b/boost/geometry/srs/projections/proj/mbtfpp.hpp
@@ -1,13 +1,9 @@
-#ifndef BOOST_GEOMETRY_PROJECTIONS_MBTFPP_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_MBTFPP_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,7 +15,7 @@
// 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:
@@ -41,6 +37,9 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
+#ifndef BOOST_GEOMETRY_PROJECTIONS_MBTFPP_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_MBTFPP_HPP
+
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
@@ -53,7 +52,7 @@ namespace boost { namespace geometry
namespace srs { namespace par4
{
- struct mbtfpp {};
+ struct mbtfpp {}; // McBride-Thomas Flat-Polar Parabolic
}} //namespace srs::par4
@@ -68,33 +67,23 @@ namespace projections
static const double FYC = 3.40168025708304504493;
//static const double C23 = .66666666666666666666;
//static const double C13 = .33333333333333333333;
- static const double ONEEPS = 1.0000001;
-
- template <typename T>
- inline T C23() { return detail::TWOTHIRD<T>(); }
- template <typename T>
- inline T C13() { return detail::THIRD<T>(); }
+ static const double one_plus_eps = 1.0000001;
// template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_mbtfpp_spheroid : public base_t_fi<base_mbtfpp_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_mbtfpp_spheroid
+ : public base_t_fi<base_mbtfpp_spheroid<T, Parameters>, T, Parameters>
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
-
inline base_mbtfpp_spheroid(const Parameters& par)
- : base_t_fi<base_mbtfpp_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>(*this, par) {}
+ : base_t_fi<base_mbtfpp_spheroid<T, Parameters>, T, Parameters>(*this, par)
+ {}
// FORWARD(s_forward) spheroid
// 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
{
- static const CalculationType C23 = mbtfpp::C23<CalculationType>();
- static const CalculationType C13 = mbtfpp::C13<CalculationType>();
+ static const T C23 = detail::two_thirds<T>();
+ static const T C13 = detail::third<T>();
lp_lat = asin(CS_ * sin(lp_lat));
xy_x = FXC * lp_lon * (2. * cos(C23 * lp_lat) - 1.);
@@ -103,25 +92,28 @@ namespace projections
// INVERSE(s_inverse) spheroid
// 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
{
- static const CalculationType HALFPI = detail::HALFPI<CalculationType>();
- static const CalculationType C23 = mbtfpp::C23<CalculationType>();
+ static const T half_pi = detail::half_pi<T>();
+ static const T C23 = detail::two_thirds<T>();
lp_lat = xy_y / FYC;
if (fabs(lp_lat) >= 1.) {
- if (fabs(lp_lat) > ONEEPS)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
- else
- lp_lat = (lp_lat < 0.) ? -HALFPI : HALFPI;
+ if (fabs(lp_lat) > one_plus_eps) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ } else {
+ lp_lat = (lp_lat < 0.) ? -half_pi : half_pi;
+ }
} else
lp_lat = asin(lp_lat);
+
lp_lon = xy_x / ( FXC * (2. * cos(C23 * (lp_lat *= 3.)) - 1.) );
if (fabs(lp_lat = sin(lp_lat) / CS_) >= 1.) {
- if (fabs(lp_lat) > ONEEPS)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
- else
- lp_lat = (lp_lat < 0.) ? -HALFPI : HALFPI;
+ if (fabs(lp_lat) > one_plus_eps) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ } else {
+ lp_lat = (lp_lat < 0.) ? -half_pi : half_pi;
+ }
} else
lp_lat = asin(lp_lat);
}
@@ -155,10 +147,10 @@ namespace projections
\par Example
\image html ex_mbtfpp.gif
*/
- template <typename CalculationType, typename Parameters>
- struct mbtfpp_spheroid : public detail::mbtfpp::base_mbtfpp_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct mbtfpp_spheroid : public detail::mbtfpp::base_mbtfpp_spheroid<T, Parameters>
{
- inline mbtfpp_spheroid(const Parameters& par) : detail::mbtfpp::base_mbtfpp_spheroid<CalculationType, Parameters>(par)
+ inline mbtfpp_spheroid(const Parameters& par) : detail::mbtfpp::base_mbtfpp_spheroid<T, Parameters>(par)
{
detail::mbtfpp::setup_mbtfpp(this->m_par);
}
@@ -172,20 +164,20 @@ namespace projections
BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::mbtfpp, mbtfpp_spheroid, mbtfpp_spheroid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class mbtfpp_entry : public detail::factory_entry<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ class mbtfpp_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<mbtfpp_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
+ return new base_v_fi<mbtfpp_spheroid<T, Parameters>, T, Parameters>(par);
}
};
- template <typename CalculationType, typename Parameters>
- inline void mbtfpp_init(detail::base_factory<CalculationType, Parameters>& factory)
+ template <typename T, typename Parameters>
+ inline void mbtfpp_init(detail::base_factory<T, Parameters>& factory)
{
- factory.add_to_factory("mbtfpp", new mbtfpp_entry<CalculationType, Parameters>);
+ factory.add_to_factory("mbtfpp", new mbtfpp_entry<T, Parameters>);
}
} // namespace detail
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 16:58:26 +0000