-#ifndef BOOST_GEOMETRY_PROJECTIONS_BOGGS_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_BOGGS_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, 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_BOGGS_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_BOGGS_HPP
+
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
namespace boost { namespace geometry
{
-namespace srs { namespace par4
-{
- struct boggs {};
-
-}} //namespace srs::par4
-
namespace projections
{
#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace boggs
{
- static const int NITER = 20;
- static const double EPS = 1e-7;
- static const double ONETOL = 1.000001;
+ static const int n_iter = 20;
+ static const double epsilon = 1e-7;
static const double FXC = 2.00276;
static const double FXC2 = 1.11072;
static const double FYC = 0.49931;
- static const double FYC2 = 1.41421356237309504880;
- // template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_boggs_spheroid : public base_t_f<base_boggs_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_boggs_spheroid
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
-
- inline base_boggs_spheroid(const Parameters& par)
- : base_t_f<base_boggs_spheroid<CalculationType, Parameters>,
- CalculationType, 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(Parameters const& , T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
{
- static const CalculationType HALFPI = detail::HALFPI<CalculationType>();
- static const CalculationType ONEPI = detail::ONEPI<CalculationType>();
+ static const T half_pi = detail::half_pi<T>();
+ static const T pi = detail::pi<T>();
+ static const T root_two = boost::math::constants::root_two<T>();
- CalculationType theta, th1, c;
+ T theta, th1, c;
int i;
theta = lp_lat;
- if (fabs(fabs(lp_lat) - HALFPI) < EPS)
+ if (fabs(fabs(lp_lat) - half_pi) < epsilon)
xy_x = 0.;
else {
- c = sin(theta) * ONEPI;
- for (i = NITER; i; --i) {
+ c = sin(theta) * pi;
+ for (i = n_iter; i; --i) {
theta -= th1 = (theta + sin(theta) - c) /
(1. + cos(theta));
- if (fabs(th1) < EPS) break;
+ if (fabs(th1) < epsilon) break;
}
theta *= 0.5;
xy_x = FXC * lp_lon / (1. / cos(lp_lat) + FXC2 / cos(theta));
}
- xy_y = FYC * (lp_lat + FYC2 * sin(theta));
+ xy_y = FYC * (lp_lat + root_two * sin(theta));
}
static inline std::string get_name()
\par Example
\image html ex_boggs.gif
*/
- template <typename CalculationType, typename Parameters>
- struct boggs_spheroid : public detail::boggs::base_boggs_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct boggs_spheroid : public detail::boggs::base_boggs_spheroid<T, Parameters>
{
- inline boggs_spheroid(const Parameters& par) : detail::boggs::base_boggs_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline boggs_spheroid(Params const& , Parameters & par)
{
- detail::boggs::setup_boggs(this->m_par);
+ detail::boggs::setup_boggs(par);
}
};
{
// Static projection
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::boggs, boggs_spheroid, boggs_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_boggs, boggs_spheroid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class boggs_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_f<boggs_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(boggs_entry, boggs_spheroid)
- template <typename CalculationType, typename Parameters>
- inline void boggs_init(detail::base_factory<CalculationType, Parameters>& factory)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(boggs_init)
{
- factory.add_to_factory("boggs", new boggs_entry<CalculationType, Parameters>);
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(boggs, boggs_entry);
}
} // namespace detail
projects / ceph.git / blobdiff