summaryrefslogtreecommitdiff
path: root/boost/geometry/srs/projections/proj/nocol.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/geometry/srs/projections/proj/nocol.hpp')
-rw-r--r--boost/geometry/srs/projections/proj/nocol.hpp78
1 files changed, 36 insertions, 42 deletions
diff --git a/boost/geometry/srs/projections/proj/nocol.hpp b/boost/geometry/srs/projections/proj/nocol.hpp
index ef2e95a843..01e428c6d4 100644
--- a/boost/geometry/srs/projections/proj/nocol.hpp
+++ b/boost/geometry/srs/projections/proj/nocol.hpp
@@ -1,13 +1,9 @@
-#ifndef BOOST_GEOMETRY_PROJECTIONS_NOCOL_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_NOCOL_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.
+// Modifications copyright (c) 2017-2018, 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,
@@ -19,7 +15,7 @@
// 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:
@@ -41,6 +37,9 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
+#ifndef BOOST_GEOMETRY_PROJECTIONS_NOCOL_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_NOCOL_HPP
+
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
@@ -53,7 +52,7 @@ namespace boost { namespace geometry
namespace srs { namespace par4
{
- struct nicol {};
+ struct nicol {}; // Nicolosi Globular
}} //namespace srs::par4
@@ -63,45 +62,40 @@ namespace projections
namespace detail { namespace nocol
{
- static const double EPS = 1e-10;
+ static const double epsilon = 1e-10;
// template class, using CRTP to implement forward/inverse
- template <typename CalculationType, typename Parameters>
- struct base_nocol_spheroid : public base_t_f<base_nocol_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct base_nocol_spheroid
+ : public base_t_f<base_nocol_spheroid<T, Parameters>, T, Parameters>
{
-
- typedef CalculationType geographic_type;
- typedef CalculationType cartesian_type;
-
-
inline base_nocol_spheroid(const Parameters& par)
- : base_t_f<base_nocol_spheroid<CalculationType, Parameters>,
- CalculationType, Parameters>(*this, par) {}
+ : base_t_f<base_nocol_spheroid<T, Parameters>, T, 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(T& lp_lon, T& 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(lp_lon) < EPS) {
+ if (fabs(lp_lon) < epsilon) {
xy_x = 0;
xy_y = lp_lat;
- } else if (fabs(lp_lat) < EPS) {
+ } else if (fabs(lp_lat) < epsilon) {
xy_x = lp_lon;
xy_y = 0.;
- } else if (fabs(fabs(lp_lon) - HALFPI) < EPS) {
+ } else if (fabs(fabs(lp_lon) - half_pi) < epsilon) {
xy_x = lp_lon * cos(lp_lat);
- xy_y = HALFPI * sin(lp_lat);
- } else if (fabs(fabs(lp_lat) - HALFPI) < EPS) {
+ xy_y = half_pi * sin(lp_lat);
+ } else if (fabs(fabs(lp_lat) - half_pi) < epsilon) {
xy_x = 0;
xy_y = lp_lat;
} else {
- CalculationType tb, c, d, m, n, r2, sp;
+ T tb, c, d, m, n, r2, sp;
- tb = HALFPI / lp_lon - lp_lon / HALFPI;
- c = lp_lat / HALFPI;
+ tb = half_pi / lp_lon - lp_lon / half_pi;
+ c = lp_lat / half_pi;
d = (1 - c * c)/((sp = sin(lp_lat)) - c);
r2 = tb / d;
r2 *= r2;
@@ -109,10 +103,10 @@ namespace projections
n = (sp / r2 + 0.5 * d)/(1. + 1./r2);
xy_x = cos(lp_lat);
xy_x = sqrt(m * m + xy_x * xy_x / (1. + r2));
- xy_x = HALFPI * ( m + (lp_lon < 0. ? -xy_x : xy_x));
+ xy_x = half_pi * ( m + (lp_lon < 0. ? -xy_x : xy_x));
xy_y = sqrt(n * n - (sp * sp / r2 + d * sp - 1.) /
(1. + 1./r2));
- xy_y = HALFPI * ( n + (lp_lat < 0. ? xy_y : -xy_y ));
+ xy_y = half_pi * ( n + (lp_lat < 0. ? xy_y : -xy_y ));
}
}
@@ -146,10 +140,10 @@ namespace projections
\par Example
\image html ex_nicol.gif
*/
- template <typename CalculationType, typename Parameters>
- struct nicol_spheroid : public detail::nocol::base_nocol_spheroid<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ struct nicol_spheroid : public detail::nocol::base_nocol_spheroid<T, Parameters>
{
- inline nicol_spheroid(const Parameters& par) : detail::nocol::base_nocol_spheroid<CalculationType, Parameters>(par)
+ inline nicol_spheroid(const Parameters& par) : detail::nocol::base_nocol_spheroid<T, Parameters>(par)
{
detail::nocol::setup_nicol(this->m_par);
}
@@ -163,20 +157,20 @@ namespace projections
BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::nicol, nicol_spheroid, nicol_spheroid)
// Factory entry(s)
- template <typename CalculationType, typename Parameters>
- class nicol_entry : public detail::factory_entry<CalculationType, Parameters>
+ template <typename T, typename Parameters>
+ class nicol_entry : public detail::factory_entry<T, Parameters>
{
public :
- virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
+ virtual base_v<T, Parameters>* create_new(const Parameters& par) const
{
- return new base_v_f<nicol_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
+ return new base_v_f<nicol_spheroid<T, Parameters>, T, Parameters>(par);
}
};
- template <typename CalculationType, typename Parameters>
- inline void nocol_init(detail::base_factory<CalculationType, Parameters>& factory)
+ template <typename T, typename Parameters>
+ inline void nocol_init(detail::base_factory<T, Parameters>& factory)
{
- factory.add_to_factory("nicol", new nicol_entry<CalculationType, Parameters>);
+ factory.add_to_factory("nicol", new nicol_entry<T, Parameters>);
}
} // namespace detail
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 22:06:04 +0000