diff options
Diffstat (limited to 'boost/geometry/srs/projections/proj/tpeqd.hpp')
| -rw-r--r-- | boost/geometry/srs/projections/proj/tpeqd.hpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/boost/geometry/srs/projections/proj/tpeqd.hpp b/boost/geometry/srs/projections/proj/tpeqd.hpp index 2d08d49bde..1e8447076a 100644 --- a/boost/geometry/srs/projections/proj/tpeqd.hpp +++ b/boost/geometry/srs/projections/proj/tpeqd.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_TPEQD_HPP -#define BOOST_GEOMETRY_PROJECTIONS_TPEQD_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_TPEQD_HPP +#define BOOST_GEOMETRY_PROJECTIONS_TPEQD_HPP + #include <boost/geometry/util/math.hpp> #include <boost/math/special_functions/hypot.hpp> @@ -55,7 +54,7 @@ namespace boost { namespace geometry namespace srs { namespace par4 { - struct tpeqd {}; + struct tpeqd {}; // Two Point Equidistant }} //namespace srs::par4 @@ -72,25 +71,21 @@ namespace projections }; // template class, using CRTP to implement forward/inverse - template <typename CalculationType, typename Parameters> - struct base_tpeqd_spheroid : public base_t_fi<base_tpeqd_spheroid<CalculationType, Parameters>, - CalculationType, Parameters> + template <typename T, typename Parameters> + struct base_tpeqd_spheroid + : public base_t_fi<base_tpeqd_spheroid<T, Parameters>, T, Parameters> { - - typedef CalculationType geographic_type; - typedef CalculationType cartesian_type; - - par_tpeqd<CalculationType> m_proj_parm; + par_tpeqd<T> m_proj_parm; inline base_tpeqd_spheroid(const Parameters& par) - : base_t_fi<base_tpeqd_spheroid<CalculationType, Parameters>, - CalculationType, Parameters>(*this, par) {} + : base_t_fi<base_tpeqd_spheroid<T, Parameters>, T, Parameters>(*this, par) + {} // FORWARD(s_forward) sphere // 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 { - CalculationType t, z1, z2, dl1, dl2, sp, cp; + T t, z1, z2, dl1, dl2, sp, cp; sp = sin(lp_lat); cp = cos(lp_lat); @@ -98,6 +93,7 @@ namespace projections z2 = aacos(this->m_proj_parm.sp2 * sp + this->m_proj_parm.cp2 * cp * cos(dl2 = lp_lon - this->m_proj_parm.dlam2)); z1 *= z1; z2 *= z2; + xy_x = this->m_proj_parm.r2z0 * (t = z1 - z2); t = this->m_proj_parm.z02 - t; xy_y = this->m_proj_parm.r2z0 * asqrt(4. * this->m_proj_parm.z02 * z2 - t * t); @@ -107,9 +103,9 @@ namespace projections // INVERSE(s_inverse) sphere // 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 { - CalculationType cz1, cz2, s, d, cp, sp; + T cz1, cz2, s, d, cp, sp; cz1 = cos(boost::math::hypot(xy_y, xy_x + this->m_proj_parm.hz0)); cz2 = cos(boost::math::hypot(xy_y, xy_x - this->m_proj_parm.hz0)); @@ -140,14 +136,17 @@ namespace projections T lam_1, lam_2, phi_1, phi_2, A12, pp; /* get control point locations */ - phi_1 = pj_param(par.params, "rlat_1").f; - lam_1 = pj_param(par.params, "rlon_1").f; - phi_2 = pj_param(par.params, "rlat_2").f; - lam_2 = pj_param(par.params, "rlon_2").f; + phi_1 = pj_get_param_r(par.params, "lat_1"); + lam_1 = pj_get_param_r(par.params, "lon_1"); + phi_2 = pj_get_param_r(par.params, "lat_2"); + lam_2 = pj_get_param_r(par.params, "lon_2"); + if (phi_1 == phi_2 && lam_1 == lam_2) - BOOST_THROW_EXCEPTION( projection_exception(-25) ); + BOOST_THROW_EXCEPTION( projection_exception(error_control_point_no_dist) ); + par.lam0 = adjlon(0.5 * (lam_1 + lam_2)); proj_parm.dlam2 = adjlon(lam_2 - lam_1); + proj_parm.cp1 = cos(phi_1); proj_parm.cp2 = cos(phi_2); proj_parm.sp1 = sin(phi_1); @@ -168,6 +167,7 @@ namespace projections proj_parm.rhshz0 = .5 / sin(proj_parm.hz0); proj_parm.r2z0 = 0.5 / proj_parm.z02; proj_parm.z02 *= proj_parm.z02; + par.es = 0.; } @@ -191,10 +191,10 @@ namespace projections \par Example \image html ex_tpeqd.gif */ - template <typename CalculationType, typename Parameters> - struct tpeqd_spheroid : public detail::tpeqd::base_tpeqd_spheroid<CalculationType, Parameters> + template <typename T, typename Parameters> + struct tpeqd_spheroid : public detail::tpeqd::base_tpeqd_spheroid<T, Parameters> { - inline tpeqd_spheroid(const Parameters& par) : detail::tpeqd::base_tpeqd_spheroid<CalculationType, Parameters>(par) + inline tpeqd_spheroid(const Parameters& par) : detail::tpeqd::base_tpeqd_spheroid<T, Parameters>(par) { detail::tpeqd::setup_tpeqd(this->m_par, this->m_proj_parm); } @@ -208,20 +208,20 @@ namespace projections BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::tpeqd, tpeqd_spheroid, tpeqd_spheroid) // Factory entry(s) - template <typename CalculationType, typename Parameters> - class tpeqd_entry : public detail::factory_entry<CalculationType, Parameters> + template <typename T, typename Parameters> + class tpeqd_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<tpeqd_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par); + return new base_v_fi<tpeqd_spheroid<T, Parameters>, T, Parameters>(par); } }; - template <typename CalculationType, typename Parameters> - inline void tpeqd_init(detail::base_factory<CalculationType, Parameters>& factory) + template <typename T, typename Parameters> + inline void tpeqd_init(detail::base_factory<T, Parameters>& factory) { - factory.add_to_factory("tpeqd", new tpeqd_entry<CalculationType, Parameters>); + factory.add_to_factory("tpeqd", new tpeqd_entry<T, Parameters>); } } // namespace detail |