|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r77204 - trunk/boost/geometry/extensions/gis/projections/proj
From: barend.gehrels_at_[hidden]
Date: 2012-03-04 05:42:19
Author: barendgehrels
Date: 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
New Revision: 77204
URL: http://svn.boost.org/trac/boost/changeset/77204
Log:
[geometry] projections, updated copyright
Text files modified:
trunk/boost/geometry/extensions/gis/projections/proj/aea.hpp | 26 ++++++++++++------------
trunk/boost/geometry/extensions/gis/projections/proj/aeqd.hpp | 38 ++++++++++++++++++------------------
trunk/boost/geometry/extensions/gis/projections/proj/airy.hpp | 22 ++++++++++----------
trunk/boost/geometry/extensions/gis/projections/proj/aitoff.hpp | 24 +++++++++++-----------
trunk/boost/geometry/extensions/gis/projections/proj/august.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/bacon.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/bipc.hpp | 24 +++++++++++-----------
trunk/boost/geometry/extensions/gis/projections/proj/boggs.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/bonne.hpp | 20 +++++++++---------
trunk/boost/geometry/extensions/gis/projections/proj/cass.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/cc.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/cea.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/chamb.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/collg.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/crast.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/denoy.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/eck1.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/eck2.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/eck3.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/eck4.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/eck5.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/eqc.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/eqdc.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/fahey.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/gall.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/geocent.hpp | 22 ++++++++++----------
trunk/boost/geometry/extensions/gis/projections/proj/geos.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/gins8.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp | 22 ++++++++++----------
trunk/boost/geometry/extensions/gis/projections/proj/gnom.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/goode.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/hammer.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/hatano.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/imw_p.hpp | 26 ++++++++++++------------
trunk/boost/geometry/extensions/gis/projections/proj/krovak.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/labrd.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/laea.hpp | 22 ++++++++++----------
trunk/boost/geometry/extensions/gis/projections/proj/lagrng.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/larr.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/lask.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/latlong.hpp | 20 +++++++++---------
trunk/boost/geometry/extensions/gis/projections/proj/lcc.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/lcca.hpp | 20 +++++++++---------
trunk/boost/geometry/extensions/gis/projections/proj/loxim.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/lsat.hpp | 28 +++++++++++++-------------
trunk/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/merc.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/mill.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp | 20 +++++++++---------
trunk/boost/geometry/extensions/gis/projections/proj/moll.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/nell.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/nell_h.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/nocol.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/nsper.hpp | 22 ++++++++++----------
trunk/boost/geometry/extensions/gis/projections/proj/nzmg.hpp | 24 +++++++++++-----------
trunk/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp | 34 ++++++++++++++++----------------
trunk/boost/geometry/extensions/gis/projections/proj/ocea.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/oea.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/omerc.hpp | 10 ++++++--
trunk/boost/geometry/extensions/gis/projections/proj/ortho.hpp | 20 +++++++++---------
trunk/boost/geometry/extensions/gis/projections/proj/poly.hpp | 20 +++++++++---------
trunk/boost/geometry/extensions/gis/projections/proj/putp2.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/putp3.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/putp4p.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/putp5.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/putp6.hpp | 18 ++++++++--------
trunk/boost/geometry/extensions/gis/projections/proj/robin.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/rouss.hpp | 18 ++++++++--------
trunk/boost/geometry/extensions/gis/projections/proj/rpoly.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/sconics.hpp | 34 +++++++++++++++++---------------
trunk/boost/geometry/extensions/gis/projections/proj/somerc.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/stere.hpp | 24 +++++++++++-----------
trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp | 4 +-
trunk/boost/geometry/extensions/gis/projections/proj/sts.hpp | 18 ++++++++--------
trunk/boost/geometry/extensions/gis/projections/proj/tcc.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/tcea.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/tmerc.hpp | 42 ++++++++++++++++++++--------------------
trunk/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/urm5.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/urmfps.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/vandg.hpp | 16 +++++++-------
trunk/boost/geometry/extensions/gis/projections/proj/vandg2.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/vandg4.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/wag2.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/wag3.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/wag7.hpp | 14 ++++++------
trunk/boost/geometry/extensions/gis/projections/proj/wink1.hpp | 12 +++++-----
trunk/boost/geometry/extensions/gis/projections/proj/wink2.hpp | 14 ++++++------
92 files changed, 735 insertions(+), 729 deletions(-)
Modified: trunk/boost/geometry/extensions/gis/projections/proj/aea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/aea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/aea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -51,7 +51,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace aea{
+ namespace detail { namespace aea{
static const double EPS10 = 1.e-10;
static const double TOL7 = 1.e-7;
static const int N_ITER = 15;
@@ -72,17 +72,17 @@
double en[EN_SIZE];
int ellips;
};
-
-
-
-
-
+
+
+
+
+
/* determine latitude angle phi-1 */
inline double
phi1_(double qs, double Te, double Tone_es) {
int i;
double Phi, sinpi, cospi, con, com, dphi;
-
+
Phi = asin (.5 * qs);
if (Te < EPSILON)
return( Phi );
@@ -153,7 +153,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_aea& proj_parm)
+ void setup(Parameters& par, par_aea& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -213,7 +213,7 @@
}
}} // namespace detail::aea
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Albers Equal Area projection
@@ -293,7 +293,7 @@
factory.add_to_factory("leac", new leac_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
// Create EPSG specializations
// (Proof of Concept, only for some)
Modified: trunk/boost/geometry/extensions/gis/projections/proj/aeqd.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/aeqd.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/aeqd.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -48,7 +48,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace aeqd{
+ namespace detail { namespace aeqd{
static const double EPS10 = 1.e-10;
static const double TOL = 1.e-14;
static const int N_POLE = 0;
@@ -68,11 +68,11 @@
double G;
int mode;
};
-
-
-
-
-
+
+
+
+
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -92,7 +92,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, cosphi, sinphi, rho, s, H, H2, c, Az, t, ct, st, cA, sA;
-
+
coslam = cos(lp_lon);
cosphi = cos(lp_lat);
sinphi = sin(lp_lat);
@@ -133,7 +133,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double c, Az, cosAz, A, B, D, E, F, psi, t;
-
+
if ((c = boost::math::hypot(xy_x, xy_y)) < EPS10) {
lp_lat = this->m_par.phi0;
lp_lon = 0.;
@@ -183,7 +183,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double cosphi, sinphi, t;
-
+
cosphi = cos(lp_lat);
sinphi = sin(lp_lat);
t = 1. / sqrt(1. - this->m_par.es * sinphi * sinphi);
@@ -196,7 +196,7 @@
{
double x2, t;
int i;
-
+
x2 = 0.5 * xy_x * xy_x;
lp_lat = this->m_par.phi0;
for (i = 0; i < 3; ++i) {
@@ -226,7 +226,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, cosphi, sinphi;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
@@ -239,7 +239,7 @@
oblcon:
if (fabs(fabs(xy_y) - 1.) < TOL)
if (xy_y < 0.)
- throw proj_exception();
+ throw proj_exception();
else
xy_x = xy_y = 0.;
else {
@@ -264,7 +264,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double cosc, c_rh, sinc;
-
+
if ((c_rh = boost::math::hypot(xy_x, xy_y)) > PI) {
if (c_rh - EPS10 > PI) throw proj_exception();;
c_rh = PI;
@@ -277,7 +277,7 @@
sinc = sin(c_rh);
cosc = cos(c_rh);
if (this->m_proj_parm.mode == EQUIT) {
- lp_lat = aasin(xy_y * sinc / c_rh);
+ lp_lat = aasin(xy_y * sinc / c_rh);
xy_x *= sinc;
xy_y = cosc * c_rh;
} else {
@@ -348,7 +348,7 @@
}
}} // namespace detail::aeqd
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Azimuthal Equidistant projection
@@ -445,7 +445,7 @@
factory.add_to_factory("aeqd", new aeqd_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/airy.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/airy.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/airy.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace airy{
+ namespace detail { namespace airy{
static const double EPS = 1.e-10;
static const int N_POLE = 0;
static const int S_POLE = 1;
@@ -61,10 +61,10 @@
int mode;
int no_cut; /* do not cut at hemisphere limit */
};
-
-
-
-
+
+
+
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -84,7 +84,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double sinlam, coslam, cosphi, sinphi, t, s, Krho, cosz;
-
+
sinlam = sin(lp_lon);
coslam = cos(lp_lon);
switch (this->m_proj_parm.mode) {
@@ -162,7 +162,7 @@
}
}} // namespace detail::airy
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Airy projection
@@ -208,7 +208,7 @@
factory.add_to_factory("airy", new airy_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/aitoff.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/aitoff.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/aitoff.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,17 +46,17 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace aitoff{
+ namespace detail { namespace aitoff{
struct par_aitoff
{
double cosphi1;
int mode;
};
-
-
-
-
+
+
+
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -76,7 +76,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double c, d;
-
+
if((d = acos(cos(lp_lat) * cos(c = 0.5 * lp_lon)))) {/* basic Aitoff */
xy_x = 2. * d * cos(lp_lat) * sin(c) * (xy_y = 1. / sin(d));
xy_y *= d * sin(lp_lat);
@@ -90,7 +90,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_aitoff& proj_parm)
+ void setup(Parameters& par, par_aitoff& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -124,7 +124,7 @@
}
}} // namespace detail::aitoff
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Aitoff projection
@@ -201,7 +201,7 @@
factory.add_to_factory("wintri", new wintri_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/august.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/august.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/august.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace august{
+ namespace detail { namespace august{
static const double M = 1.333333333333333;
@@ -66,7 +66,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double t, c1, c, x1, x12, y1, y12;
-
+
t = tan(.5 * lp_lat);
c1 = sqrt(1. - t * t);
c = 1. + c1 * cos(lp_lon *= .5);
@@ -87,7 +87,7 @@
}
}} // namespace detail::august
- #endif // doxygen
+ #endif // doxygen
/*!
\brief August Epicycloidal projection
@@ -132,7 +132,7 @@
factory.add_to_factory("august", new august_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/bacon.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/bacon.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/bacon.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace bacon{
+ namespace detail { namespace bacon{
static const double HLFPI2 = 2.46740110027233965467;
static const double EPS = 1e-10;
@@ -73,7 +73,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double ax, f;
-
+
xy_y = this->m_proj_parm.bacn ? HALFPI * sin(lp_lat) : lp_lat;
if ((ax = fabs(lp_lon)) >= EPS) {
if (this->m_proj_parm.ortl && ax >= HALFPI)
@@ -118,7 +118,7 @@
}
}} // namespace detail::bacon
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Apian Globular I projection
@@ -229,7 +229,7 @@
factory.add_to_factory("bacon", new bacon_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/bipc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/bipc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/bipc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace bipc{
+ namespace detail { namespace bipc{
static const double EPS = 1e-10;
static const double EPS10 = 1e-10;
static const double ONEEPS = 1.000000001;
@@ -90,7 +90,7 @@
{
double cphi, sphi, tphi, t, al, Az, z, Av, cdlam, sdlam, r;
int tag;
-
+
cphi = cos(lp_lat);
sphi = sin(lp_lat);
cdlam = cos(sdlam = lamB - lp_lon);
@@ -140,8 +140,8 @@
xy_y += (tag ? -r : r) * cos(t);
if (this->m_proj_parm.noskew) {
t = xy_x;
- xy_x = -xy_x * cAzc - xy_y * sAzc;
- xy_y = -xy_y * cAzc + t * sAzc;
+ xy_x = -xy_x * cAzc - xy_y * sAzc;
+ xy_y = -xy_y * cAzc + t * sAzc;
}
}
@@ -149,11 +149,11 @@
{
double t, r, rp, rl, al, z, fAz, Az, s, c, Av;
int neg, i;
-
+
if (this->m_proj_parm.noskew) {
t = xy_x;
- xy_x = -xy_x * cAzc + xy_y * sAzc;
- xy_y = -xy_y * cAzc - t * sAzc;
+ xy_x = -xy_x * cAzc + xy_y * sAzc;
+ xy_y = -xy_y * cAzc - t * sAzc;
}
if( (neg = (xy_x < 0.)) ) {
xy_y = rhoc - xy_y;
@@ -200,7 +200,7 @@
}
}} // namespace detail::bipc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Bipolar conic of western hemisphere projection
@@ -244,7 +244,7 @@
factory.add_to_factory("bipc", new bipc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/boggs.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/boggs.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/boggs.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace boggs{
+ namespace detail { namespace boggs{
static const int NITER = 20;
static const double EPS = 1e-7;
static const double ONETOL = 1.000001;
@@ -73,7 +73,7 @@
{
double theta, th1, c;
int i;
-
+
theta = lp_lat;
if (fabs(fabs(lp_lat) - HALFPI) < EPS)
xy_x = 0.;
@@ -100,7 +100,7 @@
}
}} // namespace detail::boggs
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Boggs Eumorphic projection
@@ -145,7 +145,7 @@
factory.add_to_factory("boggs", new boggs_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/bonne.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/bonne.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/bonne.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace bonne{
+ namespace detail { namespace bonne{
static const double EPS10 = 1e-10;
struct par_bonne
@@ -76,7 +76,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double rh, E, c;
-
+
rh = this->m_proj_parm.am1 + this->m_proj_parm.m1 - pj_mlfn(lp_lat, E = sin(lp_lat), c = cos(lp_lat), this->m_proj_parm.en);
E = c * lp_lon / (rh * sqrt(1. - this->m_par.es * E * E));
xy_x = rh * sin(E);
@@ -86,7 +86,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double s, rh;
-
+
rh = boost::math::hypot(xy_x, xy_y = this->m_proj_parm.am1 - xy_y);
lp_lat = pj_inv_mlfn(this->m_proj_parm.am1 + this->m_proj_parm.m1 - rh, this->m_par.es, this->m_proj_parm.en);
if ((s = fabs(lp_lat)) < HALFPI) {
@@ -117,7 +117,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double E, rh;
-
+
rh = this->m_proj_parm.cphi1 + this->m_proj_parm.phi1 - lp_lat;
if (fabs(rh) > EPS10) {
xy_x = rh * sin(E = lp_lon * cos(lp_lat) / rh);
@@ -129,7 +129,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double rh;
-
+
rh = boost::math::hypot(xy_x, xy_y = this->m_proj_parm.cphi1 - xy_y);
lp_lat = this->m_proj_parm.cphi1 + this->m_proj_parm.phi1 - rh;
if (fabs(lp_lat) > HALFPI) throw proj_exception();;
@@ -165,7 +165,7 @@
}
}} // namespace detail::bonne
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Bonne (Werner lat_1=90) projection
@@ -237,7 +237,7 @@
factory.add_to_factory("bonne", new bonne_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/cass.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/cass.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/cass.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -48,7 +48,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace cass{
+ namespace detail { namespace cass{
static const double EPS10 = 1e-10;
static const double C1 = .16666666666666666666;
static const double C2 = .00833333333333333333;
@@ -103,7 +103,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double ph1;
-
+
ph1 = pj_inv_mlfn(this->m_proj_parm.m0 + xy_y, this->m_par.es, this->m_proj_parm.en);
this->m_proj_parm.tn = tan(ph1); this->m_proj_parm.t = this->m_proj_parm.tn * this->m_proj_parm.tn;
this->m_proj_parm.n = sin(ph1);
@@ -163,7 +163,7 @@
}
}} // namespace detail::cass
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Cassini projection
@@ -233,7 +233,7 @@
factory.add_to_factory("cass", new cass_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
// Create EPSG specializations
// (Proof of Concept, only for some)
Modified: trunk/boost/geometry/extensions/gis/projections/proj/cc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/cc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/cc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace cc{
+ namespace detail { namespace cc{
static const double EPS10 = 1.e-10;
struct par_cc
@@ -92,7 +92,7 @@
}
}} // namespace detail::cc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Central Cylindrical projection
@@ -136,7 +136,7 @@
factory.add_to_factory("cc", new cc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/cea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/cea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/cea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/chamb.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/chamb.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/chamb.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -48,7 +48,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace chamb{
+ namespace detail { namespace chamb{
static const double THIRD = 0.333333333333333333;
static const double TOL = 1e-9;
@@ -71,7 +71,7 @@
vect(double dphi, double c1, double s1, double c2, double s2, double dlam) {
VECT v;
double cdl, dp, dl;
-
+
cdl = cos(dlam);
if (fabs(dphi) > 1. || fabs(dlam) > 1.)
v.r = aacos(s1 * s2 + c1 * c2 * cdl);
@@ -111,7 +111,7 @@
double sinphi, cosphi, a;
VECT v[3];
int i, j;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
for (i = 0; i < 3; ++i) { /* dist/azimiths from control */
@@ -187,7 +187,7 @@
}
}} // namespace detail::chamb
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Chamberlin Trimetric projection
@@ -233,7 +233,7 @@
factory.add_to_factory("chamb", new chamb_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/collg.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/collg.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/collg.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace collg{
+ namespace detail { namespace collg{
static const double FXC = 1.12837916709551257390;
static const double FYC = 1.77245385090551602729;
static const double ONEEPS = 1.0000001;
@@ -99,7 +99,7 @@
}
}} // namespace detail::collg
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Collignon projection
@@ -143,7 +143,7 @@
factory.add_to_factory("collg", new collg_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/crast.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/crast.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/crast.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace crast{
+ namespace detail { namespace crast{
static const double XM = 0.97720502380583984317;
static const double RXM = 1.02332670794648848847;
static const double YM = 3.06998012383946546542;
@@ -91,7 +91,7 @@
}
}} // namespace detail::crast
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Craster Parabolic (Putnins P4) projection
@@ -135,7 +135,7 @@
factory.add_to_factory("crast", new crast_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/denoy.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/denoy.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/denoy.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace denoy{
+ namespace detail { namespace denoy{
static const double C0 = 0.95;
static const double C1 = -.08333333333333333333;
static const double C3 = .00166666666666666666;
@@ -86,7 +86,7 @@
}
}} // namespace detail::denoy
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Denoyer Semi-Elliptical projection
@@ -131,7 +131,7 @@
factory.add_to_factory("denoy", new denoy_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eck1.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eck1.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eck1.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eck1{
+ namespace detail { namespace eck1{
static const double FC = .92131773192356127802;
static const double RP = .31830988618379067154;
@@ -87,7 +87,7 @@
}
}} // namespace detail::eck1
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Eckert I projection
@@ -131,7 +131,7 @@
factory.add_to_factory("eck1", new eck1_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eck2.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eck2.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eck2.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eck2{
+ namespace detail { namespace eck2{
static const double FXC = 0.46065886596178063902;
static const double FYC = 1.44720250911653531871;
static const double C13 = 0.33333333333333333333;
@@ -98,7 +98,7 @@
}
}} // namespace detail::eck2
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Eckert II projection
@@ -142,7 +142,7 @@
factory.add_to_factory("eck2", new eck2_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eck3.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eck3.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eck3.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eck3{
+ namespace detail { namespace eck3{
struct par_eck3
{
@@ -82,7 +82,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_eck3& proj_parm)
+ void setup(Parameters& par, par_eck3& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -137,7 +137,7 @@
}
}} // namespace detail::eck3
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Eckert III projection
@@ -277,7 +277,7 @@
factory.add_to_factory("kav7", new kav7_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eck4.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eck4.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eck4.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eck4{
+ namespace detail { namespace eck4{
static const double C_x = .42223820031577120149;
static const double C_y = 1.32650042817700232218;
static const double RC_y = .75386330736002178205;
@@ -73,7 +73,7 @@
{
double p, V, s, c;
int i;
-
+
p = C_p * sin(lp_lat);
V = lp_lat * lp_lat;
lp_lat *= 0.895168 + V * ( 0.0218849 + V * 0.00826809 );
@@ -97,7 +97,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double c;
-
+
lp_lat = aasin(xy_y / C_y);
lp_lon = xy_x / (C_x * (1. + (c = cos(lp_lat))));
lp_lat = aasin((lp_lat + sin(lp_lat) * (c + 2.)) / C_p);
@@ -114,7 +114,7 @@
}
}} // namespace detail::eck4
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Eckert IV projection
@@ -158,7 +158,7 @@
factory.add_to_factory("eck4", new eck4_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eck5.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eck5.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eck5.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eck5{
+ namespace detail { namespace eck5{
static const double XF = 0.44101277172455148219;
static const double RXF = 2.26750802723822639137;
static const double YF = 0.88202554344910296438;
@@ -88,7 +88,7 @@
}
}} // namespace detail::eck5
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Eckert V projection
@@ -132,7 +132,7 @@
factory.add_to_factory("eck5", new eck5_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eqc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eqc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eqc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eqc{
+ namespace detail { namespace eqc{
struct par_eqc
{
@@ -91,7 +91,7 @@
}
}} // namespace detail::eqc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Equidistant Cylindrical (Plate Caree) projection
@@ -137,7 +137,7 @@
factory.add_to_factory("eqc", new eqc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/eqdc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/eqdc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/eqdc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace eqdc{
+ namespace detail { namespace eqdc{
static const double EPS10 = 1.e-10;
struct par_eqdc
@@ -107,7 +107,7 @@
inline void fac(Geographic lp, Factors &fac) const
{
double sinphi, cosphi;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
this->m_fac.code |= IS_ANAL_HK;
@@ -128,7 +128,7 @@
proj_parm.phi2 = pj_param(par.params, "rlat_2").f;
if (fabs(proj_parm.phi1 + proj_parm.phi2) < EPS10) throw proj_exception(-21);
pj_enfn(par.es, proj_parm.en);
-
+
proj_parm.n = sinphi = sin(proj_parm.phi1);
cosphi = cos(proj_parm.phi1);
secant = fabs(proj_parm.phi1 - proj_parm.phi2) >= EPS10;
@@ -157,7 +157,7 @@
}
}} // namespace detail::eqdc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Equidistant Conic projection
@@ -203,7 +203,7 @@
factory.add_to_factory("eqdc", new eqdc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/fahey.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/fahey.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/fahey.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace fahey{
+ namespace detail { namespace fahey{
static const double TOL = 1e-6;
@@ -87,7 +87,7 @@
}
}} // namespace detail::fahey
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Fahey projection
@@ -131,7 +131,7 @@
factory.add_to_factory("fahey", new fahey_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace fouc_s{
+ namespace detail { namespace fouc_s{
static const int MAX_ITER = 10;
static const double LOOP_TOL = 1e-7;
@@ -72,7 +72,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double t;
-
+
t = cos(lp_lat);
xy_x = lp_lon * t / (this->m_proj_parm.n + this->m_proj_parm.n1 * t);
xy_y = this->m_proj_parm.n * lp_lat + this->m_proj_parm.n1 * sin(lp_lat);
@@ -82,7 +82,7 @@
{
double V;
int i;
-
+
if (this->m_proj_parm.n) {
lp_lat = xy_y;
for (i = MAX_ITER; i ; --i) {
@@ -114,7 +114,7 @@
}
}} // namespace detail::fouc_s
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Foucaut Sinusoidal projection
@@ -158,7 +158,7 @@
factory.add_to_factory("fouc_s", new fouc_s_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/gall.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/gall.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/gall.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace gall{
+ namespace detail { namespace gall{
static const double YF = 1.70710678118654752440;
static const double XF = 0.70710678118654752440;
static const double RYF = 0.58578643762690495119;
@@ -89,7 +89,7 @@
}
}} // namespace detail::gall
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Gall (Gall Stereographic) projection
@@ -133,7 +133,7 @@
factory.add_to_factory("gall", new gall_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/geocent.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/geocent.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/geocent.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,12 +45,12 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace geocent{
-
-
-
-
+ namespace detail { namespace geocent{
+
+
+
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -84,7 +84,7 @@
void setup_geocent(Parameters& par)
{
par.is_geocent = 1;
-
+
par.x0 = 0.0;
par.y0 = 0.0;
// par.inv = inverse;
@@ -92,7 +92,7 @@
}
}} // namespace detail::geocent
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Geocentric projection
@@ -134,7 +134,7 @@
factory.add_to_factory("geocent", new geocent_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/geos.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/geos.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/geos.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/gins8.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/gins8.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/gins8.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace gins8{
+ namespace detail { namespace gins8{
static const double Cl = 0.000952426;
static const double Cp = 0.162388;
static const double C12 = 0.08333333333333333;
@@ -68,7 +68,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double t = lp_lat * lp_lat;
-
+
xy_y = lp_lat * (1. + t * C12);
xy_x = lp_lon * (1. - Cp * t);
t = lp_lon * lp_lon;
@@ -86,7 +86,7 @@
}
}} // namespace detail::gins8
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Ginsburg VIII (TsNIIGAiK) projection
@@ -131,7 +131,7 @@
factory.add_to_factory("gins8", new gins8_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace gn_sinu{
+ namespace detail { namespace gn_sinu{
static const double EPS10 = 1e-10;
static const int MAX_ITER = 8;
static const double LOOP_TOL = 1e-7;
@@ -77,7 +77,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double s, c;
-
+
xy_y = pj_mlfn(lp_lat, s = sin(lp_lat), c = cos(lp_lat), this->m_proj_parm.en);
xy_x = lp_lon * c / sqrt(1. - this->m_par.es * s * s);
}
@@ -85,7 +85,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double s;
-
+
if ((s = fabs(lp_lat = pj_inv_mlfn(xy_y, this->m_par.es, this->m_proj_parm.en))) < HALFPI) {
s = sin(lp_lat);
lp_lon = xy_x * sqrt(1. - this->m_par.es * s * s) / cos(lp_lat);
@@ -119,7 +119,7 @@
else {
double k, V;
int i;
-
+
k = this->m_proj_parm.n * sin(lp_lat);
for (i = MAX_ITER; i ; --i) {
lp_lat -= V = (this->m_proj_parm.m * lp_lat + sin(lp_lat) - k) /
@@ -144,7 +144,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_gn_sinu& proj_parm)
+ void setup(Parameters& par, par_gn_sinu& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -172,7 +172,7 @@
void setup_sinu(Parameters& par, par_gn_sinu& proj_parm)
{
pj_enfn(par.es, proj_parm.en);
-
+
if (par.es) {
// par.inv = e_inverse;
// par.fwd = e_forward;
@@ -202,7 +202,7 @@
}
}} // namespace detail::gn_sinu
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Sinusoidal (Sanson-Flamsteed) projection
@@ -369,7 +369,7 @@
factory.add_to_factory("mbtfps", new mbtfps_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/gnom.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/gnom.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/gnom.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace gnom{
+ namespace detail { namespace gnom{
static const double EPS10 = 1.e-10;
static const int N_POLE = 0;
static const int S_POLE = 1;
@@ -77,7 +77,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, cosphi, sinphi;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
@@ -115,7 +115,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double rh, cosz, sinz;
-
+
rh = boost::math::hypot(xy_x, xy_y);
sinz = sin(lp_lat = atan(rh));
cosz = sqrt(1. - sinz * sinz);
@@ -174,7 +174,7 @@
}
}} // namespace detail::gnom
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Gnomonic projection
@@ -218,7 +218,7 @@
factory.add_to_factory("gnom", new gnom_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/goode.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/goode.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/goode.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -48,7 +48,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace goode{
+ namespace detail { namespace goode{
static const double Y_COR = 0.05280;
static const double PHI_LIM = .71093078197902358062;
@@ -57,7 +57,7 @@
{
sinu_ellipsoid<Geographic, Cartesian, Parameters> sinu;
moll_spheroid<Geographic, Cartesian, Parameters> moll;
-
+
par_goode(const Parameters& par) : sinu(par), moll(par) {}
};
@@ -107,7 +107,7 @@
}
}} // namespace detail::goode
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Goode Homolosine projection
@@ -151,7 +151,7 @@
factory.add_to_factory("goode", new goode_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace gstmerc{
+ namespace detail { namespace gstmerc{
struct par_gstmerc
{
@@ -59,7 +59,7 @@
double XS;
double YS;
};
-
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -121,7 +121,7 @@
}
}} // namespace detail::gstmerc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) projection
@@ -167,7 +167,7 @@
factory.add_to_factory("gstmerc", new gstmerc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/hammer.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/hammer.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/hammer.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace hammer{
+ namespace detail { namespace hammer{
struct par_hammer
{
@@ -71,7 +71,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double cosphi, d;
-
+
d = sqrt(2./(1. + (cosphi = cos(lp_lat)) * cos(lp_lon *= this->m_proj_parm.w)));
xy_x = this->m_proj_parm.m * d * cosphi * sin(lp_lon);
xy_y = this->m_proj_parm.rm * d * sin(lp_lat);
@@ -97,7 +97,7 @@
}
}} // namespace detail::hammer
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Hammer & Eckert-Greifendorff projection
@@ -143,7 +143,7 @@
factory.add_to_factory("hammer", new hammer_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/hatano.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/hatano.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/hatano.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace hatano{
+ namespace detail { namespace hatano{
static const int NITER = 20;
static const double EPS = 1e-7;
static const double ONETOL = 1.000001;
@@ -79,7 +79,7 @@
{
double th1, c;
int i;
-
+
c = sin(lp_lat) * (lp_lat < 0. ? CS : CN);
for (i = NITER; i; --i) {
lp_lat -= th1 = (lp_lat + sin(lp_lat) - c) / (1. + cos(lp_lat));
@@ -92,7 +92,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double th;
-
+
th = xy_y * ( xy_y < 0. ? RYCS : RYCN);
if (fabs(th) > 1.)
if (fabs(th) > ONETOL) throw proj_exception();
@@ -120,7 +120,7 @@
}
}} // namespace detail::hatano
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Hatano Asymmetrical Equal Area projection
@@ -164,7 +164,7 @@
factory.add_to_factory("hatano", new hatano_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/imw_p.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/imw_p.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/imw_p.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace imw_p{
+ namespace detail { namespace imw_p{
static const double TOL = 1e-10;
static const double EPS = 1e-10;
@@ -63,7 +63,7 @@
inline int
phi12(Parameters& par, par_imw_p& proj_parm, double *del, double *sig) {
int err = 0;
-
+
if (!pj_param(par.params, "tlat_1").i ||
!pj_param(par.params, "tlat_2").i) {
err = -41;
@@ -80,13 +80,13 @@
inline PXY
loc_for(double const& lp_lam, double const& lp_phi, const Parameters& par, par_imw_p const& proj_parm, double *yc) {
PXY xy;
-
+
if (! lp_phi) {
xy.x = lp_lam;
xy.y = 0.;
} else {
double xa, ya, xb, yb, xc, D, B, m, sp, t, R, C;
-
+
sp = sin(lp_phi);
m = pj_mlfn(lp_phi, sp, cos(lp_phi), proj_parm.en);
xa = proj_parm.Pp + proj_parm.Qp * m;
@@ -124,19 +124,19 @@
}
return (xy);
}
-
+
template <typename Parameters>
inline void
xy(Parameters& par, par_imw_p& proj_parm, double phi, double *x, double *y, double *sp, double *R) {
double F;
-
+
*sp = sin(phi);
*R = 1./(tan(phi) * sqrt(1. - par.es * *sp * *sp ));
F = proj_parm.lam_1 * *sp;
*y = *R * (1 - cos(F));
*x = *R * sin(F);
}
-
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -164,7 +164,7 @@
{
PXY t;
double yc = 0;
-
+
lp_lat = this->m_proj_parm.phi_2;
lp_lon = xy_x / cos(lp_lat);
do {
@@ -227,7 +227,7 @@
}
}} // namespace detail::imw_p
- #endif // doxygen
+ #endif // doxygen
/*!
\brief International Map of the World Polyconic projection
@@ -272,7 +272,7 @@
factory.add_to_factory("imw_p", new imw_p_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/krovak.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/krovak.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/krovak.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/labrd.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/labrd.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/labrd.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace labrd{
+ namespace detail { namespace labrd{
static const double EPS = 1.e-10;
struct par_labrd
@@ -73,7 +73,7 @@
{
double V1, V2, ps, sinps, cosps, sinps2, cosps2, I1, I2, I3, I4, I5, I6,
x2, y2, t;
-
+
V1 = this->m_proj_parm.A * log( tan(FORTPI + .5 * lp_lat) );
t = this->m_par.e * sin(lp_lat);
V2 = .5 * this->m_par.e * this->m_proj_parm.A * log ((1. + t)/(1. - t));
@@ -104,7 +104,7 @@
double x2, y2, V1, V2, V3, V4, t, t2, ps, pe, tpe, s,
I7, I8, I9, I10, I11, d, Re;
int i;
-
+
x2 = xy_x * xy_x;
y2 = xy_y * xy_y;
V1 = 3. * xy_x * y2 - xy_x * x2;
@@ -177,7 +177,7 @@
}
}} // namespace detail::labrd
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Laborde projection
@@ -222,7 +222,7 @@
factory.add_to_factory("labrd", new labrd_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/laea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/laea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/laea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace laea{
+ namespace detail { namespace laea{
static const double EPS10 = 1.e-10;
static const int NITER = 20;
static const double CONV = 1.e-10;
@@ -88,7 +88,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, sinlam, sinphi, q, sinb=0.0, cosb=0.0, b=0.0;
-
+
coslam = cos(lp_lon);
sinlam = sin(lp_lon);
sinphi = sin(lp_lat);
@@ -121,7 +121,7 @@
goto eqcon;
break;
case EQUIT:
- xy_y = (b = sqrt(2. / (1. + cosb * coslam))) * sinb * this->m_proj_parm.ymf;
+ xy_y = (b = sqrt(2. / (1. + cosb * coslam))) * sinb * this->m_proj_parm.ymf;
eqcon:
xy_x = this->m_proj_parm.xmf * b * cosb * sinlam;
break;
@@ -139,7 +139,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double cCe, sCe, q, rho, ab=0.0;
-
+
switch (this->m_proj_parm.mode) {
case EQUIT:
case OBLIQ:
@@ -197,7 +197,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, cosphi, sinphi;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
@@ -228,7 +228,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double cosz=0.0, rh, sinz=0.0;
-
+
rh = boost::math::hypot(xy_x, xy_y);
if ((lp_lat = rh * .5 ) > 1.) throw proj_exception();;
lp_lat = 2. * asin(lp_lat);
@@ -312,7 +312,7 @@
}
}} // namespace detail::laea
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Lambert Azimuthal Equal Area projection
@@ -382,7 +382,7 @@
factory.add_to_factory("laea", new laea_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/lagrng.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/lagrng.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/lagrng.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace lagrng{
+ namespace detail { namespace lagrng{
static const double TOL = 1e-10;
struct par_lagrng
@@ -73,7 +73,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double v, c;
-
+
if (fabs(fabs(lp_lat) - HALFPI) < TOL) {
xy_x = 0;
xy_y = lp_lat < 0 ? -2. : 2.;
@@ -103,7 +103,7 @@
}
}} // namespace detail::lagrng
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Lagrange projection
@@ -149,7 +149,7 @@
factory.add_to_factory("lagrng", new lagrng_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/larr.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/larr.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/larr.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace larr{
+ namespace detail { namespace larr{
static const double SIXTH = .16666666666666666;
@@ -80,7 +80,7 @@
}
}} // namespace detail::larr
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Larrivee projection
@@ -125,7 +125,7 @@
factory.add_to_factory("larr", new larr_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/lask.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/lask.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/lask.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace lask{
+ namespace detail { namespace lask{
static const double a10 = 0.975534;
static const double a12 = -0.119161;
static const double a32 = -0.0143059;
@@ -75,7 +75,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double l2, p2;
-
+
l2 = lp_lon * lp_lon;
p2 = lp_lat * lp_lat;
xy_x = lp_lon * (a10 + p2 * (a12 + l2 * a32 + p2 * a14));
@@ -94,7 +94,7 @@
}
}} // namespace detail::lask
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Laskowski projection
@@ -139,7 +139,7 @@
factory.add_to_factory("lask", new lask_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/latlong.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/latlong.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/latlong.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,11 +47,11 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace latlong{
-
+ namespace detail { namespace latlong{
+
/* very loosely based upon DMA code by Bradford W. Drew */
-
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -69,14 +69,14 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
-
+
xy_x = lp_lon / this->m_par.a;
xy_y = lp_lat / this->m_par.a;
}
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
-
+
lp_lat = xy_y * this->m_par.a;
lp_lon = xy_x * this->m_par.a;
}
@@ -127,7 +127,7 @@
}
}} // namespace detail::latlong
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Lat/long (Geodetic) projection
@@ -259,7 +259,7 @@
factory.add_to_factory("longlat", new longlat_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
// Create EPSG specializations
// (Proof of Concept, only for some)
Modified: trunk/boost/geometry/extensions/gis/projections/proj/lcc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/lcc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/lcc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -50,7 +50,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace lcc{
+ namespace detail { namespace lcc{
static const double EPS10 = 1.e-10;
struct par_lcc
@@ -180,7 +180,7 @@
}
}} // namespace detail::lcc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Lambert Conformal Conic projection
@@ -226,7 +226,7 @@
factory.add_to_factory("lcc", new lcc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
// Create EPSG specializations
// (Proof of Concept, only for some)
Modified: trunk/boost/geometry/extensions/gis/projections/proj/lcca.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/lcca.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/lcca.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace lcca{
+ namespace detail { namespace lcca{
static const int MAX_ITER = 10;
static const double DEL_TOL = 1e-12;
@@ -56,8 +56,8 @@
double r0, l, M0;
double C;
};
-
-
+
+
inline double /* func to compute dr */
fS(double S, double C) {
return(S * ( 1. + S * S * C));
@@ -85,7 +85,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double S, r, dr;
-
+
S = pj_mlfn(lp_lat, sin(lp_lat), cos(lp_lat), this->m_proj_parm.en) - this->m_proj_parm.M0;
dr = fS(S, this->m_proj_parm.C);
r = this->m_proj_parm.r0 - dr;
@@ -97,7 +97,7 @@
{
double theta, dr, S, dif;
int i;
-
+
xy_x /= this->m_par.k0;
xy_y /= this->m_par.k0;
theta = atan2(xy_x , this->m_proj_parm.r0 - xy_y);
@@ -136,7 +136,7 @@
}
}} // namespace detail::lcca
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Lambert Conformal Conic Alternative projection
@@ -182,7 +182,7 @@
factory.add_to_factory("lcca", new lcca_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/loxim.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/loxim.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/loxim.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace loxim{
+ namespace detail { namespace loxim{
static const double EPS = 1e-8;
struct par_loxim
@@ -111,7 +111,7 @@
}
}} // namespace detail::loxim
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Loximuthal projection
@@ -155,7 +155,7 @@
factory.add_to_factory("loxim", new loxim_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/lsat.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/lsat.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/lsat.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace lsat{
+ namespace detail { namespace lsat{
static const double TOL = 1e-7;
static const double PI_HALFPI = 4.71238898038468985766;
static const double TWOPI_HALFPI = 7.85398163397448309610;
@@ -60,14 +60,14 @@
inline void
seraz0(double lam, double mult, Parameters& par, par_lsat& proj_parm) {
double sdsq, h, s, fc, sd, sq, d__1;
-
+
lam *= DEG_TO_RAD;
sd = sin(lam);
sdsq = sd * sd;
s = proj_parm.p22 * proj_parm.sa * cos(lam) * sqrt((1. + proj_parm.t * sdsq) / ((
1. + proj_parm.w * sdsq) * (1. + proj_parm.q * sdsq)));
d__1 = 1. + proj_parm.q * sdsq;
- h = sqrt((1. + proj_parm.q * sdsq) / (1. + proj_parm.w * sdsq)) * ((1. +
+ h = sqrt((1. + proj_parm.q * sdsq) / (1. + proj_parm.w * sdsq)) * ((1. +
proj_parm.w * sdsq) / (d__1 * d__1) - proj_parm.p22 * proj_parm.ca);
sq = sqrt(proj_parm.xj * proj_parm.xj + s * s);
proj_parm.b += fc = mult * (h * proj_parm.xj - s * s) / sq;
@@ -98,7 +98,7 @@
int l, nn;
double lamt, xlam, sdsq, c, d, s, lamdp, phidp, lampp, tanph,
lamtp, cl, sd, sp, fac, sav, tanphi;
-
+
if (lp_lat > HALFPI)
lp_lat = HALFPI;
else if (lp_lat < -HALFPI)
@@ -131,7 +131,7 @@
}
if (l) {
sp = sin(lp_lat);
- phidp = aasin((this->m_par.one_es * this->m_proj_parm.ca * sp - this->m_proj_parm.sa * cos(lp_lat) *
+ phidp = aasin((this->m_par.one_es * this->m_proj_parm.ca * sp - this->m_proj_parm.sa * cos(lp_lat) *
sin(lamt)) / sqrt(1. - this->m_par.es * sp * sp));
tanph = log(tan(FORTPI + .5 * phidp));
sd = sin(lamdp);
@@ -150,7 +150,7 @@
{
int nn;
double lamt, sdsq, s, lamdp, phidp, sppsq, dd, sd, sl, fac, scl, sav, spp;
-
+
lamdp = xy_x / this->m_proj_parm.b;
nn = 50;
do {
@@ -165,7 +165,7 @@
lamdp /= this->m_proj_parm.b;
} while (fabs(lamdp - sav) >= TOL && --nn);
sl = sin(lamdp);
- fac = exp(sqrt(1. + s * s / this->m_proj_parm.xj / this->m_proj_parm.xj) * (xy_y -
+ fac = exp(sqrt(1. + s * s / this->m_proj_parm.xj / this->m_proj_parm.xj) * (xy_y -
this->m_proj_parm.c1 * sl - this->m_proj_parm.c3 * sin(lamdp * 3.)));
phidp = 2. * (atan(fac) - FORTPI);
dd = sl * sl;
@@ -173,9 +173,9 @@
lamdp -= TOL;
spp = sin(phidp);
sppsq = spp * spp;
- lamt = atan(((1. - sppsq * this->m_par.rone_es) * tan(lamdp) *
+ lamt = atan(((1. - sppsq * this->m_par.rone_es) * tan(lamdp) *
this->m_proj_parm.ca - spp * this->m_proj_parm.sa * sqrt((1. + this->m_proj_parm.q * dd) * (
- 1. - sppsq) - sppsq * this->m_proj_parm.u) / cos(lamdp)) / (1. - sppsq
+ 1. - sppsq) - sppsq * this->m_proj_parm.u) / cos(lamdp)) / (1. - sppsq
* (1. + this->m_proj_parm.u)));
sl = lamt >= 0. ? 1. : -1.;
scl = cos(lamdp) >= 0. ? 1. : -1;
@@ -244,7 +244,7 @@
}
}} // namespace detail::lsat
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Space oblique for LANDSAT projection
@@ -290,7 +290,7 @@
factory.add_to_factory("lsat", new lsat_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace mbt_fps{
+ namespace detail { namespace mbt_fps{
static const int MAX_ITER = 10;
static const double LOOP_TOL = 1e-7;
static const double C1 = 0.45503;
@@ -74,7 +74,7 @@
{
double k, V, t;
int i;
-
+
k = C3 * sin(lp_lat);
for (i = MAX_ITER; i ; --i) {
t = lp_lat / C2;
@@ -91,7 +91,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double t;
-
+
lp_lat = C2 * (t = aasin(xy_y / C_y));
lp_lon = xy_x / (C_x * (1. + 3. * cos(lp_lat)/cos(t)));
lp_lat = aasin((C1 * sin(t) + sin(lp_lat)) / C3);
@@ -108,7 +108,7 @@
}
}} // namespace detail::mbt_fps
- #endif // doxygen
+ #endif // doxygen
/*!
\brief McBryde-Thomas Flat-Pole Sine (No. 2) projection
@@ -152,7 +152,7 @@
factory.add_to_factory("mbt_fps", new mbt_fps_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace mbtfpp{
+ namespace detail { namespace mbtfpp{
static const double CS = .95257934441568037152;
static const double FXC = .92582009977255146156;
static const double FYC = 3.40168025708304504493;
@@ -102,7 +102,7 @@
}
}} // namespace detail::mbtfpp
- #endif // doxygen
+ #endif // doxygen
/*!
\brief McBride-Thomas Flat-Polar Parabolic projection
@@ -146,7 +146,7 @@
factory.add_to_factory("mbtfpp", new mbtfpp_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace mbtfpq{
+ namespace detail { namespace mbtfpq{
static const int NITER = 20;
static const double EPS = 1e-7;
static const double ONETOL = 1.000001;
@@ -75,7 +75,7 @@
{
double th1, c;
int i;
-
+
c = C * sin(lp_lat);
for (i = NITER; i; --i) {
lp_lat -= th1 = (sin(.5*lp_lat) + sin(lp_lat) - c) /
@@ -89,7 +89,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double t;
-
+
lp_lat = RYC * xy_y;
if (fabs(lp_lat) > 1.) {
if (fabs(lp_lat) > ONETOL) throw proj_exception();
@@ -117,7 +117,7 @@
}
}} // namespace detail::mbtfpq
- #endif // doxygen
+ #endif // doxygen
/*!
\brief McBryde-Thomas Flat-Polar Quartic projection
@@ -161,7 +161,7 @@
factory.add_to_factory("mbtfpq", new mbtfpq_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/merc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/merc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/merc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -48,7 +48,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace merc{
+ namespace detail { namespace merc{
static const double EPS10 = 1.e-10;
@@ -132,7 +132,7 @@
}
}} // namespace detail::merc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Mercator projection
@@ -204,7 +204,7 @@
factory.add_to_factory("merc", new merc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/mill.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/mill.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/mill.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace mill{
+ namespace detail { namespace mill{
// template class, using CRTP to implement forward/inverse
@@ -85,7 +85,7 @@
}
}} // namespace detail::mill
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Miller Cylindrical projection
@@ -129,7 +129,7 @@
factory.add_to_factory("mill", new mill_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace mod_ster{
+ namespace detail { namespace mod_ster{
static const double EPSLN = 1e-10;
struct par_mod_ster
@@ -57,7 +57,7 @@
int n;
};
/* based upon Snyder and Linck, USGS-NMD */
-
+
// template class, using CRTP to implement forward/inverse
template <typename Geographic, typename Cartesian, typename Parameters>
@@ -78,7 +78,7 @@
{
double sinlon, coslon, esphi, chi, schi, cchi, s;
COMPLEX p;
-
+
sinlon = sin(lp_lon);
coslon = cos(lp_lon);
esphi = this->m_par.e * sin(lp_lat);
@@ -99,7 +99,7 @@
int nn;
COMPLEX p, fxy, fpxy, dp;
double den, rh = 0, z, sinz = 0, cosz = 0, chi, phi = 0, dphi, esphi;
-
+
p.r = xy_x;
p.i = xy_y;
for (nn = 20; nn ;--nn) {
@@ -137,7 +137,7 @@
}
if (nn) {
lp_lat = phi;
- lp_lon = atan2(p.r * sinz, rh * this->m_proj_parm.cchio * cosz - p.i *
+ lp_lon = atan2(p.r * sinz, rh * this->m_proj_parm.cchio * cosz - p.i *
this->m_proj_parm.schio * sinz);
} else
lp_lon = lp_lat = HUGE_VAL;
@@ -298,7 +298,7 @@
}
}} // namespace detail::mod_ster
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Miller Oblated Stereographic projection
@@ -465,7 +465,7 @@
factory.add_to_factory("gs50", new gs50_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/moll.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/moll.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/moll.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/nell.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/nell.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/nell.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/nell_h.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/nell_h.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/nell_h.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace nell_h{
+ namespace detail { namespace nell_h{
static const int NITER = 9;
static const double EPS = 1e-7;
@@ -74,7 +74,7 @@
{
double V, c, p;
int i;
-
+
p = 0.5 * xy_y;
for (i = NITER; i ; --i) {
c = cos(0.5 * lp_lat);
@@ -100,7 +100,7 @@
}
}} // namespace detail::nell_h
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Nell-Hammer projection
@@ -144,7 +144,7 @@
factory.add_to_factory("nell_h", new nell_h_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/nocol.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/nocol.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/nocol.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace nocol{
+ namespace detail { namespace nocol{
static const double EPS = 1e-10;
@@ -79,7 +79,7 @@
xy_y = lp_lat;
} else {
double tb, c, d, m, n, r2, sp;
-
+
tb = HALFPI / lp_lon - lp_lon / HALFPI;
c = lp_lat / HALFPI;
d = (1 - c * c)/((sp = sin(lp_lat)) - c);
@@ -106,7 +106,7 @@
}
}} // namespace detail::nocol
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Nicolosi Globular projection
@@ -151,7 +151,7 @@
factory.add_to_factory("nicol", new nicol_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/nsper.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/nsper.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/nsper.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace nsper{
+ namespace detail { namespace nsper{
static const double EPS10 = 1.e-10;
static const int N_POLE = 0;
static const int S_POLE = 1;
@@ -89,7 +89,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, cosphi, sinphi;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
@@ -126,7 +126,7 @@
}
if (this->m_proj_parm.tilt) {
double yt, ba;
-
+
yt = xy_y * this->m_proj_parm.cg + xy_x * this->m_proj_parm.sg;
ba = 1. / (yt * this->m_proj_parm.sw * this->m_proj_parm.h + this->m_proj_parm.cw);
xy_x = (xy_x * this->m_proj_parm.cg - xy_y * this->m_proj_parm.sg) * this->m_proj_parm.cw * ba;
@@ -137,10 +137,10 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double rh, cosz, sinz;
-
+
if (this->m_proj_parm.tilt) {
double bm, bq, yt;
-
+
yt = 1./(this->m_proj_parm.pn1 - xy_y * this->m_proj_parm.sw);
bm = this->m_proj_parm.pn1 * xy_x * yt;
bq = this->m_proj_parm.pn1 * xy_y * this->m_proj_parm.cw * yt;
@@ -180,7 +180,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_nsper& proj_parm)
+ void setup(Parameters& par, par_nsper& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -230,7 +230,7 @@
}
}} // namespace detail::nsper
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Near-sided perspective projection
@@ -308,7 +308,7 @@
factory.add_to_factory("tpers", new tpers_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/nzmg.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/nzmg.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/nzmg.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace nzmg{
+ namespace detail { namespace nzmg{
static const double EPSLN = 1e-10;
static const double SEC5_TO_RAD = 0.4848136811095359935899141023;
static const double RAD_TO_SEC5 = 2.062648062470963551564733573;
@@ -53,10 +53,10 @@
static const int Ntpsi = 9;
static const int Ntphi = 8;
-
-
-
-
+
+
+
+
static COMPLEX
bf[] = {
{.7557853228, 0.0},
@@ -90,7 +90,7 @@
COMPLEX p;
double *C;
int i;
-
+
lp_lat = (lp_lat - this->m_par.phi0) * RAD_TO_SEC5;
for (p.r = *(C = tpsi + (i = Ntpsi)); i ; --i)
p.r = *--C + lp_lat * p.r;
@@ -106,7 +106,7 @@
int nn, i;
COMPLEX p, f, fp, dp;
double den, *C;
-
+
p.r = xy_y;
p.i = xy_x;
for (nn = 20; nn ;--nn) {
@@ -144,7 +144,7 @@
}
}} // namespace detail::nzmg
- #endif // doxygen
+ #endif // doxygen
/*!
\brief New Zealand Map Grid projection
@@ -187,7 +187,7 @@
factory.add_to_factory("nzmg", new nzmg_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/ob_tran.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -49,7 +49,7 @@
template <typename Geographic, typename Cartesian, typename Parameters> class factory;
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace ob_tran{
+ namespace detail { namespace ob_tran{
static const double TOL = 1e-10;
template <typename Geographic, typename Cartesian>
@@ -78,9 +78,9 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, sinphi, cosphi;
-
-
-
+
+
+
coslam = cos(lp_lon);
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
@@ -93,7 +93,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double coslam, sinphi, cosphi;
-
+
m_proj_parm.link->inv(xy_x, xy_y, lp_lon, lp_lat);
if (lp_lon != HUGE_VAL) {
coslam = cos(lp_lon -= this->m_proj_parm.lamp);
@@ -124,9 +124,9 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double cosphi, coslam;
-
-
-
+
+
+
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
lp_lon = adjlon(aatan2(cosphi * sin(lp_lon), sin(lp_lat)) + this->m_proj_parm.lamp);
@@ -137,7 +137,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double cosphi, t;
-
+
m_proj_parm.link->inv(xy_x, xy_y, lp_lon, lp_lat);
if (lp_lon != HUGE_VAL) {
cosphi = cos(lp_lat);
@@ -154,8 +154,8 @@
{
int i;
double phip;
-
-
+
+
Parameters pj;
/* copy existing header into new */
par.es = 0.;
@@ -175,7 +175,7 @@
pj.one_es = pj.rone_es = 1.;
pj.es = pj.e = 0.;
pj.name = pj_param(par.params, "so_proj").s;
-
+
factory<Geographic, Cartesian, Parameters> fac;
if (create)
{
@@ -230,7 +230,7 @@
}
}} // namespace detail::ob_tran
- #endif // doxygen
+ #endif // doxygen
/*!
\brief General Oblique Transformation projection
@@ -309,7 +309,7 @@
factory.add_to_factory("ob_tran", new ob_tran_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/ocea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/ocea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/ocea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace ocea{
+ namespace detail { namespace ocea{
struct par_ocea
{
@@ -75,7 +75,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double t;
-
+
xy_y = sin(lp_lon);
/*
xy_x = atan2((tan(lp_lat) * this->m_proj_parm.cosphi + this->m_proj_parm.sinphi * xy_y) , cos(lp_lon));
@@ -91,7 +91,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double t, s;
-
+
xy_y /= this->m_proj_parm.rok;
xy_x /= this->m_proj_parm.rtk;
t = sqrt(1. - xy_y * xy_y);
@@ -135,7 +135,7 @@
}
}} // namespace detail::ocea
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Oblique Cylindrical Equal Area projection
@@ -180,7 +180,7 @@
factory.add_to_factory("ocea", new ocea_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/oea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/oea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/oea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace oea{
+ namespace detail { namespace oea{
struct par_oea
{
@@ -73,7 +73,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double Az, M, N, cp, sp, cl, shz;
-
+
cp = cos(lp_lat);
sp = sin(lp_lat);
cl = cos(lp_lon);
@@ -88,7 +88,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double N, M, xp, yp, z, Az, cz, sz, cAz;
-
+
N = this->m_proj_parm.hn * aasin(xy_y * this->m_proj_parm.rn);
M = this->m_proj_parm.hm * aasin(xy_x * this->m_proj_parm.rm * cos(N * this->m_proj_parm.two_r_n) / cos(N));
xp = 2. * sin(M);
@@ -127,7 +127,7 @@
}
}} // namespace detail::oea
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Oblated Equal Area projection
@@ -172,7 +172,7 @@
factory.add_to_factory("oea", new oea_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/omerc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/omerc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/omerc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
@@ -153,7 +153,11 @@
gamma = pj_param(par.params, "rgamma").f;
if (alp || gam) {
lamc = pj_param(par.params, "rlonc").f;
- no_off = pj_param(par.params, "tno_off").i;
+ no_off =
+ /* For libproj4 compatability */
+ pj_param(par.params, "tno_off").i
+ /* for backward compatibility */
+ || pj_param(par.params, "tno_uoff").i;
} else {
lam1 = pj_param(par.params, "rlon_1").f;
phi1 = pj_param(par.params, "rlat_1").f;
Modified: trunk/boost/geometry/extensions/gis/projections/proj/ortho.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/ortho.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/ortho.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace ortho{
+ namespace detail { namespace ortho{
static const double EPS10 = 1.e-10;
static const int N_POLE = 0;
static const int S_POLE = 1;
@@ -77,7 +77,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, cosphi, sinphi;
-
+
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
switch (this->m_proj_parm.mode) {
@@ -100,12 +100,12 @@
xy_x = cosphi * sin(lp_lon);
return;
}
-
+
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double rh, cosc, sinc;
-
+
if ((sinc = (rh = boost::math::hypot(xy_x, xy_y))) > 1.) {
if ((sinc - 1.) > EPS10) throw proj_exception();;
sinc = 1.;
@@ -145,7 +145,7 @@
}
return;
}
-
+
};
// Orthographic
@@ -166,7 +166,7 @@
}
}} // namespace detail::ortho
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Orthographic projection
@@ -210,7 +210,7 @@
factory.add_to_factory("ortho", new ortho_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/poly.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/poly.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/poly.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace poly{
+ namespace detail { namespace poly{
static const double TOL = 1e-10;
static const double CONV = 1e-10;
static const int N_ITER = 10;
@@ -78,7 +78,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double ms, sp, cp;
-
+
if (fabs(lp_lat) <= TOL) { xy_x = lp_lon; xy_y = -this->m_proj_parm.ml0; }
else {
sp = sin(lp_lat);
@@ -95,7 +95,7 @@
else {
double r, c, sp, cp, s2ph, ml, mlb, mlp, dPhi;
int i;
-
+
r = xy_y * xy_y + xy_x * xy_x;
for (lp_lat = xy_y, i = I_ITER; i ; --i) {
sp = sin(lp_lat);
@@ -139,7 +139,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double cot, E;
-
+
if (fabs(lp_lat) <= TOL) { xy_x = lp_lon; xy_y = this->m_proj_parm.ml0; }
else {
cot = 1. / tan(lp_lat);
@@ -152,7 +152,7 @@
{
double B, dphi, tp;
int i;
-
+
if (fabs(xy_y = this->m_par.phi0 + xy_y) <= TOL) { lp_lon = xy_x; lp_lat = 0.; }
else {
lp_lat = xy_y;
@@ -187,7 +187,7 @@
}
}} // namespace detail::poly
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Polyconic (American) projection
@@ -257,7 +257,7 @@
factory.add_to_factory("poly", new poly_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/putp2.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/putp2.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/putp2.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace putp2{
+ namespace detail { namespace putp2{
static const double C_x = 1.89490;
static const double C_y = 1.71848;
static const double C_p = 0.6141848493043784;
@@ -72,7 +72,7 @@
{
double p, c, s, V;
int i;
-
+
p = C_p * sin(lp_lat);
s = lp_lat * lp_lat;
lp_lat *= 0.615709 + s * ( 0.00909953 + s * 0.0046292 );
@@ -93,7 +93,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double c;
-
+
lp_lat = aasin(xy_y / C_y);
lp_lon = xy_x / (C_x * ((c = cos(lp_lat)) - 0.5));
lp_lat = aasin((lp_lat + sin(lp_lat) * (c - 1.)) / C_p);
@@ -110,7 +110,7 @@
}
}} // namespace detail::putp2
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Putnins P2 projection
@@ -154,7 +154,7 @@
factory.add_to_factory("putp2", new putp2_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/putp3.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/putp3.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/putp3.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace putp3{
+ namespace detail { namespace putp3{
static const double C = 0.79788456;
static const double RPISQ = 0.1013211836;
@@ -84,7 +84,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_putp3& proj_parm)
+ void setup(Parameters& par, par_putp3& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -111,7 +111,7 @@
}
}} // namespace detail::putp3
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Putnins P3 projection
@@ -188,7 +188,7 @@
factory.add_to_factory("putp3p", new putp3p_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/putp4p.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/putp4p.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/putp4p.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace putp4p{
+ namespace detail { namespace putp4p{
struct par_putp4p
{
@@ -87,7 +87,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_putp4p& proj_parm)
+ void setup(Parameters& par, par_putp4p& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -116,7 +116,7 @@
}
}} // namespace detail::putp4p
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Putnins P4' projection
@@ -192,7 +192,7 @@
factory.add_to_factory("weren", new weren_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/putp5.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/putp5.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/putp5.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace putp5{
+ namespace detail { namespace putp5{
static const double C = 1.01346;
static const double D = 1.2158542;
@@ -84,7 +84,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_putp5& proj_parm)
+ void setup(Parameters& par, par_putp5& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -113,7 +113,7 @@
}
}} // namespace detail::putp5
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Putnins P5 projection
@@ -189,7 +189,7 @@
factory.add_to_factory("putp5p", new putp5p_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/putp6.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/putp6.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/putp6.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace putp6{
+ namespace detail { namespace putp6{
static const double EPS = 1e-10;
static const int NITER = 10;
static const double CON_POLE = 1.732050807568877;
@@ -75,7 +75,7 @@
{
double p, r, V;
int i;
-
+
p = this->m_proj_parm.B * sin(lp_lat);
lp_lat *= 1.10265779;
for (i = NITER; i ; --i) {
@@ -94,7 +94,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double r;
-
+
lp_lat = xy_y / this->m_proj_parm.C_y;
r = sqrt(1. + lp_lat * lp_lat);
lp_lon = xy_x / (this->m_proj_parm.C_x * (this->m_proj_parm.D - r));
@@ -103,7 +103,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_putp6& proj_parm)
+ void setup(Parameters& par, par_putp6& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -138,7 +138,7 @@
}
}} // namespace detail::putp6
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Putnins P6 projection
@@ -214,7 +214,7 @@
factory.add_to_factory("putp6p", new putp6p_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/robin.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/robin.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/robin.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/rouss.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/rouss.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/rouss.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace rouss{
+ namespace detail { namespace rouss{
struct par_rouss
{
@@ -76,7 +76,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double s, al, cp, sp, al2, s2;
-
+
cp = cos(lp_lat);
sp = sin(lp_lat);
s = proj_mdist(lp_lat, sp, cp, this->m_proj_parm.en) - this->m_proj_parm.s0;
@@ -93,7 +93,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double s, al, x = xy_x / this->m_par.k0, y = xy_y / this->m_par.k0, x2, y2;;
-
+
x2 = x * x;
y2 = y * y;
al = x*(1.-this->m_proj_parm.C1*y2+x2*(this->m_proj_parm.C2+this->m_proj_parm.C3*y-this->m_proj_parm.C4*x2+this->m_proj_parm.C5*y2-this->m_proj_parm.C7*x2*y)
@@ -113,7 +113,7 @@
{
double N0, es2, t, t2, R_R0_2, R_R0_4;
proj_mdist_ini(par.es, proj_parm.en);
-
+
es2 = sin(par.phi0);
proj_parm.s0 = proj_mdist(par.phi0, es2, cos(par.phi0), proj_parm.en);
t = 1. - (es2 = par.es * es2 * es2);
@@ -158,7 +158,7 @@
}
}} // namespace detail::rouss
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Roussilhe Stereographic projection
@@ -202,7 +202,7 @@
factory.add_to_factory("rouss", new rouss_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/rpoly.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/rpoly.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/rpoly.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace rpoly{
+ namespace detail { namespace rpoly{
static const double EPS = 1e-9;
struct par_rpoly
@@ -74,7 +74,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double fa;
-
+
if (this->m_proj_parm.mode)
fa = tan(lp_lon * this->m_proj_parm.fxb) * this->m_proj_parm.fxa;
else
@@ -103,7 +103,7 @@
}
}} // namespace detail::rpoly
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Rectangular Polyconic projection
@@ -149,7 +149,7 @@
factory.add_to_factory("rpoly", new rpoly_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/sconics.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/sconics.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/sconics.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace sconics{
+ namespace detail { namespace sconics{
static const int EULER = 0;
static const int MURD1 = 1;
static const int MURD2 = 2;
@@ -59,12 +59,12 @@
struct par_sconics
{
- double n;
- double rho_c;
- double rho_0;
- double sig;
- double c1, c2;
- int type;
+ double n;
+ double rho_c;
+ double rho_0;
+ double sig;
+ double c1, c2;
+ int type;
};
/* get common factors for simple conics */
template <typename Parameters>
@@ -72,7 +72,7 @@
phi12(Parameters& par, par_sconics& proj_parm, double *del) {
double p1, p2;
int err = 0;
-
+
if (!pj_param(par.params, "tlat_1").i ||
!pj_param(par.params, "tlat_2").i) {
err = -41;
@@ -105,13 +105,14 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double rho;
-
+
switch (this->m_proj_parm.type) {
case MURD2:
rho = this->m_proj_parm.rho_c + tan(this->m_proj_parm.sig - lp_lat);
break;
case PCONIC:
rho = this->m_proj_parm.c2 * (this->m_proj_parm.c1 - tan(lp_lat - this->m_proj_parm.sig));
+ // rho = this->m_proj_parm.c2 * (this->m_proj_parm.c1 - tan(lp_lat)); BUG STILL IN proj (reported 2012-03-03)
break;
default:
rho = this->m_proj_parm.rho_c - lp_lat;
@@ -124,7 +125,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double rho;
-
+
rho = boost::math::hypot(xy_x, xy_y = this->m_proj_parm.rho_0 - xy_y);
if (this->m_proj_parm.n < 0.) {
rho = - rho;
@@ -146,7 +147,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_sconics& proj_parm)
+ void setup(Parameters& par, par_sconics& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -180,6 +181,7 @@
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:
@@ -259,7 +261,7 @@
}
}} // namespace detail::sconics
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Tissot projection
@@ -502,7 +504,7 @@
factory.add_to_factory("vitk1", new vitk1_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/somerc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/somerc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/somerc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace somerc{
+ namespace detail { namespace somerc{
static const double EPS = 1.e-10;
static const int NITER = 6;
@@ -72,7 +72,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double phip, lamp, phipp, lampp, sp, cp;
-
+
sp = this->m_par.e * sin(lp_lat);
phip = 2.* atan( exp( this->m_proj_parm.c * (
log(tan(FORTPI + 0.5 * lp_lat)) - this->m_proj_parm.hlf_e * log((1. + sp)/(1. - sp)))
@@ -89,7 +89,7 @@
{
double phip, lamp, phipp, lampp, cp, esp, con, delp;
int i;
-
+
phipp = 2. * (atan(exp(xy_y / this->m_proj_parm.kR)) - FORTPI);
lampp = xy_x / this->m_proj_parm.kR;
cp = cos(phipp);
@@ -134,7 +134,7 @@
}
}} // namespace detail::somerc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Swiss. Obl. Mercator projection
@@ -179,7 +179,7 @@
factory.add_to_factory("somerc", new somerc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/stere.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/stere.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/stere.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -47,7 +47,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace stere{
+ namespace detail { namespace stere{
static const double EPS10 = 1.e-10;
static const double TOL = 1.e-8;
static const int NITER = 8;
@@ -90,7 +90,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double coslam, sinlam, sinX=0.0, cosX=0.0, X, A, sinphi;
-
+
coslam = cos(lp_lon);
sinlam = sin(lp_lon);
sinphi = sin(lp_lat);
@@ -126,7 +126,7 @@
{
double cosphi, sinphi, tp=0.0, phi_l=0.0, rho, halfe=0.0, halfpi=0.0;
int i;
-
+
rho = boost::math::hypot(xy_x, xy_y);
switch (this->m_proj_parm.mode) {
case OBLIQ:
@@ -137,7 +137,7 @@
phi_l = asin(cosphi * this->m_proj_parm.sinX1);
else
phi_l = asin(cosphi * this->m_proj_parm.sinX1 + (xy_y * sinphi * this->m_proj_parm.cosX1 / rho));
-
+
tp = tan(.5 * (HALFPI + phi_l));
xy_x *= sinphi;
xy_y = rho * this->m_proj_parm.cosX1 * cosphi - xy_y * this->m_proj_parm.sinX1* sinphi;
@@ -185,7 +185,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double sinphi, cosphi, coslam, sinlam;
-
+
sinphi = sin(lp_lat);
cosphi = cos(lp_lat);
coslam = cos(lp_lon);
@@ -216,7 +216,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double c, rh, sinc, cosc;
-
+
sinc = sin(c = 2. * atan((rh = boost::math::hypot(xy_x, xy_y)) / this->m_proj_parm.akm1));
cosc = cos(c);
lp_lon = 0.;
@@ -316,7 +316,7 @@
void setup_stere(Parameters& par, par_stere& proj_parm)
{
proj_parm.phits = pj_param(par.params, "tlat_ts").i ?
- pj_param(par.params, "rlat_ts").f : HALFPI;
+ pj_param(par.params, "rlat_ts").f : HALFPI;
setup(par, proj_parm);
}
@@ -336,7 +336,7 @@
}
}} // namespace detail::stere
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Stereographic projection
@@ -442,7 +442,7 @@
factory.add_to_factory("ups", new ups_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
Modified: trunk/boost/geometry/extensions/gis/projections/proj/sts.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/sts.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/sts.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace sts{
+ namespace detail { namespace sts{
struct par_sts
{
@@ -72,7 +72,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double c;
-
+
xy_x = this->m_proj_parm.C_x * lp_lon * cos(lp_lat);
xy_y = this->m_proj_parm.C_y;
lp_lat *= this->m_proj_parm.C_p;
@@ -89,7 +89,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double c;
-
+
xy_y /= this->m_proj_parm.C_y;
c = cos(lp_lat = this->m_proj_parm.tan_mode ? atan(xy_y) : aasin(xy_y));
lp_lat /= this->m_proj_parm.C_p;
@@ -102,7 +102,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_sts& proj_parm, double p, double q, int mode)
+ void setup(Parameters& par, par_sts& proj_parm, double p, double q, int mode)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -145,7 +145,7 @@
}
}} // namespace detail::sts
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Kavraisky V projection
@@ -285,7 +285,7 @@
factory.add_to_factory("fouc", new fouc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/tcc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/tcc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/tcc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace tcc{
+ namespace detail { namespace tcc{
static const double EPS10 = 1.e-10;
struct par_tcc
@@ -71,7 +71,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double b, bt;
-
+
b = cos(lp_lat) * sin(lp_lon);
if ((bt = 1. - b * b) < EPS10) throw proj_exception();;
xy_x = b / sqrt(bt);
@@ -88,7 +88,7 @@
}
}} // namespace detail::tcc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Transverse Central Cylindrical projection
@@ -133,7 +133,7 @@
factory.add_to_factory("tcc", new tcc_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/tcea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/tcea.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/tcea.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace tcea{
+ namespace detail { namespace tcea{
struct par_tcea
{
@@ -76,7 +76,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double t;
-
+
xy_y = xy_y * this->m_proj_parm.rk0 + this->m_par.phi0;
xy_x *= this->m_par.k0;
t = sqrt(1. - xy_x * xy_x);
@@ -96,7 +96,7 @@
}
}} // namespace detail::tcea
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Transverse Cylindrical Equal Area projection
@@ -140,7 +140,7 @@
factory.add_to_factory("tcea", new tcea_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/tmerc.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/tmerc.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/tmerc.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -50,7 +50,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace tmerc{
+ namespace detail { namespace tmerc{
static const double EPS10 = 1.e-10;
static const double FC1 = 1.;
static const double FC2 = .5;
@@ -86,22 +86,22 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double al, als, n, cosphi, sinphi, t;
-
+
/*
- * Fail if our longitude is more than 90 degrees from the
- * central meridian since the results are essentially garbage.
+ * Fail if our longitude is more than 90 degrees from the
+ * central meridian since the results are essentially garbage.
* Is error -20 really an appropriate return value?
- *
+ *
* http://trac.osgeo.org/proj/ticket/5
*/
if( lp_lon < -HALFPI || lp_lon > HALFPI )
{
xy_x = HUGE_VAL;
xy_y = HUGE_VAL;
- throw proj_exception( -14);
+ throw proj_exception( -14 );
return;
}
-
+
sinphi = sin(lp_lat); cosphi = cos(lp_lat);
t = fabs(cosphi) > 1e-10 ? sinphi/cosphi : 0.;
t *= t;
@@ -125,7 +125,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double n, con, cosphi, d, ds, sinphi, t;
-
+
lp_lat = pj_inv_mlfn(this->m_proj_parm.ml0 + xy_y / this->m_par.k0, this->m_par.es, this->m_proj_parm.en);
if (fabs(lp_lat) >= HALFPI) {
lp_lat = xy_y < 0. ? -HALFPI : HALFPI;
@@ -172,22 +172,22 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double b, cosphi;
-
+
/*
- * Fail if our longitude is more than 90 degrees from the
- * central meridian since the results are essentially garbage.
+ * Fail if our longitude is more than 90 degrees from the
+ * central meridian since the results are essentially garbage.
* Is error -20 really an appropriate return value?
- *
+ *
* http://trac.osgeo.org/proj/ticket/5
*/
if( lp_lon < -HALFPI || lp_lon > HALFPI )
{
xy_x = HUGE_VAL;
xy_y = HUGE_VAL;
- throw proj_exception( -14);
+ throw proj_exception( -14 );
return;
}
-
+
b = (cosphi = cos(lp_lat)) * sin(lp_lon);
if (fabs(fabs(b) - 1.) <= EPS10) throw proj_exception();;
xy_x = this->m_proj_parm.ml0 * log((1. + b) / (1. - b));
@@ -203,7 +203,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double h, g;
-
+
h = exp(xy_x / this->m_proj_parm.esp);
g = .5 * (h - 1. / h);
h = cos(this->m_par.phi0 + xy_y / this->m_proj_parm.esp);
@@ -220,7 +220,7 @@
boost::ignore_unused_variable_warning(proj_parm);
if (par.es) {
pj_enfn(par.es, proj_parm.en);
-
+
proj_parm.ml0 = pj_mlfn(par.phi0, sin(par.phi0), cos(par.phi0), proj_parm.en);
proj_parm.esp = par.es / (1. - par.es);
// par.inv = e_inverse;
@@ -266,7 +266,7 @@
}
}} // namespace detail::tmerc
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Transverse Mercator projection
@@ -369,7 +369,7 @@
factory.add_to_factory("utm", new utm_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
// Create EPSG specializations
// (Proof of Concept, only for some)
Modified: trunk/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/tpeqd.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace tpeqd{
+ namespace detail { namespace tpeqd{
struct par_tpeqd
{
@@ -71,7 +71,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double t, z1, z2, dl1, dl2, sp, cp;
-
+
sp = sin(lp_lat);
cp = cos(lp_lat);
z1 = aacos(this->m_proj_parm.sp1 * sp + this->m_proj_parm.cp1 * cp * cos(dl1 = lp_lon + this->m_proj_parm.dlam2));
@@ -88,7 +88,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double cz1, cz2, s, d, cp, sp;
-
+
cz1 = cos(boost::math::hypot(xy_y, xy_x + this->m_proj_parm.hz0));
cz2 = cos(boost::math::hypot(xy_y, xy_x - this->m_proj_parm.hz0));
s = cz1 + cz2;
@@ -144,7 +144,7 @@
}
}} // namespace detail::tpeqd
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Two Point Equidistant projection
@@ -189,7 +189,7 @@
factory.add_to_factory("tpeqd", new tpeqd_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/urm5.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/urm5.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/urm5.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace urm5{
+ namespace detail { namespace urm5{
struct par_urm5
{
@@ -70,7 +70,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double t;
-
+
t = lp_lat = aasin(this->m_proj_parm.n * sin(lp_lat));
xy_x = this->m_proj_parm.m * lp_lon * cos(lp_lat);
t *= t;
@@ -95,7 +95,7 @@
}
}} // namespace detail::urm5
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Urmaev V projection
@@ -140,7 +140,7 @@
factory.add_to_factory("urm5", new urm5_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/urmfps.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/urmfps.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/urmfps.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -46,7 +46,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace urmfps{
+ namespace detail { namespace urmfps{
static const double C_x = 0.8773826753;
static const double Cy = 1.139753528477;
@@ -86,7 +86,7 @@
};
template <typename Parameters>
- void setup(Parameters& par, par_urmfps& proj_parm)
+ void setup(Parameters& par, par_urmfps& proj_parm)
{
boost::ignore_unused_variable_warning(par);
boost::ignore_unused_variable_warning(proj_parm);
@@ -119,7 +119,7 @@
}
}} // namespace detail::urmfps
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Urmaev Flat-Polar Sinusoidal projection
@@ -196,7 +196,7 @@
factory.add_to_factory("wag1", new wag1_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/vandg.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/vandg.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/vandg.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace vandg{
+ namespace detail { namespace vandg{
static const double TOL = 1.e-10;
static const double THIRD = .33333333333333333333;
static const double TWO_THRD = .66666666666666666666;
@@ -73,7 +73,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double al, al2, g, g2, p2;
-
+
p2 = fabs(lp_lat / HALFPI);
if ((p2 - TOL) > 1.) throw proj_exception();;
if (p2 > 1.)
@@ -107,7 +107,7 @@
inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const
{
double t, c0, c1, c2, c3, al, r2, r, m, d, ay, x2, y2;
-
+
x2 = xy_x * xy_x;
if ((ay = fabs(xy_y)) < TOL) {
lp_lat = 0.;
@@ -148,7 +148,7 @@
}
}} // namespace detail::vandg
- #endif // doxygen
+ #endif // doxygen
/*!
\brief van der Grinten (I) projection
@@ -192,7 +192,7 @@
factory.add_to_factory("vandg", new vandg_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/vandg2.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/vandg2.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/vandg2.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace vandg2{
+ namespace detail { namespace vandg2{
static const double TOL = 1e-10;
static const double TWORPI = 0.63661977236758134308;
@@ -72,7 +72,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double x1, at, bt, ct;
-
+
bt = fabs(TWORPI * lp_lat);
if ((ct = 1. - bt * bt) < 0.)
ct = 0.;
@@ -118,7 +118,7 @@
}
}} // namespace detail::vandg2
- #endif // doxygen
+ #endif // doxygen
/*!
\brief van der Grinten II projection
@@ -196,7 +196,7 @@
factory.add_to_factory("vandg3", new vandg3_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/vandg4.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/vandg4.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/vandg4.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace vandg4{
+ namespace detail { namespace vandg4{
static const double TOL = 1e-10;
static const double TWORPI = 0.63661977236758134308;
@@ -67,7 +67,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double x1, t, bt, ct, ft, bt2, ct2, dt, dt2;
-
+
if (fabs(lp_lat) < TOL) {
xy_x = lp_lon;
xy_y = 0.;
@@ -109,7 +109,7 @@
}
}} // namespace detail::vandg4
- #endif // doxygen
+ #endif // doxygen
/*!
\brief van der Grinten IV projection
@@ -154,7 +154,7 @@
factory.add_to_factory("vandg4", new vandg4_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/wag2.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/wag2.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/wag2.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace wag2{
+ namespace detail { namespace wag2{
static const double C_x = 0.92483;
static const double C_y = 1.38725;
static const double C_p1 = 0.88022;
@@ -91,7 +91,7 @@
}
}} // namespace detail::wag2
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Wagner II projection
@@ -135,7 +135,7 @@
factory.add_to_factory("wag2", new wag2_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/wag3.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/wag3.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/wag3.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace wag3{
+ namespace detail { namespace wag3{
static const double TWOTHIRD = 0.6666666666666666666667;
struct par_wag3
@@ -94,7 +94,7 @@
}
}} // namespace detail::wag3
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Wagner III projection
@@ -139,7 +139,7 @@
factory.add_to_factory("wag3", new wag3_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/wag7.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/wag7.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/wag7.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace wag7{
+ namespace detail { namespace wag7{
// template class, using CRTP to implement forward/inverse
@@ -65,7 +65,7 @@
inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
{
double theta, ct, D;
-
+
theta = asin(xy_y = 0.90630778703664996 * sin(lp_lat));
xy_x = 2.66723 * (ct = cos(theta)) * sin(lp_lon /= 3.);
xy_y *= 1.24104 * (D = 1/(sqrt(0.5 * (1 + ct * cos(lp_lon)))));
@@ -83,7 +83,7 @@
}
}} // namespace detail::wag7
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Wagner VII projection
@@ -128,7 +128,7 @@
factory.add_to_factory("wag7", new wag7_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/wink1.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/wink1.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/wink1.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace wink1{
+ namespace detail { namespace wink1{
struct par_wink1
{
@@ -91,7 +91,7 @@
}
}} // namespace detail::wink1
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Winkel I projection
@@ -136,7 +136,7 @@
factory.add_to_factory("wink1", new wink1_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Modified: trunk/boost/geometry/extensions/gis/projections/proj/wink2.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/wink2.hpp (original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/wink2.hpp 2012-03-04 05:42:09 EST (Sun, 04 Mar 2012)
@@ -4,7 +4,7 @@
// Boost.Geometry - extensions-gis-projections (based on PROJ4)
// This file is automatically generated. DO NOT EDIT.
-// Copyright (c) 2008-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,10 +13,10 @@
// This file is converted from PROJ4, http://trac.osgeo.org/proj
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
-// PROJ4 is converted to Boost.Geometry by Barend Gehrels (Geodan, Amsterdam)
+// PROJ4 is converted to Boost.Geometry by Barend Gehrels
// Original copyright notice:
-
+
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
@@ -45,7 +45,7 @@
namespace boost { namespace geometry { namespace projection
{
#ifndef DOXYGEN_NO_DETAIL
- namespace detail { namespace wink2{
+ namespace detail { namespace wink2{
static const int MAX_ITER = 10;
static const double LOOP_TOL = 1e-7;
static const double TWO_D_PI = 0.636619772367581343;
@@ -74,7 +74,7 @@
{
double k, V;
int i;
-
+
xy_y = lp_lat * TWO_D_PI;
k = PI * sin(lp_lat);
lp_lat *= 1.8;
@@ -104,7 +104,7 @@
}
}} // namespace detail::wink2
- #endif // doxygen
+ #endif // doxygen
/*!
\brief Winkel II projection
@@ -150,7 +150,7 @@
factory.add_to_factory("wink2", new wink2_entry<Geographic, Cartesian, Parameters>);
}
- } // namespace detail
+ } // namespace detail
#endif // doxygen
}}} // namespace boost::geometry::projection
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk