// 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,
//static const double M = 1.333333333333333;
- // template class, using CRTP to implement forward/inverse
template <typename T, typename Parameters>
struct base_august_spheroid
- : public base_t_f<base_august_spheroid<T, Parameters>, T, Parameters>
{
- inline base_august_spheroid(const Parameters& par)
- : base_t_f<base_august_spheroid<T, Parameters>, T, Parameters>(*this, par)
- {}
-
// FORWARD(s_forward) spheroid
// Project coordinates from geographic (lon, lat) to cartesian (x, y)
- inline void fwd(T lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
+ inline void fwd(Parameters const& , T lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
{
static const T M = 1.333333333333333333333333333333333333;
struct august_spheroid : public detail::august::base_august_spheroid<T, Parameters>
{
template <typename Params>
- inline august_spheroid(Params const& , Parameters const& par)
- : detail::august::base_august_spheroid<T, Parameters>(par)
+ inline august_spheroid(Params const& , Parameters & par)
{
- detail::august::setup_august(this->m_par);
+ detail::august::setup_august(par);
}
};
{
// Static projection
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_august, august_spheroid, august_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_august, august_spheroid)
// Factory entry(s)
BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(august_entry, august_spheroid)