-#ifndef BOOST_GEOMETRY_PROJECTIONS_SCONICS_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_SCONICS_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_SCONICS_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_SCONICS_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
{
-namespace srs { namespace par4
-{
- struct euler {};
- struct murd1 {};
- struct murd2 {};
- struct murd3 {};
- struct pconic {};
- struct tissot {};
- struct vitk1 {};
-
-}} //namespace srs::par4
-
namespace projections
{
#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace sconics
{
- static const int EULER = 0;
- static const int MURD1 = 1;
- static const int MURD2 = 2;
- static const int MURD3 = 3;
- static const int PCONIC = 4;
- static const int TISSOT = 5;
- static const int VITK1 = 6;
- static const double EPS10 = 1.e-10;
- static const double EPS = 1e-10;
+ enum proj_type {
+ proj_euler = 0,
+ proj_murd1 = 1,
+ proj_murd2 = 2,
+ proj_murd3 = 3,
+ proj_pconic = 4,
+ proj_tissot = 5,
+ proj_vitk1 = 6
+ };
+ static const double epsilon10 = 1.e-10;
+ static const double epsilon = 1e-10;
template <typename T>
struct par_sconics
T rho_0;
T sig;
T c1, c2;
- int type;
+ proj_type type;
};
/* get common factors for simple conics */
- template <typename Parameters, typename T>
- inline int phi12(Parameters& par, par_sconics<T>& proj_parm, T *del)
+ template <typename Params, typename T>
+ inline int phi12(Params const& params, par_sconics<T>& proj_parm, T *del)
{
T p1, p2;
int err = 0;
- if (!pj_param(par.params, "tlat_1").i ||
- !pj_param(par.params, "tlat_2").i) {
+ if (!pj_param_r<srs::spar::lat_1>(params, "lat_1", srs::dpar::lat_1, p1) ||
+ !pj_param_r<srs::spar::lat_2>(params, "lat_2", srs::dpar::lat_2, p2)) {
err = -41;
} else {
- p1 = pj_param(par.params, "rlat_1").f;
- p2 = pj_param(par.params, "rlat_2").f;
+ //p1 = pj_get_param_r(par.params, "lat_1"); // set above
+ //p2 = pj_get_param_r(par.params, "lat_2"); // set above
*del = 0.5 * (p2 - p1);
proj_parm.sig = 0.5 * (p2 + p1);
- err = (fabs(*del) < EPS || fabs(proj_parm.sig) < EPS) ? -42 : 0;
- *del = *del;
+ err = (fabs(*del) < epsilon || fabs(proj_parm.sig) < epsilon) ? -42 : 0;
}
return err;
}
- // template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_sconics_spheroid : public base_t_fi<base_sconics_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_sconics_spheroid
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
- par_sconics<CalculationType> m_proj_parm;
-
- inline base_sconics_spheroid(const Parameters& par)
- : base_t_fi<base_sconics_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>(*this, par) {}
+ par_sconics<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 lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
{
- CalculationType rho;
+ T rho;
switch (this->m_proj_parm.type) {
- case MURD2:
+ case proj_murd2:
rho = this->m_proj_parm.rho_c + tan(this->m_proj_parm.sig - lp_lat);
break;
- case PCONIC:
+ case proj_pconic:
rho = this->m_proj_parm.c2 * (this->m_proj_parm.c1 - tan(lp_lat - this->m_proj_parm.sig));
break;
default:
// INVERSE(s_inverse) ellipsoid & 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& , T xy_x, T xy_y, T& lp_lon, T& lp_lat) const
{
- CalculationType rho;
+ T rho;
rho = boost::math::hypot(xy_x, xy_y = this->m_proj_parm.rho_0 - xy_y);
if (this->m_proj_parm.n < 0.) {
xy_x = - xy_x;
xy_y = - xy_y;
}
+
lp_lon = atan2(xy_x, xy_y) / this->m_proj_parm.n;
+
switch (this->m_proj_parm.type) {
- case PCONIC:
+ case proj_pconic:
lp_lat = atan(this->m_proj_parm.c1 - rho / this->m_proj_parm.c2) + this->m_proj_parm.sig;
break;
- case MURD2:
+ case proj_murd2:
lp_lat = this->m_proj_parm.sig - atan(rho - this->m_proj_parm.rho_c);
break;
default:
};
- template <typename Parameters, typename T>
- inline void setup(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup(Params const& params, Parameters& par, par_sconics<T>& proj_parm, proj_type type)
{
- static const T HALFPI = detail::HALFPI<T>();
+ static const T half_pi = detail::half_pi<T>();
T del, cs;
- int i;
+ int err;
+
+ proj_parm.type = type;
+
+ err = phi12(params, proj_parm, &del);
+ if(err)
+ BOOST_THROW_EXCEPTION( projection_exception(err) );
- if( (i = phi12(par, proj_parm, &del)) )
- BOOST_THROW_EXCEPTION( projection_exception(i) );
switch (proj_parm.type) {
- case TISSOT:
+ case proj_tissot:
proj_parm.n = sin(proj_parm.sig);
cs = cos(del);
proj_parm.rho_c = proj_parm.n / cs + cs / proj_parm.n;
proj_parm.rho_0 = sqrt((proj_parm.rho_c - 2 * sin(par.phi0))/proj_parm.n);
break;
- case MURD1:
+ case proj_murd1:
proj_parm.rho_c = sin(del)/(del * tan(proj_parm.sig)) + proj_parm.sig;
proj_parm.rho_0 = proj_parm.rho_c - par.phi0;
proj_parm.n = sin(proj_parm.sig);
break;
- case MURD2:
+ case proj_murd2:
proj_parm.rho_c = (cs = sqrt(cos(del))) / tan(proj_parm.sig);
proj_parm.rho_0 = proj_parm.rho_c + tan(proj_parm.sig - par.phi0);
proj_parm.n = sin(proj_parm.sig) * cs;
break;
- case MURD3:
+ case proj_murd3:
proj_parm.rho_c = del / (tan(proj_parm.sig) * tan(del)) + proj_parm.sig;
proj_parm.rho_0 = proj_parm.rho_c - par.phi0;
proj_parm.n = sin(proj_parm.sig) * sin(del) * tan(del) / (del * del);
break;
- case EULER:
+ case proj_euler:
proj_parm.n = sin(proj_parm.sig) * sin(del) / del;
del *= 0.5;
proj_parm.rho_c = del / (tan(del) * tan(proj_parm.sig)) + proj_parm.sig;
proj_parm.rho_0 = proj_parm.rho_c - par.phi0;
break;
- case PCONIC:
+ case proj_pconic:
proj_parm.n = sin(proj_parm.sig);
proj_parm.c2 = cos(del);
proj_parm.c1 = 1./tan(proj_parm.sig);
- if (fabs(del = par.phi0 - proj_parm.sig) - EPS10 >= HALFPI)
- BOOST_THROW_EXCEPTION( projection_exception(-43) );
+ if (fabs(del = par.phi0 - proj_parm.sig) - epsilon10 >= half_pi)
+ BOOST_THROW_EXCEPTION( projection_exception(error_lat_0_half_pi_from_mean) );
proj_parm.rho_0 = proj_parm.c2 * (proj_parm.c1 - tan(del));
break;
- case VITK1:
+ case proj_vitk1:
proj_parm.n = (cs = tan(del)) * sin(proj_parm.sig) / del;
proj_parm.rho_c = del / (cs * tan(proj_parm.sig)) + proj_parm.sig;
proj_parm.rho_0 = proj_parm.rho_c - par.phi0;
break;
}
+
par.es = 0;
}
+ // Euler
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_euler(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
+ {
+ setup(params, par, proj_parm, proj_euler);
+ }
+
// Tissot
- template <typename Parameters, typename T>
- inline void setup_tissot(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_tissot(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
{
- proj_parm.type = TISSOT;
- setup(par, proj_parm);
+ setup(params, par, proj_parm, proj_tissot);
}
// Murdoch I
- template <typename Parameters, typename T>
- inline void setup_murd1(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_murd1(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
{
- proj_parm.type = MURD1;
- setup(par, proj_parm);
+ setup(params, par, proj_parm, proj_murd1);
}
// Murdoch II
- template <typename Parameters, typename T>
- inline void setup_murd2(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_murd2(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
{
- proj_parm.type = MURD2;
- setup(par, proj_parm);
+ setup(params, par, proj_parm, proj_murd2);
}
// Murdoch III
- template <typename Parameters, typename T>
- inline void setup_murd3(Parameters& par, par_sconics<T>& proj_parm)
- {
- proj_parm.type = MURD3;
- setup(par, proj_parm);
- }
-
- // Euler
- template <typename Parameters, typename T>
- inline void setup_euler(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_murd3(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
{
- proj_parm.type = EULER;
- setup(par, proj_parm);
- }
+ setup(params, par, proj_parm, proj_murd3);
+ }
// Perspective Conic
- template <typename Parameters, typename T>
- inline void setup_pconic(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_pconic(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
{
- proj_parm.type = PCONIC;
- setup(par, proj_parm);
+ setup(params, par, proj_parm, proj_pconic);
}
// Vitkovsky I
- template <typename Parameters, typename T>
- inline void setup_vitk1(Parameters& par, par_sconics<T>& proj_parm)
+ template <typename Params, typename Parameters, typename T>
+ inline void setup_vitk1(Params const& params, Parameters& par, par_sconics<T>& proj_parm)
{
- proj_parm.type = VITK1;
- setup(par, proj_parm);
+ setup(params, par, proj_parm, proj_vitk1);
}
}} // namespace detail::sconics
\par Example
\image html ex_tissot.gif
*/
- template <typename CalculationType, typename Parameters>
- struct tissot_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct tissot_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline tissot_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline tissot_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_tissot(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_tissot(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_murd1.gif
*/
- template <typename CalculationType, typename Parameters>
- struct murd1_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct murd1_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline murd1_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline murd1_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_murd1(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_murd1(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_murd2.gif
*/
- template <typename CalculationType, typename Parameters>
- struct murd2_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct murd2_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline murd2_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline murd2_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_murd2(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_murd2(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_murd3.gif
*/
- template <typename CalculationType, typename Parameters>
- struct murd3_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct murd3_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline murd3_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline murd3_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_murd3(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_murd3(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_euler.gif
*/
- template <typename CalculationType, typename Parameters>
- struct euler_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct euler_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline euler_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline euler_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_euler(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_euler(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_pconic.gif
*/
- template <typename CalculationType, typename Parameters>
- struct pconic_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct pconic_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline pconic_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline pconic_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_pconic(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_pconic(params, par, this->m_proj_parm);
}
};
\par Example
\image html ex_vitk1.gif
*/
- template <typename CalculationType, typename Parameters>
- struct vitk1_spheroid : public detail::sconics::base_sconics_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct vitk1_spheroid : public detail::sconics::base_sconics_spheroid<T, Parameters>
{
- inline vitk1_spheroid(const Parameters& par) : detail::sconics::base_sconics_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline vitk1_spheroid(Params const& params, Parameters& par)
{
- detail::sconics::setup_vitk1(this->m_par, this->m_proj_parm);
+ detail::sconics::setup_vitk1(params, par, this->m_proj_parm);
}
};
{
// Static projection
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::euler, euler_spheroid, euler_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::murd1, murd1_spheroid, murd1_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::murd2, murd2_spheroid, murd2_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::murd3, murd3_spheroid, murd3_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::pconic, pconic_spheroid, pconic_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::tissot, tissot_spheroid, tissot_spheroid)
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::vitk1, vitk1_spheroid, vitk1_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_euler, euler_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_murd1, murd1_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_murd2, murd2_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_murd3, murd3_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_pconic, pconic_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_tissot, tissot_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_vitk1, vitk1_spheroid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class tissot_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<tissot_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class murd1_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<murd1_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class murd2_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<murd2_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class murd3_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<murd3_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class euler_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<euler_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class pconic_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<pconic_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- class vitk1_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- return new base_v_fi<vitk1_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- inline void sconics_init(detail::base_factory<CalculationType, Parameters>& factory)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(euler_entry, euler_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(murd1_entry, murd1_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(murd2_entry, murd2_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(murd3_entry, murd3_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(pconic_entry, pconic_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(tissot_entry, tissot_spheroid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(vitk1_entry, vitk1_spheroid)
+
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(sconics_init)
{
- factory.add_to_factory("tissot", new tissot_entry<CalculationType, Parameters>);
- factory.add_to_factory("murd1", new murd1_entry<CalculationType, Parameters>);
- factory.add_to_factory("murd2", new murd2_entry<CalculationType, Parameters>);
- factory.add_to_factory("murd3", new murd3_entry<CalculationType, Parameters>);
- factory.add_to_factory("euler", new euler_entry<CalculationType, Parameters>);
- factory.add_to_factory("pconic", new pconic_entry<CalculationType, Parameters>);
- factory.add_to_factory("vitk1", new vitk1_entry<CalculationType, Parameters>);
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(euler, euler_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(murd1, murd1_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(murd2, murd2_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(murd3, murd3_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(pconic, pconic_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(tissot, tissot_entry)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(vitk1, vitk1_entry)
}
} // namespace detail
projects / ceph.git / blobdiff