diff --git a/include/boost/geometry/srs/projections/proj/cc.hpp b/include/boost/geometry/srs/projections/proj/cc.hpp index c7fc1f20a..9a976a31d 100644 --- a/include/boost/geometry/srs/projections/proj/cc.hpp +++ b/include/boost/geometry/srs/projections/proj/cc.hpp @@ -1,8 +1,4 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_CC_HPP -#define BOOST_GEOMETRY_PROJECTIONS_CC_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. @@ -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_CC_HPP +#define BOOST_GEOMETRY_PROJECTIONS_CC_HPP + #include #include @@ -84,8 +83,9 @@ namespace projections { static const CalculationType HALFPI = detail::HALFPI(); - if (fabs(fabs(lp_lat) - HALFPI) <= EPS10) + if (fabs(fabs(lp_lat) - HALFPI) <= EPS10) { BOOST_THROW_EXCEPTION( projection_exception(-20) ); + } xy_x = lp_lon; xy_y = tan(lp_lat); } diff --git a/include/boost/geometry/srs/projections/proj/collg.hpp b/include/boost/geometry/srs/projections/proj/collg.hpp index 0bc347a30..0a34a86b6 100644 --- a/include/boost/geometry/srs/projections/proj/collg.hpp +++ b/include/boost/geometry/srs/projections/proj/collg.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_COLLG_HPP -#define BOOST_GEOMETRY_PROJECTIONS_COLLG_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_COLLG_HPP +#define BOOST_GEOMETRY_PROJECTIONS_COLLG_HPP + #include #include @@ -97,13 +96,17 @@ namespace projections // 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 { + static CalculationType const HALFPI = detail::HALFPI(); + lp_lat = xy_y / FYC - 1.; if (fabs(lp_lat = 1. - lp_lat * lp_lat) < 1.) lp_lat = asin(lp_lat); - else if (fabs(lp_lat) > ONEEPS) + else if (fabs(lp_lat) > ONEEPS) { BOOST_THROW_EXCEPTION( projection_exception(-20) ); - else - lp_lat = lp_lat < 0. ? -geometry::math::half_pi() : geometry::math::half_pi(); + } else { + lp_lat = lp_lat < 0. ? -HALFPI : HALFPI; + } + if ((lp_lon = 1. - sin(lp_lat)) <= 0.) lp_lon = 0.; else diff --git a/include/boost/geometry/srs/projections/proj/denoy.hpp b/include/boost/geometry/srs/projections/proj/denoy.hpp index afedae873..f28d8185e 100644 --- a/include/boost/geometry/srs/projections/proj/denoy.hpp +++ b/include/boost/geometry/srs/projections/proj/denoy.hpp @@ -1,13 +1,9 @@ -#ifndef BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP -#define BOOST_GEOMETRY_PROJECTIONS_DENOY_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_DENOY_HPP +#define BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP + #include #include #include @@ -62,15 +61,15 @@ namespace projections { static const double C0 = 0.95; - //static const double C1 = -.08333333333333333333; - //static const double C3 = .00166666666666666666; + //static const double C1 = -0.08333333333333333333; + //static const double C3 = 0.00166666666666666666; static const double D1 = 0.9; static const double D5 = 0.03; template - inline T C1() { return -.0833333333333333333333333333333; } + inline T C1() { return -0.0833333333333333333333333333333; } template - inline T C3() { return .0016666666666666666666666666666; } + inline T C3() { return 0.0016666666666666666666666666666; } // template class, using CRTP to implement forward/inverse template @@ -111,7 +110,7 @@ namespace projections template inline void setup_denoy(Parameters& par) { - par.es = 0.; + par.es = 0.0; } }} // namespace detail::denoy