-#ifndef BOOST_GEOMETRY_PROJECTIONS_NSPER_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_NSPER_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, 2018.
-// Modifications copyright (c) 2017-2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017, 2018, 2019.
+// Modifications copyright (c) 2017-2019, 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,
// 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:
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
+#ifndef BOOST_GEOMETRY_PROJECTIONS_NSPER_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_NSPER_HPP
+
#include <boost/config.hpp>
-#include <boost/geometry/util/math.hpp>
-#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
-#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
+#include <boost/geometry/srs/projections/impl/pj_param.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
-namespace boost { namespace geometry
-{
+#include <boost/geometry/util/math.hpp>
-namespace srs { namespace par4
-{
- struct nsper {};
- struct tpers {};
+#include <boost/math/special_functions/hypot.hpp>
-}} //namespace srs::par4
+namespace boost { namespace geometry
+{
namespace projections
{
namespace detail { namespace nsper
{
- static const double EPS10 = 1.e-10;
- static const int N_POLE = 0;
- static const int S_POLE = 1;
- static const int EQUIT = 2;
- static const int OBLIQ = 3;
+ static const double epsilon10 = 1.e-10;
+ enum mode_type {
+ n_pole = 0,
+ s_pole = 1,
+ equit = 2,
+ obliq = 3
+ };
template <typename T>
struct par_nsper
T sg;
T sw;
T cw;
- int mode;
- int tilt;
+ mode_type mode;
+ bool tilt;
};
- // template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_nsper_spheroid : public base_t_fi<base_nsper_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_nsper_spheroid
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
- par_nsper<CalculationType> m_proj_parm;
-
- inline base_nsper_spheroid(const Parameters& par)
- : base_t_fi<base_nsper_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>(*this, par) {}
+ par_nsper<T> m_proj_parm;
// 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(Parameters const& , T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
{
- CalculationType coslam, cosphi, sinphi;
+ T coslam, cosphi, sinphi;
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
switch (this->m_proj_parm.mode) {
- case OBLIQ:
+ case obliq:
xy_y = this->m_proj_parm.sinph0 * sinphi + this->m_proj_parm.cosph0 * cosphi * coslam;
break;
- case EQUIT:
+ case equit:
xy_y = cosphi * coslam;
break;
- case S_POLE:
+ case s_pole:
xy_y = - sinphi;
break;
- case N_POLE:
+ case n_pole:
xy_y = sinphi;
break;
}
- if (xy_y < this->m_proj_parm.rp)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
+ if (xy_y < this->m_proj_parm.rp) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ }
xy_y = this->m_proj_parm.pn1 / (this->m_proj_parm.p - xy_y);
xy_x = xy_y * cosphi * sin(lp_lon);
switch (this->m_proj_parm.mode) {
- case OBLIQ:
+ case obliq:
xy_y *= (this->m_proj_parm.cosph0 * sinphi -
this->m_proj_parm.sinph0 * cosphi * coslam);
break;
- case EQUIT:
+ case equit:
xy_y *= sinphi;
break;
- case N_POLE:
+ case n_pole:
coslam = - coslam;
BOOST_FALLTHROUGH;
- case S_POLE:
+ case s_pole:
xy_y *= cosphi * coslam;
break;
}
if (this->m_proj_parm.tilt) {
- CalculationType yt, ba;
+ T yt, ba;
yt = xy_y * this->m_proj_parm.cg + xy_x * this->m_proj_parm.sg;
ba = 1. / (yt * this->m_proj_parm.sw * this->m_proj_parm.h + this->m_proj_parm.cw);
// 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(Parameters const& par, T xy_x, T xy_y, T& lp_lon, T& lp_lat) const
{
- CalculationType rh, cosz, sinz;
+ T rh, cosz, sinz;
if (this->m_proj_parm.tilt) {
- CalculationType bm, bq, yt;
+ T bm, bq, yt;
yt = 1./(this->m_proj_parm.pn1 - xy_y * this->m_proj_parm.sw);
bm = this->m_proj_parm.pn1 * xy_x * yt;
xy_y = bq * this->m_proj_parm.cg - bm * this->m_proj_parm.sg;
}
rh = boost::math::hypot(xy_x, xy_y);
- if ((sinz = 1. - rh * rh * this->m_proj_parm.pfact) < 0.)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
+ if ((sinz = 1. - rh * rh * this->m_proj_parm.pfact) < 0.) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ }
sinz = (this->m_proj_parm.p - sqrt(sinz)) / (this->m_proj_parm.pn1 / rh + rh / this->m_proj_parm.pn1);
cosz = sqrt(1. - sinz * sinz);
- if (fabs(rh) <= EPS10) {
+ if (fabs(rh) <= epsilon10) {
lp_lon = 0.;
- lp_lat = this->m_par.phi0;
+ lp_lat = par.phi0;
} else {
switch (this->m_proj_parm.mode) {
- case OBLIQ:
+ case obliq:
lp_lat = asin(cosz * this->m_proj_parm.sinph0 + xy_y * sinz * this->m_proj_parm.cosph0 / rh);
xy_y = (cosz - this->m_proj_parm.sinph0 * sin(lp_lat)) * rh;
xy_x *= sinz * this->m_proj_parm.cosph0;
break;
- case EQUIT:
+ case equit:
lp_lat = asin(xy_y * sinz / rh);
xy_y = cosz * rh;
xy_x *= sinz;
break;
- case N_POLE:
+ case n_pole:
lp_lat = asin(cosz);
xy_y = -xy_y;
break;
- case S_POLE:
+ case s_pole:
lp_lat = - asin(cosz);
break;
}
};
- template <typename Parameters, typename T>
- inline void setup(Parameters& par, par_nsper<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup(Params const& params, Parameters& par, par_nsper<T>& proj_parm)
{
- if ((proj_parm.height = pj_param(par.params, "dh").f) <= 0.)
- BOOST_THROW_EXCEPTION( projection_exception(-30) );
- if (fabs(fabs(par.phi0) - geometry::math::half_pi<T>()) < EPS10)
- proj_parm.mode = par.phi0 < 0. ? S_POLE : N_POLE;
- else if (fabs(par.phi0) < EPS10)
- proj_parm.mode = EQUIT;
+ proj_parm.height = pj_get_param_f<T, srs::spar::h>(params, "h", srs::dpar::h);
+ if (proj_parm.height <= 0.)
+ BOOST_THROW_EXCEPTION( projection_exception(error_h_less_than_zero) );
+
+ if (fabs(fabs(par.phi0) - geometry::math::half_pi<T>()) < epsilon10)
+ proj_parm.mode = par.phi0 < 0. ? s_pole : n_pole;
+ else if (fabs(par.phi0) < epsilon10)
+ proj_parm.mode = equit;
else {
- proj_parm.mode = OBLIQ;
+ proj_parm.mode = obliq;
proj_parm.sinph0 = sin(par.phi0);
proj_parm.cosph0 = cos(par.phi0);
}
// Near-sided perspective
- template <typename Parameters, typename T>
- inline void setup_nsper(Parameters& par, par_nsper<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_nsper(Params const& params, Parameters& par, par_nsper<T>& proj_parm)
{
- proj_parm.tilt = 0;
- setup(par, proj_parm);
+ proj_parm.tilt = false;
+
+ setup(params, par, proj_parm);
}
// Tilted perspective
- template <typename Parameters, typename T>
- inline void setup_tpers(Parameters& par, par_nsper<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_tpers(Params const& params, Parameters& par, par_nsper<T>& proj_parm)
{
- T omega, gamma;
-
- omega = pj_param(par.params, "dtilt").f * geometry::math::d2r<T>();
- gamma = pj_param(par.params, "dazi").f * geometry::math::d2r<T>();
- proj_parm.tilt = 1;
+ T const omega = pj_get_param_r<T, srs::spar::tilt>(params, "tilt", srs::dpar::tilt);
+ T const gamma = pj_get_param_r<T, srs::spar::azi>(params, "azi", srs::dpar::azi);
+ proj_parm.tilt = true;
proj_parm.cg = cos(gamma); proj_parm.sg = sin(gamma);
proj_parm.cw = cos(omega); proj_parm.sw = sin(omega);
- setup(par, proj_parm);
+
+ setup(params, par, proj_parm);
}
}} // namespace detail::nsper
\par Example
\image html ex_nsper.gif
*/
- template <typename CalculationType, typename Parameters>
- struct nsper_spheroid : public detail::nsper::base_nsper_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct nsper_spheroid : public detail::nsper::base_nsper_spheroid<T, Parameters>
{
- inline nsper_spheroid(const Parameters& par) : detail::nsper::base_nsper_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline nsper_spheroid(Params const& params, Parameters & par)
{
- detail::nsper::setup_nsper(this->m_par, this->m_proj_parm);
+ detail::nsper::setup_nsper(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_tpers.gif
*/
- template <typename CalculationType, typename Parameters>
- struct tpers_spheroid : public detail::nsper::base_nsper_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct tpers_spheroid : public detail::nsper::base_nsper_spheroid<T, Parameters>
{
- inline tpers_spheroid(const Parameters& par) : detail::nsper::base_nsper_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline tpers_spheroid(Params const& params, Parameters & par)
{
- detail::nsper::setup_tpers(this->m_par, this->m_proj_parm);
+ detail::nsper::setup_tpers(params, par, this->m_proj_parm);
}
};
{
// Static projection
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::nsper, nsper_spheroid, nsper_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::tpers, tpers_spheroid, tpers_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_nsper, nsper_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_tpers, tpers_spheroid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class nsper_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<nsper_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class tpers_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<tpers_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(nsper_entry, nsper_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(tpers_entry, tpers_spheroid)
- template <typename CalculationType, typename Parameters>
- inline void nsper_init(detail::base_factory<CalculationType, Parameters>& factory)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(nsper_init)
{
- factory.add_to_factory("nsper", new nsper_entry<CalculationType, Parameters>);
- factory.add_to_factory("tpers", new tpers_entry<CalculationType, Parameters>);
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(nsper, nsper_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(tpers, tpers_entry)
}
} // namespace detail