boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-01-31 20:22:09 +00:00
Code Issues Projects Releases Wiki Activity

[srs] Move projections from extensions to main part of the library.

Browse Source 
Move files from geometry/extensions/gis/projections to geometry/srs and
geometry/srs/projections.
Move project_transformer to strategies/transform.

Change namespace of bg::projection<> to bg::srs::projection<>.

Move dms_parser from extensions/gis/geographic/strategies to
srs/projections/impl and from strategy::parse namespace to
projections::detail namespace.
This commit is contained in:
Adam Wulkiewicz
2017-05-05 03:46:55 +02:00
parent 577080d0c9
commit d133efe071
137 changed files with 1103 additions and 1220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

278
include/boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp
View File

@@ -1,278 +0,0 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-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
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_STRATEGIES_DMS_PARSER_HPP
#define BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_STRATEGIES_DMS_PARSER_HPP
// This file is totally revised from PROJ4 dmstor.c
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
// PROJ4 is converted to Geometry Library by Barend Gehrels (Geodan, Amsterdam)
// 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
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <string>
#include <boost/static_assert.hpp>
#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
#include <boost/lexical_cast.hpp>
#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
#include <boost/algorithm/string.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/extensions/strategies/parse.hpp>
#include <boost/geometry/util/math.hpp>
namespace boost { namespace geometry
{
struct dms_result
{
enum axis_selector {axis_lat = 1, axis_lon = 0};
private :
typedef double T;
T m_angle;
axis_selector m_axis;
public :
explicit dms_result(T const& v, axis_selector ax)
: m_angle(v)
, m_axis(ax)
{}
inline axis_selector axis() const { return m_axis; }
inline operator double() const { return m_angle; }
template <typename CH, typename TR>
inline friend std::basic_ostream<CH, TR>& operator<<(std::basic_ostream<CH, TR>& os,
const dms_result& d)
{
os << d.m_angle;
return os;
}
};
namespace strategy
{
template <bool as_radian = true
, char N = 'N', char E = 'E', char S = 'S', char W = 'W' // translatable
, char MIN = '\'', char SEC = '"' // other char's possible
, char D = 'D', char R = 'R' // degree sign might be small o
>
struct dms_parser
{
// Question from Barend: can we compile-time select that it is case-sensitive/case-insensitive?
// We have to change the switch then -> specializations
// For now: make it (compile-time) case sensitive
static const int diff = 'a' - 'A';
#ifndef __GNUC__
BOOST_STATIC_ASSERT((diff > 0)); // make sure we've the right assumption. GCC does not accept this here.
#endif
static const char n_alter = N <= 'Z' ? N + diff : N - diff;
static const char e_alter = E <= 'Z' ? E + diff : E - diff;
static const char s_alter = S <= 'Z' ? S + diff : S - diff;
static const char w_alter = W <= 'Z' ? W + diff : W - diff;
static const char r_alter = R <= 'Z' ? R + diff : R - diff;
// degree is normally D (proj4) but might be superscript o
// Note d_alter is not correct then, so map it to NULL now, guarded by the while
static const char d_alter =
((D >= 'A' && D <= 'Z') || (D >= 'a' && D <= 'z')) ? (D <= 'Z' ? D + diff : D - diff) : '\0';
struct dms_value
{
double dms[3];
bool has_dms[3];
dms_value()
{
memset(this, 0, sizeof(dms_value));
}
};
template <size_t I>
static inline void assign_dms(dms_value& dms, std::string& value, bool& has_value)
{
#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
dms.dms[I] = boost::lexical_cast<double>(value.c_str());
#else // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
dms.dms[I] = std::atof(value.c_str());
#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
dms.has_dms[I] = true;
has_value = false;
value.clear();
}
static inline void process(dms_value& dms, std::string& value, bool& has_value)
{
if (has_value)
{
// Assign last one, sequentially
if (! dms.has_dms[0]) assign_dms<0>(dms, value, has_value);
else if (! dms.has_dms[1]) assign_dms<1>(dms, value, has_value);
else if (! dms.has_dms[2]) assign_dms<2>(dms, value, has_value);
}
}
dms_result operator()(const char* is) const
{
dms_value dms;
bool has_value = false;
std::string value;
double factor = 1.0; // + denotes N/E values, -1 denotes S/W values
dms_result::axis_selector axis = dms_result::axis_lon; // true denotes N/S values
bool in_radian = false; // true denotes values as "0.1R"
while(*is)
{
switch(*is)
{
case '-' :
if (! has_value && ! dms.has_dms[0])
{
factor = -factor;
}
break;
case N :
case n_alter :
axis = dms_result::axis_lat;
break;
case S :
case s_alter :
axis = dms_result::axis_lat;
factor = -factor;
break;
case E :
case e_alter :
axis = dms_result::axis_lon;
break;
case W :
case w_alter :
axis = dms_result::axis_lon;
factor = -factor;
break;
case D :
case d_alter :
if (! dms.has_dms[0] && has_value)
{
assign_dms<0>(dms, value, has_value);
}
break;
case R :
case r_alter :
if (! dms.has_dms[0] && has_value)
{
// specified value is in radian!
in_radian = true;
assign_dms<0>(dms, value, has_value);
}
break;
case MIN:
if (! dms.has_dms[1] && has_value)
{
assign_dms<1>(dms, value, has_value);
}
break;
case SEC :
if (! dms.has_dms[2] && has_value)
{
assign_dms<2>(dms, value, has_value);
}
break;
case ' ' :
case '\t' :
case '\n' :
process(dms, value, has_value);
break;
default :
value += *is;
has_value = true;
break;
}
is++;
}
// Assign last one, if any
process(dms, value, has_value);
double const d2r = math::d2r<double>();
double const r2d = math::r2d<double>();
return dms_result(factor *
(in_radian && as_radian
? dms.dms[0]
: in_radian && ! as_radian
? dms.dms[0] * r2d
: ! in_radian && as_radian
? dms.dms[0] * d2r + dms.dms[1] * d2r / 60.0 + dms.dms[2] * d2r / 3600.0
: dms.dms[0] + dms.dms[1] / 60.0 + dms.dms[2] / 3600.0)
, axis);
}
};
}
#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
template <template<typename> class CoordinateSystem>
struct strategy_parse<geographic_tag, CoordinateSystem<degree> >
{
typedef strategy::dms_parser<false> type;
};
template <template<typename> class CoordinateSystem>
struct strategy_parse<geographic_tag, CoordinateSystem<radian> >
{
typedef strategy::dms_parser<true> type;
};
#endif
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_GEOGRAPHIC_STRATEGIES_DMS_PARSER_HPP

275
include/boost/geometry/extensions/gis/projections/factory.hpp
View File

@@ -1,275 +0,0 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
#define BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
#include <map>
#include <string>
#include <boost/shared_ptr.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/proj/aea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/aeqd.hpp>
#include <boost/geometry/extensions/gis/projections/proj/airy.hpp>
#include <boost/geometry/extensions/gis/projections/proj/aitoff.hpp>
#include <boost/geometry/extensions/gis/projections/proj/august.hpp>
#include <boost/geometry/extensions/gis/projections/proj/bacon.hpp>
#include <boost/geometry/extensions/gis/projections/proj/bipc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/boggs.hpp>
#include <boost/geometry/extensions/gis/projections/proj/bonne.hpp>
#include <boost/geometry/extensions/gis/projections/proj/cass.hpp>
#include <boost/geometry/extensions/gis/projections/proj/cc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/cea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/chamb.hpp>
#include <boost/geometry/extensions/gis/projections/proj/collg.hpp>
#include <boost/geometry/extensions/gis/projections/proj/crast.hpp>
#include <boost/geometry/extensions/gis/projections/proj/denoy.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eck1.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eck2.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eck3.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eck4.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eck5.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eqc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/eqdc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/etmerc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/fahey.hpp>
#include <boost/geometry/extensions/gis/projections/proj/fouc_s.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gall.hpp>
#include <boost/geometry/extensions/gis/projections/proj/geocent.hpp>
#include <boost/geometry/extensions/gis/projections/proj/geos.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gins8.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gnom.hpp>
#include <boost/geometry/extensions/gis/projections/proj/goode.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gstmerc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/hammer.hpp>
#include <boost/geometry/extensions/gis/projections/proj/hatano.hpp>
#include <boost/geometry/extensions/gis/projections/proj/healpix.hpp>
#include <boost/geometry/extensions/gis/projections/proj/krovak.hpp>
#include <boost/geometry/extensions/gis/projections/proj/igh.hpp>
#include <boost/geometry/extensions/gis/projections/proj/imw_p.hpp>
#include <boost/geometry/extensions/gis/projections/proj/isea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/laea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/labrd.hpp>
#include <boost/geometry/extensions/gis/projections/proj/lagrng.hpp>
#include <boost/geometry/extensions/gis/projections/proj/larr.hpp>
#include <boost/geometry/extensions/gis/projections/proj/lask.hpp>
#include <boost/geometry/extensions/gis/projections/proj/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/proj/lcc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/lcca.hpp>
#include <boost/geometry/extensions/gis/projections/proj/loxim.hpp>
#include <boost/geometry/extensions/gis/projections/proj/lsat.hpp>
#include <boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp>
#include <boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp>
#include <boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp>
#include <boost/geometry/extensions/gis/projections/proj/merc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/mill.hpp>
#include <boost/geometry/extensions/gis/projections/proj/mod_ster.hpp>
#include <boost/geometry/extensions/gis/projections/proj/moll.hpp>
#include <boost/geometry/extensions/gis/projections/proj/natearth.hpp>
#include <boost/geometry/extensions/gis/projections/proj/nell.hpp>
#include <boost/geometry/extensions/gis/projections/proj/nell_h.hpp>
#include <boost/geometry/extensions/gis/projections/proj/nocol.hpp>
#include <boost/geometry/extensions/gis/projections/proj/nsper.hpp>
#include <boost/geometry/extensions/gis/projections/proj/nzmg.hpp>
#include <boost/geometry/extensions/gis/projections/proj/ob_tran.hpp>
#include <boost/geometry/extensions/gis/projections/proj/ocea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/oea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/omerc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/ortho.hpp>
#include <boost/geometry/extensions/gis/projections/proj/qsc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/poly.hpp>
#include <boost/geometry/extensions/gis/projections/proj/putp2.hpp>
#include <boost/geometry/extensions/gis/projections/proj/putp3.hpp>
#include <boost/geometry/extensions/gis/projections/proj/putp4p.hpp>
#include <boost/geometry/extensions/gis/projections/proj/putp5.hpp>
#include <boost/geometry/extensions/gis/projections/proj/putp6.hpp>
#include <boost/geometry/extensions/gis/projections/proj/robin.hpp>
#include <boost/geometry/extensions/gis/projections/proj/rouss.hpp>
#include <boost/geometry/extensions/gis/projections/proj/rpoly.hpp>
#include <boost/geometry/extensions/gis/projections/proj/sconics.hpp>
#include <boost/geometry/extensions/gis/projections/proj/somerc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/stere.hpp>
#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/sts.hpp>
#include <boost/geometry/extensions/gis/projections/proj/tcc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/tcea.hpp>
#include <boost/geometry/extensions/gis/projections/proj/tmerc.hpp>
#include <boost/geometry/extensions/gis/projections/proj/tpeqd.hpp>
#include <boost/geometry/extensions/gis/projections/proj/urm5.hpp>
#include <boost/geometry/extensions/gis/projections/proj/urmfps.hpp>
#include <boost/geometry/extensions/gis/projections/proj/vandg.hpp>
#include <boost/geometry/extensions/gis/projections/proj/vandg2.hpp>
#include <boost/geometry/extensions/gis/projections/proj/vandg4.hpp>
#include <boost/geometry/extensions/gis/projections/proj/wag2.hpp>
#include <boost/geometry/extensions/gis/projections/proj/wag3.hpp>
#include <boost/geometry/extensions/gis/projections/proj/wag7.hpp>
#include <boost/geometry/extensions/gis/projections/proj/wink1.hpp>
#include <boost/geometry/extensions/gis/projections/proj/wink2.hpp>
namespace boost { namespace geometry { namespace projections
{
namespace detail
{
template <typename CT, typename Parameters>
class factory : public detail::base_factory<CT, Parameters>
{
private:
typedef std::map
<
std::string,
boost::shared_ptr
<
detail::factory_entry
<
CT,
Parameters
>
>
> prj_registry;
prj_registry m_registry;
public:
factory()
{
detail::aea_init(*this);
detail::aeqd_init(*this);
detail::airy_init(*this);
detail::aitoff_init(*this);
detail::august_init(*this);
detail::bacon_init(*this);
detail::bipc_init(*this);
detail::boggs_init(*this);
detail::bonne_init(*this);
detail::cass_init(*this);
detail::cc_init(*this);
detail::cea_init(*this);
detail::chamb_init(*this);
detail::collg_init(*this);
detail::crast_init(*this);
detail::denoy_init(*this);
detail::eck1_init(*this);
detail::eck2_init(*this);
detail::eck3_init(*this);
detail::eck4_init(*this);
detail::eck5_init(*this);
detail::eqc_init(*this);
detail::eqdc_init(*this);
detail::etmerc_init(*this);
detail::fahey_init(*this);
detail::fouc_s_init(*this);
detail::gall_init(*this);
detail::geocent_init(*this);
detail::geos_init(*this);
detail::gins8_init(*this);
detail::gn_sinu_init(*this);
detail::gnom_init(*this);
detail::goode_init(*this);
detail::gstmerc_init(*this);
detail::hammer_init(*this);
detail::hatano_init(*this);
detail::healpix_init(*this);
detail::krovak_init(*this);
detail::igh_init(*this);
detail::imw_p_init(*this);
detail::isea_init(*this);
detail::labrd_init(*this);
detail::laea_init(*this);
detail::lagrng_init(*this);
detail::larr_init(*this);
detail::lask_init(*this);
detail::latlong_init(*this);
detail::lcc_init(*this);
detail::lcca_init(*this);
detail::loxim_init(*this);
detail::lsat_init(*this);
detail::mbtfpp_init(*this);
detail::mbtfpq_init(*this);
detail::mbt_fps_init(*this);
detail::merc_init(*this);
detail::mill_init(*this);
detail::mod_ster_init(*this);
detail::moll_init(*this);
detail::natearth_init(*this);
detail::nell_init(*this);
detail::nell_h_init(*this);
detail::nocol_init(*this);
detail::nsper_init(*this);
detail::nzmg_init(*this);
detail::ob_tran_init(*this);
detail::ocea_init(*this);
detail::oea_init(*this);
detail::omerc_init(*this);
detail::ortho_init(*this);
detail::qsc_init(*this);
detail::poly_init(*this);
detail::putp2_init(*this);
detail::putp3_init(*this);
detail::putp4p_init(*this);
detail::putp5_init(*this);
detail::putp6_init(*this);
detail::robin_init(*this);
detail::rouss_init(*this);
detail::rpoly_init(*this);
detail::sconics_init(*this);
detail::somerc_init(*this);
detail::stere_init(*this);
detail::sterea_init(*this);
detail::sts_init(*this);
detail::tcc_init(*this);
detail::tcea_init(*this);
detail::tmerc_init(*this);
detail::tpeqd_init(*this);
detail::urm5_init(*this);
detail::urmfps_init(*this);
detail::vandg_init(*this);
detail::vandg2_init(*this);
detail::vandg4_init(*this);
detail::wag2_init(*this);
detail::wag3_init(*this);
detail::wag7_init(*this);
detail::wink1_init(*this);
detail::wink2_init(*this);
}
virtual ~factory() {}
virtual void add_to_factory(std::string const& name,
detail::factory_entry<CT, Parameters>* sub)
{
m_registry[name].reset(sub);
}
inline detail::base_v<CT, Parameters>* create_new(Parameters const& parameters) const
{
typename prj_registry::const_iterator it = m_registry.find(parameters.name);
if (it != m_registry.end())
{
return it->second->create_new(parameters);
}
return 0;
}
};
} // namespace detail
}}} // namespace boost::geometry::projections
#endif // BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP

58
include/boost/geometry/extensions/gis/projections/new_projection.hpp
View File

@@ -1,58 +0,0 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2012 Krzysztof Czainski
// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_NEW_PROJECTION_HPP
#define BOOST_GEOMETRY_PROJECTIONS_NEW_PROJECTION_HPP
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/projection_point_type.hpp>
namespace boost { namespace geometry { namespace projections
{
/*!
\brief Creates a type-erased projection
\details Creates using operator new a class derived from projection, that forwards method
calls to @p Proj.
\ingroup projection
\tparam Projection Type of the concrete projection to be created.
\tparam Parameters projection parameters type
\see projection
\see factory
*/
//@{
template <typename Projection, typename Parameters>
inline base_v
<
typename detail::projection_point_type<Projection, geographic_tag>::type
, typename detail::projection_point_type<Projection, cartesian_tag>::type
, Parameters
>* new_projection(Parameters const& par)
{
return new detail::base_v_fi
<
Projection
, typename detail::projection_point_type<Projection, geographic_tag>::type
, typename detail::projection_point_type<Projection, cartesian_tag>::type
, Parameters
>(par);
}
//@}
}}} // boost::geometry::projections
#endif // BOOST_GEOMETRY_PROJECTIONS_NEW_PROJECTION_HPP

44
include/boost/geometry/extensions/gis/projections/projection_point_type.hpp
View File

@@ -1,44 +0,0 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2012 Krzysztof Czainski
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_PROJECTION_POINT_TYPE_HPP
#define BOOST_GEOMETRY_PROJECTIONS_PROJECTION_POINT_TYPE_HPP
namespace boost { namespace geometry { namespace projections
{
#ifndef DOXYGEN_NO_DETAIL
namespace detail
{
template <typename Projection, typename CoordinateSystemTag>
struct projection_point_type
{};
template <typename Projection>
struct projection_point_type<Projection, cartesian_tag>
{
typedef typename Projection::cartesian_point_type type;
};
template <typename Projection>
struct projection_point_type<Projection, geographic_tag>
{
typedef typename Projection::geographic_point_type type;
};
} // detail
#endif // DOXYGEN_NO_DETAIL
}}} // boost::geometry::projection
#endif // BOOST_GEOMETRY_PROJECTIONS_PROJECTION_POINT_TYPE_HPP

41
include/boost/geometry/extensions/strategies/parse.hpp
View File

@@ -1,41 +0,0 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, 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
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_STRATEGIES_EXTENSIONS_PARSE_HPP
#define BOOST_GEOMETRY_STRATEGIES_EXTENSIONS_PARSE_HPP
#include <boost/geometry/strategies/tags.hpp>
namespace boost { namespace geometry
{
/*!
\brief Tagraits class binding a parsing strategy to a coordinate system
\ingroup parse
\tparam Tag tag of coordinate system of point-type
\tparam CoordinateSystem coordinate system
*/
template <typename Tag, typename CoordinateSystem>
struct strategy_parse
{
typedef strategy::not_implemented type;
};
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_STRATEGIES_EXTENSIONS_PARSE_HPP

9
include/boost/geometry/extensions/gis/projections/ellps.hpp → include/boost/geometry/srs/ellps.hpp
View File

@@ -7,8 +7,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_ELLPS_HPP
#define BOOST_GEOMETRY_PROJECTIONS_ELLPS_HPP
#ifndef BOOST_GEOMETRY_SRS_ELLPS_HPP
#define BOOST_GEOMETRY_SRS_ELLPS_HPP
#include <boost/geometry/srs/sphere.hpp>
@@ -118,8 +118,9 @@ BOOST_GEOMETRY_PROJECTIONS_DETAIL_ELLPS_A_RF(WGS66, 6378145.0, 298.25)
BOOST_GEOMETRY_PROJECTIONS_DETAIL_ELLPS_A_RF(WGS72, 6378135.0, 298.26)
BOOST_GEOMETRY_PROJECTIONS_DETAIL_ELLPS_A_RF(WGS84, 6378137.0, 298.257223563)
BOOST_GEOMETRY_PROJECTIONS_DETAIL_SPHER_R (sphere, 6370997.0)
BOOST_GEOMETRY_PROJECTIONS_DETAIL_SPHER_R (WGS84_sphere, 6378137.0)
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_PROJECTIONS_ELLPS_HPP
#endif // BOOST_GEOMETRY_SRS_ELLPS_HPP

7
include/boost/geometry/extensions/gis/projections/parameters.hpp → include/boost/geometry/srs/parameters.hpp
View File

@@ -10,8 +10,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_PARAMETERS_HPP
#define BOOST_GEOMETRY_PROJECTIONS_PARAMETERS_HPP
#ifndef BOOST_GEOMETRY_SRS_PARAMETERS_HPP
#define BOOST_GEOMETRY_SRS_PARAMETERS_HPP
#include <string>
@@ -91,4 +91,5 @@ struct static_epsg
}}} // namespace boost::geometry::srs
#endif
#endif // BOOST_GEOMETRY_SRS_PARAMETERS_HPP

34
include/boost/geometry/extensions/gis/projections/projection.hpp → include/boost/geometry/srs/projection.hpp
View File

@@ -10,8 +10,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_PROJECTION_HPP
#define BOOST_GEOMETRY_PROJECTIONS_PROJECTION_HPP
#ifndef BOOST_GEOMETRY_SRS_PROJECTION_HPP
#define BOOST_GEOMETRY_SRS_PROJECTION_HPP
#include <string>
@@ -20,15 +20,15 @@
#include <boost/geometry/core/coordinate_dimension.hpp>
#include <boost/geometry/extensions/gis/projections/ellps.hpp>
#include <boost/geometry/extensions/gis/projections/epsg.hpp>
#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
#include <boost/geometry/extensions/gis/projections/exception.hpp>
#include <boost/geometry/extensions/gis/projections/factory.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_init.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/srs/ellps.hpp>
#include <boost/geometry/srs/parameters.hpp>
#include <boost/geometry/srs/projections/epsg.hpp>
#include <boost/geometry/srs/projections/epsg_traits.hpp>
#include <boost/geometry/srs/projections/exception.hpp>
#include <boost/geometry/srs/projections/factory.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/pj_init.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/if.hpp>
@@ -99,6 +99,11 @@ inline bool inverse(Proj const& proj, XY const& xy, LL& ll)
}} // namespace projections::detail
#endif // DOXYGEN_NO_DETAIL
namespace srs
{
/*!
\brief Representation of projection
\details Either dynamic or static projection representation
@@ -266,8 +271,11 @@ private:
projection_type m_proj;
};
} // namespace srs
}} // namespace boost::geometry
#endif
#endif // BOOST_GEOMETRY_SRS_PROJECTION_HPP

0
include/boost/geometry/extensions/gis/projections/epsg.hpp → include/boost/geometry/srs/projections/epsg.hpp
View File

4
include/boost/geometry/extensions/gis/projections/epsg_traits.hpp → include/boost/geometry/srs/projections/epsg_traits.hpp
View File

@@ -16,8 +16,8 @@
#include <boost/geometry/core/tags.hpp>
#include <boost/geometry/extensions/gis/projections/factory.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/factory.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections

0
include/boost/geometry/extensions/gis/projections/exception.hpp → include/boost/geometry/srs/projections/exception.hpp
View File

274
include/boost/geometry/srs/projections/factory.hpp Normal file
View File

@@ -0,0 +1,274 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
#define BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
#include <map>
#include <string>
#include <boost/shared_ptr.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/proj/aea.hpp>
#include <boost/geometry/srs/projections/proj/aeqd.hpp>
#include <boost/geometry/srs/projections/proj/airy.hpp>
#include <boost/geometry/srs/projections/proj/aitoff.hpp>
#include <boost/geometry/srs/projections/proj/august.hpp>
#include <boost/geometry/srs/projections/proj/bacon.hpp>
#include <boost/geometry/srs/projections/proj/bipc.hpp>
#include <boost/geometry/srs/projections/proj/boggs.hpp>
#include <boost/geometry/srs/projections/proj/bonne.hpp>
#include <boost/geometry/srs/projections/proj/cass.hpp>
#include <boost/geometry/srs/projections/proj/cc.hpp>
#include <boost/geometry/srs/projections/proj/cea.hpp>
#include <boost/geometry/srs/projections/proj/chamb.hpp>
#include <boost/geometry/srs/projections/proj/collg.hpp>
#include <boost/geometry/srs/projections/proj/crast.hpp>
#include <boost/geometry/srs/projections/proj/denoy.hpp>
#include <boost/geometry/srs/projections/proj/eck1.hpp>
#include <boost/geometry/srs/projections/proj/eck2.hpp>
#include <boost/geometry/srs/projections/proj/eck3.hpp>
#include <boost/geometry/srs/projections/proj/eck4.hpp>
#include <boost/geometry/srs/projections/proj/eck5.hpp>
#include <boost/geometry/srs/projections/proj/eqc.hpp>
#include <boost/geometry/srs/projections/proj/eqdc.hpp>
#include <boost/geometry/srs/projections/proj/etmerc.hpp>
#include <boost/geometry/srs/projections/proj/fahey.hpp>
#include <boost/geometry/srs/projections/proj/fouc_s.hpp>
#include <boost/geometry/srs/projections/proj/gall.hpp>
#include <boost/geometry/srs/projections/proj/geocent.hpp>
#include <boost/geometry/srs/projections/proj/geos.hpp>
#include <boost/geometry/srs/projections/proj/gins8.hpp>
#include <boost/geometry/srs/projections/proj/gn_sinu.hpp>
#include <boost/geometry/srs/projections/proj/gnom.hpp>
#include <boost/geometry/srs/projections/proj/goode.hpp>
#include <boost/geometry/srs/projections/proj/gstmerc.hpp>
#include <boost/geometry/srs/projections/proj/hammer.hpp>
#include <boost/geometry/srs/projections/proj/hatano.hpp>
#include <boost/geometry/srs/projections/proj/healpix.hpp>
#include <boost/geometry/srs/projections/proj/krovak.hpp>
#include <boost/geometry/srs/projections/proj/igh.hpp>
#include <boost/geometry/srs/projections/proj/imw_p.hpp>
#include <boost/geometry/srs/projections/proj/isea.hpp>
#include <boost/geometry/srs/projections/proj/laea.hpp>
#include <boost/geometry/srs/projections/proj/labrd.hpp>
#include <boost/geometry/srs/projections/proj/lagrng.hpp>
#include <boost/geometry/srs/projections/proj/larr.hpp>
#include <boost/geometry/srs/projections/proj/lask.hpp>
#include <boost/geometry/srs/projections/proj/latlong.hpp>
#include <boost/geometry/srs/projections/proj/lcc.hpp>
#include <boost/geometry/srs/projections/proj/lcca.hpp>
#include <boost/geometry/srs/projections/proj/loxim.hpp>
#include <boost/geometry/srs/projections/proj/lsat.hpp>
#include <boost/geometry/srs/projections/proj/mbtfpp.hpp>
#include <boost/geometry/srs/projections/proj/mbtfpq.hpp>
#include <boost/geometry/srs/projections/proj/mbt_fps.hpp>
#include <boost/geometry/srs/projections/proj/merc.hpp>
#include <boost/geometry/srs/projections/proj/mill.hpp>
#include <boost/geometry/srs/projections/proj/mod_ster.hpp>
#include <boost/geometry/srs/projections/proj/moll.hpp>
#include <boost/geometry/srs/projections/proj/natearth.hpp>
#include <boost/geometry/srs/projections/proj/nell.hpp>
#include <boost/geometry/srs/projections/proj/nell_h.hpp>
#include <boost/geometry/srs/projections/proj/nocol.hpp>
#include <boost/geometry/srs/projections/proj/nsper.hpp>
#include <boost/geometry/srs/projections/proj/nzmg.hpp>
#include <boost/geometry/srs/projections/proj/ob_tran.hpp>
#include <boost/geometry/srs/projections/proj/ocea.hpp>
#include <boost/geometry/srs/projections/proj/oea.hpp>
#include <boost/geometry/srs/projections/proj/omerc.hpp>
#include <boost/geometry/srs/projections/proj/ortho.hpp>
#include <boost/geometry/srs/projections/proj/qsc.hpp>
#include <boost/geometry/srs/projections/proj/poly.hpp>
#include <boost/geometry/srs/projections/proj/putp2.hpp>
#include <boost/geometry/srs/projections/proj/putp3.hpp>
#include <boost/geometry/srs/projections/proj/putp4p.hpp>
#include <boost/geometry/srs/projections/proj/putp5.hpp>
#include <boost/geometry/srs/projections/proj/putp6.hpp>
#include <boost/geometry/srs/projections/proj/robin.hpp>
#include <boost/geometry/srs/projections/proj/rouss.hpp>
#include <boost/geometry/srs/projections/proj/rpoly.hpp>
#include <boost/geometry/srs/projections/proj/sconics.hpp>
#include <boost/geometry/srs/projections/proj/somerc.hpp>
#include <boost/geometry/srs/projections/proj/stere.hpp>
#include <boost/geometry/srs/projections/proj/sterea.hpp>
#include <boost/geometry/srs/projections/proj/sts.hpp>
#include <boost/geometry/srs/projections/proj/tcc.hpp>
#include <boost/geometry/srs/projections/proj/tcea.hpp>
#include <boost/geometry/srs/projections/proj/tmerc.hpp>
#include <boost/geometry/srs/projections/proj/tpeqd.hpp>
#include <boost/geometry/srs/projections/proj/urm5.hpp>
#include <boost/geometry/srs/projections/proj/urmfps.hpp>
#include <boost/geometry/srs/projections/proj/vandg.hpp>
#include <boost/geometry/srs/projections/proj/vandg2.hpp>
#include <boost/geometry/srs/projections/proj/vandg4.hpp>
#include <boost/geometry/srs/projections/proj/wag2.hpp>
#include <boost/geometry/srs/projections/proj/wag3.hpp>
#include <boost/geometry/srs/projections/proj/wag7.hpp>
#include <boost/geometry/srs/projections/proj/wink1.hpp>
#include <boost/geometry/srs/projections/proj/wink2.hpp>
namespace boost { namespace geometry { namespace projections
{
namespace detail
{
template <typename CT, typename Parameters>
class factory : public detail::base_factory<CT, Parameters>
{
private:
typedef std::map
<
std::string,
boost::shared_ptr
<
detail::factory_entry
<
CT,
Parameters
>
>
> prj_registry;
prj_registry m_registry;
public:
factory()
{
detail::aea_init(*this);
detail::aeqd_init(*this);
detail::airy_init(*this);
detail::aitoff_init(*this);
detail::august_init(*this);
detail::bacon_init(*this);
detail::bipc_init(*this);
detail::boggs_init(*this);
detail::bonne_init(*this);
detail::cass_init(*this);
detail::cc_init(*this);
detail::cea_init(*this);
detail::chamb_init(*this);
detail::collg_init(*this);
detail::crast_init(*this);
detail::denoy_init(*this);
detail::eck1_init(*this);
detail::eck2_init(*this);
detail::eck3_init(*this);
detail::eck4_init(*this);
detail::eck5_init(*this);
detail::eqc_init(*this);
detail::eqdc_init(*this);
detail::etmerc_init(*this);
detail::fahey_init(*this);
detail::fouc_s_init(*this);
detail::gall_init(*this);
detail::geocent_init(*this);
detail::geos_init(*this);
detail::gins8_init(*this);
detail::gn_sinu_init(*this);
detail::gnom_init(*this);
detail::goode_init(*this);
detail::gstmerc_init(*this);
detail::hammer_init(*this);
detail::hatano_init(*this);
detail::healpix_init(*this);
detail::krovak_init(*this);
detail::igh_init(*this);
detail::imw_p_init(*this);
detail::isea_init(*this);
detail::labrd_init(*this);
detail::laea_init(*this);
detail::lagrng_init(*this);
detail::larr_init(*this);
detail::lask_init(*this);
detail::latlong_init(*this);
detail::lcc_init(*this);
detail::lcca_init(*this);
detail::loxim_init(*this);
detail::lsat_init(*this);
detail::mbtfpp_init(*this);
detail::mbtfpq_init(*this);
detail::mbt_fps_init(*this);
detail::merc_init(*this);
detail::mill_init(*this);
detail::mod_ster_init(*this);
detail::moll_init(*this);
detail::natearth_init(*this);
detail::nell_init(*this);
detail::nell_h_init(*this);
detail::nocol_init(*this);
detail::nsper_init(*this);
detail::nzmg_init(*this);
detail::ob_tran_init(*this);
detail::ocea_init(*this);
detail::oea_init(*this);
detail::omerc_init(*this);
detail::ortho_init(*this);
detail::qsc_init(*this);
detail::poly_init(*this);
detail::putp2_init(*this);
detail::putp3_init(*this);
detail::putp4p_init(*this);
detail::putp5_init(*this);
detail::putp6_init(*this);
detail::robin_init(*this);
detail::rouss_init(*this);
detail::rpoly_init(*this);
detail::sconics_init(*this);
detail::somerc_init(*this);
detail::stere_init(*this);
detail::sterea_init(*this);
detail::sts_init(*this);
detail::tcc_init(*this);
detail::tcea_init(*this);
detail::tmerc_init(*this);
detail::tpeqd_init(*this);
detail::urm5_init(*this);
detail::urmfps_init(*this);
detail::vandg_init(*this);
detail::vandg2_init(*this);
detail::vandg4_init(*this);
detail::wag2_init(*this);
detail::wag3_init(*this);
detail::wag7_init(*this);
detail::wink1_init(*this);
detail::wink2_init(*this);
}
virtual ~factory() {}
virtual void add_to_factory(std::string const& name,
detail::factory_entry<CT, Parameters>* sub)
{
m_registry[name].reset(sub);
}
inline detail::base_v<CT, Parameters>* create_new(Parameters const& parameters) const
{
typename prj_registry::const_iterator it = m_registry.find(parameters.name);
if (it != m_registry.end())
{
return it->second->create_new(parameters);
}
return 0;
}
};
} // namespace detail
}}} // namespace boost::geometry::projections
#endif // BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP

0
include/boost/geometry/extensions/gis/projections/impl/aasincos.hpp → include/boost/geometry/srs/projections/impl/aasincos.hpp
View File

0
include/boost/geometry/extensions/gis/projections/impl/adjlon.hpp → include/boost/geometry/srs/projections/impl/adjlon.hpp
View File

2
include/boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp → include/boost/geometry/srs/projections/impl/base_dynamic.hpp
View File

@@ -15,7 +15,7 @@
#include <string>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections
{

4
include/boost/geometry/extensions/gis/projections/impl/base_static.hpp → include/boost/geometry/srs/projections/impl/base_static.hpp
View File

@@ -23,8 +23,8 @@
#include <boost/geometry/core/tags.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_inv.hpp>
#include <boost/geometry/srs/projections/impl/pj_fwd.hpp>
#include <boost/geometry/srs/projections/impl/pj_inv.hpp>
#include <boost/mpl/assert.hpp>

264
include/boost/geometry/srs/projections/impl/dms_parser.hpp Normal file
View File

@@ -0,0 +1,264 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_DMS_PARSER_HPP
#define BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_DMS_PARSER_HPP
// This file is totally revised from PROJ4 dmstor.c
// PROJ4 is originally written by Gerald Evenden (then of the USGS)
// PROJ4 is maintained by Frank Warmerdam
// PROJ4 is converted to Geometry Library by Barend Gehrels (Geodan, Amsterdam)
// 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
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <string>
#include <boost/static_assert.hpp>
#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
#include <boost/lexical_cast.hpp>
#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
#include <boost/algorithm/string.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/util/math.hpp>
namespace boost { namespace geometry { namespace projections
{
namespace detail
{
struct dms_result
{
enum axis_selector {axis_lat = 1, axis_lon = 0};
private :
typedef double T;
T m_angle;
axis_selector m_axis;
public :
explicit dms_result(T const& v, axis_selector ax)
: m_angle(v)
, m_axis(ax)
{}
inline axis_selector axis() const { return m_axis; }
inline operator double() const { return m_angle; }
template <typename CH, typename TR>
inline friend std::basic_ostream<CH, TR>& operator<<(std::basic_ostream<CH, TR>& os,
const dms_result& d)
{
os << d.m_angle;
return os;
}
};
template <bool as_radian = true
, char N = 'N', char E = 'E', char S = 'S', char W = 'W' // translatable
, char MIN = '\'', char SEC = '"' // other char's possible
, char D = 'D', char R = 'R' // degree sign might be small o
>
struct dms_parser
{
// Question from Barend: can we compile-time select that it is case-sensitive/case-insensitive?
// We have to change the switch then -> specializations
// For now: make it (compile-time) case sensitive
static const int diff = 'a' - 'A';
#ifndef __GNUC__
BOOST_STATIC_ASSERT((diff > 0)); // make sure we've the right assumption. GCC does not accept this here.
#endif
static const char n_alter = N <= 'Z' ? N + diff : N - diff;
static const char e_alter = E <= 'Z' ? E + diff : E - diff;
static const char s_alter = S <= 'Z' ? S + diff : S - diff;
static const char w_alter = W <= 'Z' ? W + diff : W - diff;
static const char r_alter = R <= 'Z' ? R + diff : R - diff;
// degree is normally D (proj4) but might be superscript o
// Note d_alter is not correct then, so map it to NULL now, guarded by the while
static const char d_alter =
((D >= 'A' && D <= 'Z') || (D >= 'a' && D <= 'z')) ? (D <= 'Z' ? D + diff : D - diff) : '\0';
struct dms_value
{
double dms[3];
bool has_dms[3];
dms_value()
{
memset(this, 0, sizeof(dms_value));
}
};
template <size_t I>
static inline void assign_dms(dms_value& dms, std::string& value, bool& has_value)
{
#if !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
dms.dms[I] = boost::lexical_cast<double>(value.c_str());
#else // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
dms.dms[I] = std::atof(value.c_str());
#endif // !defined(BOOST_GEOMETRY_NO_LEXICAL_CAST)
dms.has_dms[I] = true;
has_value = false;
value.clear();
}
static inline void process(dms_value& dms, std::string& value, bool& has_value)
{
if (has_value)
{
// Assign last one, sequentially
if (! dms.has_dms[0]) assign_dms<0>(dms, value, has_value);
else if (! dms.has_dms[1]) assign_dms<1>(dms, value, has_value);
else if (! dms.has_dms[2]) assign_dms<2>(dms, value, has_value);
}
}
dms_result operator()(const char* is) const
{
dms_value dms;
bool has_value = false;
std::string value;
double factor = 1.0; // + denotes N/E values, -1 denotes S/W values
dms_result::axis_selector axis = dms_result::axis_lon; // true denotes N/S values
bool in_radian = false; // true denotes values as "0.1R"
while(*is)
{
switch(*is)
{
case '-' :
if (! has_value && ! dms.has_dms[0])
{
factor = -factor;
}
break;
case N :
case n_alter :
axis = dms_result::axis_lat;
break;
case S :
case s_alter :
axis = dms_result::axis_lat;
factor = -factor;
break;
case E :
case e_alter :
axis = dms_result::axis_lon;
break;
case W :
case w_alter :
axis = dms_result::axis_lon;
factor = -factor;
break;
case D :
case d_alter :
if (! dms.has_dms[0] && has_value)
{
assign_dms<0>(dms, value, has_value);
}
break;
case R :
case r_alter :
if (! dms.has_dms[0] && has_value)
{
// specified value is in radian!
in_radian = true;
assign_dms<0>(dms, value, has_value);
}
break;
case MIN:
if (! dms.has_dms[1] && has_value)
{
assign_dms<1>(dms, value, has_value);
}
break;
case SEC :
if (! dms.has_dms[2] && has_value)
{
assign_dms<2>(dms, value, has_value);
}
break;
case ' ' :
case '\t' :
case '\n' :
process(dms, value, has_value);
break;
default :
value += *is;
has_value = true;
break;
}
is++;
}
// Assign last one, if any
process(dms, value, has_value);
double const d2r = math::d2r<double>();
double const r2d = math::r2d<double>();
return dms_result(factor *
(in_radian && as_radian
? dms.dms[0]
: in_radian && ! as_radian
? dms.dms[0] * r2d
: ! in_radian && as_radian
? dms.dms[0] * d2r + dms.dms[1] * d2r / 60.0 + dms.dms[2] * d2r / 3600.0
: dms.dms[0] + dms.dms[1] / 60.0 + dms.dms[2] / 3600.0)
, axis);
}
};
} // namespace detail
}}} // namespace boost::geometry::projections
#endif // BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_DMS_PARSER_HPP

2
include/boost/geometry/extensions/gis/projections/impl/factory_entry.hpp → include/boost/geometry/srs/projections/impl/factory_entry.hpp
View File

@@ -15,7 +15,7 @@
#include <string>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
namespace boost { namespace geometry { namespace projections
{

0
include/boost/geometry/extensions/gis/projections/impl/function_overloads.hpp → include/boost/geometry/srs/projections/impl/function_overloads.hpp
View File

0
include/boost/geometry/extensions/gis/projections/impl/pj_auth.hpp → include/boost/geometry/srs/projections/impl/pj_auth.hpp
View File

12
include/boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp → include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -35,14 +39,16 @@
#ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUM_SET_HPP
#define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUM_SET_HPP
#include <string>
#include <vector>
#include <boost/algorithm/string.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_datums.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_param.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/srs/parameters.hpp>
#include <boost/geometry/srs/projections/impl/pj_datums.hpp>
#include <boost/geometry/srs/projections/impl/pj_param.hpp>
namespace boost { namespace geometry { namespace projections {

6
include/boost/geometry/extensions/gis/projections/impl/pj_datums.hpp → include/boost/geometry/srs/projections/impl/pj_datums.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +39,7 @@
#ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUMS_HPP
#define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_DATUMS_HPP
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections {

6
include/boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp → include/boost/geometry/srs/projections/impl/pj_ell_set.hpp
View File

@@ -45,9 +45,9 @@
#include <boost/geometry/formulas/eccentricity_sqr.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_ellps.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_param.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/srs/parameters.hpp>
#include <boost/geometry/srs/projections/impl/pj_ellps.hpp>
#include <boost/geometry/srs/projections/impl/pj_param.hpp>
namespace boost { namespace geometry { namespace projections {

6
include/boost/geometry/extensions/gis/projections/impl/pj_ellps.hpp → include/boost/geometry/srs/projections/impl/pj_ellps.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +39,7 @@
#ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_ELLPS_HPP
#define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_ELLPS_HPP
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections {

8
include/boost/geometry/extensions/gis/projections/impl/pj_fwd.hpp → include/boost/geometry/srs/projections/impl/pj_fwd.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -38,8 +42,8 @@
#include <boost/geometry/core/radian_access.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/adjlon.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/adjlon.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/math/constants/constants.hpp>

0
include/boost/geometry/extensions/gis/projections/impl/pj_gauss.hpp → include/boost/geometry/srs/projections/impl/pj_gauss.hpp
View File

20
include/boost/geometry/extensions/gis/projections/impl/pj_init.hpp → include/boost/geometry/srs/projections/impl/pj_init.hpp
View File

@@ -51,16 +51,14 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/util/condition.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_datum_set.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_datums.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_ell_set.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_param.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_units.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
#include <boost/geometry/srs/parameters.hpp>
#include <boost/geometry/srs/projections/impl/dms_parser.hpp>
#include <boost/geometry/srs/projections/impl/pj_datum_set.hpp>
#include <boost/geometry/srs/projections/impl/pj_datums.hpp>
#include <boost/geometry/srs/projections/impl/pj_ell_set.hpp>
#include <boost/geometry/srs/projections/impl/pj_param.hpp>
#include <boost/geometry/srs/projections/impl/pj_units.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections
@@ -289,7 +287,7 @@ inline parameters pj_init(BGParams const& bg_params, R const& arguments, bool us
if (index == -1) { throw proj_exception(-7); }
if (value.empty()) { throw proj_exception(-46); }
geometry::strategy::dms_parser<true> parser;
dms_parser<true> parser;
pin.from_greenwich = parser(value.c_str());
}
else

6
include/boost/geometry/extensions/gis/projections/impl/pj_inv.hpp → include/boost/geometry/srs/projections/impl/pj_inv.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -37,7 +41,7 @@
#include <boost/geometry/extensions/gis/projections/impl/adjlon.hpp>
#include <boost/geometry/srs/projections/impl/adjlon.hpp>
#include <boost/geometry/core/radian_access.hpp>
#include <boost/geometry/util/math.hpp>

0
include/boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp → include/boost/geometry/srs/projections/impl/pj_mlfn.hpp
View File

0
include/boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp → include/boost/geometry/srs/projections/impl/pj_msfn.hpp
View File

11
include/boost/geometry/extensions/gis/projections/impl/pj_param.hpp → include/boost/geometry/srs/projections/impl/pj_param.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -39,9 +43,8 @@
#include <string>
#include <vector>
#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/dms_parser.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections {
@@ -116,7 +119,7 @@ inline pvalue pj_param(std::vector<pvalue> const& pl, std::string opt)
break;
case 'r': /* degrees input */
{
geometry::strategy::dms_parser<true> parser;
dms_parser<true> parser;
value.f = parser(it->s.c_str());
}
break;

0
include/boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp → include/boost/geometry/srs/projections/impl/pj_phi2.hpp
View File

0
include/boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp → include/boost/geometry/srs/projections/impl/pj_qsfn.hpp
View File

0
include/boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp → include/boost/geometry/srs/projections/impl/pj_tsfn.hpp
View File

6
include/boost/geometry/extensions/gis/projections/impl/pj_units.hpp → include/boost/geometry/srs/projections/impl/pj_units.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +39,7 @@
#ifndef BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_UNITS_HPP
#define BOOST_GEOMETRY_PROJECTIONS_IMPL_PJ_UNITS_HPP
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections {
namespace detail {

6
include/boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp → include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp
View File

@@ -3,6 +3,10 @@
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -36,7 +40,7 @@
#define BOOST_GEOMETRY_PROJECTIONS_ZPOLY1_HPP
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
namespace boost { namespace geometry { namespace projections { namespace detail {

0
include/boost/geometry/extensions/gis/projections/impl/proj_mdist.hpp → include/boost/geometry/srs/projections/impl/proj_mdist.hpp
View File

2
include/boost/geometry/extensions/gis/projections/impl/projects.hpp → include/boost/geometry/srs/projections/impl/projects.hpp
View File

@@ -44,7 +44,7 @@
#include <string>
#include <vector>
#include <boost/geometry/extensions/gis/projections/exception.hpp>
#include <boost/geometry/srs/projections/exception.hpp>
#include <boost/math/constants/constants.hpp>

16
include/boost/geometry/extensions/gis/projections/proj/aea.hpp → include/boost/geometry/srs/projections/proj/aea.hpp
View File

@@ -49,15 +49,15 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
#include <boost/geometry/srs/projections/epsg_traits.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/aeqd.hpp → include/boost/geometry/srs/projections/proj/aeqd.hpp
View File

@@ -48,12 +48,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/airy.hpp → include/boost/geometry/srs/projections/proj/airy.hpp
View File

@@ -47,10 +47,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/aitoff.hpp → include/boost/geometry/srs/projections/proj/aitoff.hpp
View File

@@ -49,10 +49,10 @@
#include <boost/core/ignore_unused.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/august.hpp → include/boost/geometry/srs/projections/proj/august.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/bacon.hpp → include/boost/geometry/srs/projections/proj/bacon.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/bipc.hpp → include/boost/geometry/srs/projections/proj/bipc.hpp
View File

@@ -44,10 +44,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/boggs.hpp → include/boost/geometry/srs/projections/proj/boggs.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/bonne.hpp → include/boost/geometry/srs/projections/proj/bonne.hpp
View File

@@ -44,11 +44,11 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/cass.hpp → include/boost/geometry/srs/projections/proj/cass.hpp
View File

@@ -41,13 +41,13 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
#include <boost/geometry/srs/projections/epsg_traits.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/cc.hpp → include/boost/geometry/srs/projections/proj/cc.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/cea.hpp → include/boost/geometry/srs/projections/proj/cea.hpp
View File

@@ -43,12 +43,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_auth.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_auth.hpp>
#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/chamb.hpp → include/boost/geometry/srs/projections/proj/chamb.hpp
View File

@@ -44,11 +44,11 @@
#include <boost/geometry/util/math.hpp>
#include <cstdio>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/collg.hpp → include/boost/geometry/srs/projections/proj/collg.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/crast.hpp → include/boost/geometry/srs/projections/proj/crast.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/denoy.hpp → include/boost/geometry/srs/projections/proj/denoy.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/eck1.hpp → include/boost/geometry/srs/projections/proj/eck1.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/eck2.hpp → include/boost/geometry/srs/projections/proj/eck2.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/eck3.hpp → include/boost/geometry/srs/projections/proj/eck3.hpp
View File

@@ -43,11 +43,11 @@
#include <boost/core/ignore_unused.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/eck4.hpp → include/boost/geometry/srs/projections/proj/eck4.hpp
View File

@@ -41,11 +41,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/eck5.hpp → include/boost/geometry/srs/projections/proj/eck5.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/eqc.hpp → include/boost/geometry/srs/projections/proj/eqc.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/eqdc.hpp → include/boost/geometry/srs/projections/proj/eqdc.hpp
View File

@@ -44,12 +44,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/etmerc.hpp → include/boost/geometry/srs/projections/proj/etmerc.hpp
View File

@@ -45,10 +45,10 @@
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/fahey.hpp → include/boost/geometry/srs/projections/proj/fahey.hpp
View File

@@ -41,11 +41,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/fouc_s.hpp → include/boost/geometry/srs/projections/proj/fouc_s.hpp
View File

@@ -43,11 +43,11 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/gall.hpp → include/boost/geometry/srs/projections/proj/gall.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/geocent.hpp → include/boost/geometry/srs/projections/proj/geocent.hpp
View File

@@ -47,10 +47,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/geos.hpp → include/boost/geometry/srs/projections/proj/geos.hpp
View File

@@ -48,10 +48,10 @@
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/gins8.hpp → include/boost/geometry/srs/projections/proj/gins8.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp → include/boost/geometry/srs/projections/proj/gn_sinu.hpp
View File

@@ -43,12 +43,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/gnom.hpp → include/boost/geometry/srs/projections/proj/gnom.hpp
View File

@@ -44,10 +44,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/goode.hpp → include/boost/geometry/srs/projections/proj/goode.hpp
View File

@@ -41,12 +41,12 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp>
#include <boost/geometry/extensions/gis/projections/proj/moll.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/proj/gn_sinu.hpp>
#include <boost/geometry/srs/projections/proj/moll.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/gstmerc.hpp → include/boost/geometry/srs/projections/proj/gstmerc.hpp
View File

@@ -41,12 +41,12 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/hammer.hpp → include/boost/geometry/srs/projections/proj/hammer.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/hatano.hpp → include/boost/geometry/srs/projections/proj/hatano.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/healpix.hpp → include/boost/geometry/srs/projections/proj/healpix.hpp
View File

@@ -51,12 +51,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_auth.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_auth.hpp>
#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/igh.hpp → include/boost/geometry/srs/projections/proj/igh.hpp
View File

@@ -44,12 +44,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/proj/gn_sinu.hpp>
#include <boost/geometry/extensions/gis/projections/proj/moll.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/proj/gn_sinu.hpp>
#include <boost/geometry/srs/projections/proj/moll.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/imw_p.hpp → include/boost/geometry/srs/projections/proj/imw_p.hpp
View File

@@ -43,11 +43,11 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/isea.hpp → include/boost/geometry/srs/projections/proj/isea.hpp
View File

@@ -47,10 +47,10 @@
#include <boost/core/ignore_unused.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/krovak.hpp → include/boost/geometry/srs/projections/proj/krovak.hpp
View File

@@ -46,10 +46,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/labrd.hpp → include/boost/geometry/srs/projections/proj/labrd.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/laea.hpp → include/boost/geometry/srs/projections/proj/laea.hpp
View File

@@ -44,12 +44,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_auth.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_qsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_auth.hpp>
#include <boost/geometry/srs/projections/impl/pj_qsfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/lagrng.hpp → include/boost/geometry/srs/projections/proj/lagrng.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/larr.hpp → include/boost/geometry/srs/projections/proj/larr.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/lask.hpp → include/boost/geometry/srs/projections/proj/lask.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/latlong.hpp → include/boost/geometry/srs/projections/proj/latlong.hpp
View File

@@ -47,12 +47,12 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
#include <boost/geometry/srs/projections/epsg_traits.hpp>
namespace boost { namespace geometry
{

16
include/boost/geometry/extensions/gis/projections/proj/lcc.hpp → include/boost/geometry/srs/projections/proj/lcc.hpp
View File

@@ -44,15 +44,15 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
#include <boost/geometry/extensions/gis/projections/epsg_traits.hpp>
#include <boost/geometry/srs/projections/epsg_traits.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/lcca.hpp → include/boost/geometry/srs/projections/proj/lcca.hpp
View File

@@ -43,11 +43,11 @@
#include <boost/core/ignore_unused.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_mlfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_mlfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/loxim.hpp → include/boost/geometry/srs/projections/proj/loxim.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/lsat.hpp → include/boost/geometry/srs/projections/proj/lsat.hpp
View File

@@ -43,11 +43,11 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/mbt_fps.hpp → include/boost/geometry/srs/projections/proj/mbt_fps.hpp
View File

@@ -41,11 +41,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/mbtfpp.hpp → include/boost/geometry/srs/projections/proj/mbtfpp.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/mbtfpq.hpp → include/boost/geometry/srs/projections/proj/mbtfpq.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

14
include/boost/geometry/extensions/gis/projections/proj/merc.hpp → include/boost/geometry/srs/projections/proj/merc.hpp
View File

@@ -43,13 +43,13 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_msfn.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_phi2.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_tsfn.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_msfn.hpp>
#include <boost/geometry/srs/projections/impl/pj_phi2.hpp>
#include <boost/geometry/srs/projections/impl/pj_tsfn.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/mill.hpp → include/boost/geometry/srs/projections/proj/mill.hpp
View File

@@ -41,10 +41,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

12
include/boost/geometry/extensions/gis/projections/proj/mod_ster.hpp → include/boost/geometry/srs/projections/proj/mod_ster.hpp
View File

@@ -44,12 +44,12 @@
#include <boost/geometry/util/math.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/extensions/gis/projections/impl/pj_zpoly1.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/pj_zpoly1.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/moll.hpp → include/boost/geometry/srs/projections/proj/moll.hpp
View File

@@ -43,11 +43,11 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/natearth.hpp → include/boost/geometry/srs/projections/proj/natearth.hpp
View File

@@ -54,10 +54,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

10
include/boost/geometry/extensions/gis/projections/proj/nell.hpp → include/boost/geometry/srs/projections/proj/nell.hpp
View File

@@ -41,11 +41,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/extensions/gis/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/nell_h.hpp → include/boost/geometry/srs/projections/proj/nell_h.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

8
include/boost/geometry/extensions/gis/projections/proj/nocol.hpp → include/boost/geometry/srs/projections/proj/nocol.hpp
View File

@@ -43,10 +43,10 @@
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_static.hpp>
#include <boost/geometry/extensions/gis/projections/impl/base_dynamic.hpp>
#include <boost/geometry/extensions/gis/projections/impl/projects.hpp>
#include <boost/geometry/extensions/gis/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp>
namespace boost { namespace geometry
{

Some files were not shown because too many files have changed in this diff Show More