-#ifndef BOOST_GEOMETRY_PROJECTIONS_MERC_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_MERC_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.
-#include <boost/geometry/util/math.hpp>
+#ifndef BOOST_GEOMETRY_PROJECTIONS_MERC_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_MERC_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_msfn.hpp>
+#include <boost/geometry/srs/projections/impl/pj_param.hpp>
#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
+#include <boost/geometry/srs/projections/impl/projects.hpp>
-namespace boost { namespace geometry
-{
+#include <boost/geometry/util/math.hpp>
-namespace srs { namespace par4
+namespace boost { namespace geometry
{
- struct merc {};
-
-}} //namespace srs::par4
namespace projections
{
namespace detail { namespace merc
{
- static const double EPS10 = 1.e-10;
+ static const double epsilon10 = 1.e-10;
- // template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_merc_ellipsoid : public base_t_fi<base_merc_ellipsoid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_merc_ellipsoid
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
-
- inline base_merc_ellipsoid(const Parameters& par)
- : base_t_fi<base_merc_ellipsoid<CalculationType, Parameters>,
- CalculationType, Parameters>(*this, par) {}
-
// FORWARD(e_forward) ellipsoid
// 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& par, T const& lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
{
- static const CalculationType HALFPI = detail::HALFPI<CalculationType>();
+ static const T half_pi = detail::half_pi<T>();
- if (fabs(fabs(lp_lat) - HALFPI) <= EPS10)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
- xy_x = this->m_par.k0 * lp_lon;
- xy_y = - this->m_par.k0 * log(pj_tsfn(lp_lat, sin(lp_lat), this->m_par.e));
+ if (fabs(fabs(lp_lat) - half_pi) <= epsilon10) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ }
+ xy_x = par.k0 * lp_lon;
+ xy_y = - par.k0 * log(pj_tsfn(lp_lat, sin(lp_lat), par.e));
}
// INVERSE(e_inverse) ellipsoid
// 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 const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
{
- if ((lp_lat = pj_phi2(exp(- xy_y / this->m_par.k0), this->m_par.e)) == HUGE_VAL)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
- lp_lon = xy_x / this->m_par.k0;
+ if ((lp_lat = pj_phi2(exp(- xy_y / par.k0), par.e)) == HUGE_VAL) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ }
+ lp_lon = xy_x / par.k0;
}
static inline std::string get_name()
};
- // template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_merc_spheroid : public base_t_fi<base_merc_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_merc_spheroid
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
-
- inline base_merc_spheroid(const Parameters& par)
- : base_t_fi<base_merc_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& par, 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 FORTPI = detail::FORTPI<CalculationType>();
-
- if (fabs(fabs(lp_lat) - HALFPI) <= EPS10)
- BOOST_THROW_EXCEPTION( projection_exception(-20) );
- xy_x = this->m_par.k0 * lp_lon;
- xy_y = this->m_par.k0 * log(tan(FORTPI + .5 * lp_lat));
+ static const T half_pi = detail::half_pi<T>();
+ static const T fourth_pi = detail::fourth_pi<T>();
+
+ if (fabs(fabs(lp_lat) - half_pi) <= epsilon10) {
+ BOOST_THROW_EXCEPTION( projection_exception(error_tolerance_condition) );
+ }
+ xy_x = par.k0 * lp_lon;
+ xy_y = par.k0 * log(tan(fourth_pi + .5 * lp_lat));
}
// 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 const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
{
- static const CalculationType HALFPI = detail::HALFPI<CalculationType>();
+ static const T half_pi = detail::half_pi<T>();
- lp_lat = HALFPI - 2. * atan(exp(-xy_y / this->m_par.k0));
- lp_lon = xy_x / this->m_par.k0;
+ lp_lat = half_pi - 2. * atan(exp(-xy_y / par.k0));
+ lp_lon = xy_x / par.k0;
}
static inline std::string get_name()
};
// Mercator
- template <typename Parameters>
- inline void setup_merc(Parameters& par)
+ template <typename Params, typename Parameters>
+ inline void setup_merc(Params const& params, Parameters& par)
{
typedef typename Parameters::type calc_t;
- static const calc_t HALFPI = detail::HALFPI<calc_t>();
+ static const calc_t half_pi = detail::half_pi<calc_t>();
calc_t phits=0.0;
int is_phits;
- if( (is_phits = pj_param(par.params, "tlat_ts").i) ) {
- phits = fabs(pj_param(par.params, "rlat_ts").f);
- if (phits >= HALFPI)
- BOOST_THROW_EXCEPTION( projection_exception(-24) );
+ if( (is_phits = pj_param_r<srs::spar::lat_ts>(params, "lat_ts", srs::dpar::lat_ts, phits)) ) {
+ phits = fabs(phits);
+ if (phits >= half_pi)
+ BOOST_THROW_EXCEPTION( projection_exception(error_lat_ts_larger_than_90) );
}
- if (par.es) { /* ellipsoid */
+ if (par.es != 0.0) { /* ellipsoid */
if (is_phits)
par.k0 = pj_msfn(sin(phits), cos(phits), par.es);
} else { /* sphere */
\par Example
\image html ex_merc.gif
*/
- template <typename CalculationType, typename Parameters>
- struct merc_ellipsoid : public detail::merc::base_merc_ellipsoid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct merc_ellipsoid : public detail::merc::base_merc_ellipsoid<T, Parameters>
{
- inline merc_ellipsoid(const Parameters& par) : detail::merc::base_merc_ellipsoid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline merc_ellipsoid(Params const& params, Parameters & par)
{
- detail::merc::setup_merc(this->m_par);
+ detail::merc::setup_merc(params, par);
}
};
\par Example
\image html ex_merc.gif
*/
- template <typename CalculationType, typename Parameters>
- struct merc_spheroid : public detail::merc::base_merc_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct merc_spheroid : public detail::merc::base_merc_spheroid<T, Parameters>
{
- inline merc_spheroid(const Parameters& par) : detail::merc::base_merc_spheroid<CalculationType, Parameters>(par)
+ template <typename Params>
+ inline merc_spheroid(Params const& params, Parameters & par)
{
- detail::merc::setup_merc(this->m_par);
+ detail::merc::setup_merc(params, par);
}
};
{
// Static projection
- BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::merc, merc_spheroid, merc_ellipsoid)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI2(srs::spar::proj_merc, merc_spheroid, merc_ellipsoid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class merc_entry : public detail::factory_entry<CalculationType, Parameters>
- {
- public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
- {
- if (par.es)
- return new base_v_fi<merc_ellipsoid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- else
- return new base_v_fi<merc_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
- }
- };
-
- template <typename CalculationType, typename Parameters>
- inline void merc_init(detail::base_factory<CalculationType, Parameters>& factory)
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI2(merc_entry, merc_spheroid, merc_ellipsoid)
+
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(merc_init)
{
- factory.add_to_factory("merc", new merc_entry<CalculationType, Parameters>);
+ BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(merc, merc_entry)
}
} // namespace detail
projects / ceph.git / blobdiff