|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66975 - in sandbox/geometry: boost/geometry/extensions/gis/latlong boost/geometry/extensions/io/svg boost/geometry/extensions/nsphere/geometries boost/geometry/geometries libs/geometry/doc/qbk/snippets libs/geometry/example libs/geometry/example/extensions/gis/latlong libs/geometry/example/extensions/gis/projections libs/geometry/example/with_external_libs libs/geometry/test libs/geometry/test/algorithms libs/geometry/test/algorithms/detail/sections libs/geometry/test/algorithms/overlay libs/geometry/test/algorithms/overlay/robustness libs/geometry/test/extensions/algorithms libs/geometry/test/extensions/gis/latlong libs/geometry/test/extensions/gis/projections libs/geometry/test/extensions/index libs/geometry/test/extensions/nsphere libs/geometry/test/iterators libs/geometry/test/multi/algorithms libs/geometry/test/multi/algorithms/overlay libs/geometry/test/ranges libs/geometry/test/util
From: barend.gehrels_at_[hidden]
Date: 2010-12-02 11:11:13
Author: barendgehrels
Date: 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
New Revision: 66975
URL: http://svn.boost.org/trac/boost/changeset/66975
Log:
model namespaces, moved point_xy to d2::point_xy, revised point_ll_deg to ll::point<degree>
Text files modified:
sandbox/geometry/boost/geometry/extensions/gis/latlong/latlong.hpp | 11 +-
sandbox/geometry/boost/geometry/extensions/gis/latlong/point_ll.hpp | 168 +++++++++++++++++++++++++++------------
sandbox/geometry/boost/geometry/extensions/io/svg/svg_mapper.hpp | 14 +-
sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian2d.hpp | 6
sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian3d.hpp | 12 +-
sandbox/geometry/boost/geometry/geometries/cartesian2d.hpp | 18 ++-
sandbox/geometry/boost/geometry/geometries/cartesian3d.hpp | 23 +++--
sandbox/geometry/boost/geometry/geometries/point_xy.hpp | 36 ++++----
sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_1.cpp | 62 +++++++-------
sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_2.cpp | 12 +-
sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_4.cpp | 12 +-
sandbox/geometry/libs/geometry/example/01_point_example.cpp | 14 +-
sandbox/geometry/libs/geometry/example/02_linestring_example.cpp | 46 +++++-----
sandbox/geometry/libs/geometry/example/03_polygon_example.cpp | 34 ++++----
sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp | 12 +-
sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp | 8
sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp | 8
sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp | 16 +-
sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp | 12 +-
sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp | 12 +-
sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp | 4
sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp | 8
sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp | 12 +-
sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp | 66 +++++++-------
sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp | 7
sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp | 4
sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp | 6
sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp | 16 +-
sandbox/geometry/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp | 2
sandbox/geometry/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp | 12 +-
sandbox/geometry/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp | 10 +-
sandbox/geometry/libs/geometry/test/algorithms/area.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/centroid.cpp | 6
sandbox/geometry/libs/geometry/test/algorithms/comparable_distance.cpp | 6
sandbox/geometry/libs/geometry/test/algorithms/convex_hull.cpp | 8
sandbox/geometry/libs/geometry/test/algorithms/correct.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/difference.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/dissolve.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/distance.cpp | 10 +-
sandbox/geometry/libs/geometry/test/algorithms/envelope.cpp | 6
sandbox/geometry/libs/geometry/test/algorithms/equals.cpp | 6
sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp | 10 +-
sandbox/geometry/libs/geometry/test/algorithms/intersects.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp | 8
sandbox/geometry/libs/geometry/test/algorithms/length.cpp | 8
sandbox/geometry/libs/geometry/test/algorithms/overlaps.cpp | 6
sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolver.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/split_rings.cpp | 2
sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp | 10 +-
sandbox/geometry/libs/geometry/test/algorithms/perimeter.cpp | 10 +-
sandbox/geometry/libs/geometry/test/algorithms/reverse.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/simplify.cpp | 6
sandbox/geometry/libs/geometry/test/algorithms/transform.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/union.cpp | 8
sandbox/geometry/libs/geometry/test/algorithms/unique.cpp | 4
sandbox/geometry/libs/geometry/test/algorithms/within.cpp | 8
sandbox/geometry/libs/geometry/test/compile_test.cpp | 6
sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp | 4
sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp | 4
sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp | 6
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp | 16 +-
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp | 24 ++--
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj | 3
sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp | 6
sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp | 10 +-
sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp | 10 +-
sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp | 12 +-
sandbox/geometry/libs/geometry/test/extensions/index/rtree.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp | 2
sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp | 4
sandbox/geometry/libs/geometry/test/iterators/box_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/closing_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/segment_range_iterator.cpp | 2
sandbox/geometry/libs/geometry/test/iterators/segment_returning_iterator.cpp | 4
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_area.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_centroid.cpp | 10 +-
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp | 6
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_dissolve.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp | 6
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_envelope.cpp | 4
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_equals.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_intersection.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_length.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_reverse.cpp | 4
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_union.cpp | 2
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_unique.cpp | 4
sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp | 6
sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp | 2
sandbox/geometry/libs/geometry/test/ranges/box_range.cpp | 2
sandbox/geometry/libs/geometry/test/ranges/segment_range.cpp | 2
sandbox/geometry/libs/geometry/test/util/closeable_view.cpp | 2
sandbox/geometry/libs/geometry/test/util/reversible_closeable.cpp | 2
sandbox/geometry/libs/geometry/test/util/reversible_view.cpp | 2
114 files changed, 569 insertions(+), 493 deletions(-)
Modified: sandbox/geometry/boost/geometry/extensions/gis/latlong/latlong.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/latlong/latlong.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/latlong/latlong.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -6,10 +6,9 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_GEOMETRY_LATLONG_HPP
-#define BOOST_GEOMETRY_LATLONG_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_LATLONG_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_GIS_LATLONG_HPP
-// Predeclare common latlong points for convenience
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/extensions/gis/latlong/point_ll.hpp>
@@ -22,6 +21,8 @@
namespace boost { namespace geometry
{
+/*
+DEPRECATED
namespace model
{
@@ -40,9 +41,9 @@
typedef segment<point_ll_rad> segment_ll_rad;
} // namespace model
-
+*/
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_LATLONG_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_LATLONG_HPP
Modified: sandbox/geometry/boost/geometry/extensions/gis/latlong/point_ll.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/gis/latlong/point_ll.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/gis/latlong/point_ll.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -1,13 +1,13 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands.
+// Copyright Barend Gehrels 2007-2010, Geodan, Amsterdam, the Netherlands.
// Copyright Bruno Lalande 2008, 2009
// 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_GEOMETRIES_POINT_LL_HPP
-#define BOOST_GEOMETRY_GEOMETRIES_POINT_LL_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_LATLONG_POINT_LL_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_GIS_LATLONG_POINT_LL_HPP
#include <cstddef>
#include <sstream>
@@ -26,7 +26,7 @@
{
-namespace model
+namespace model { namespace ll
{
/*!
@@ -36,11 +36,12 @@
It can be constructed using latitude and longitude classes. The latlong
class can be defined in degrees or in radians. There is a conversion method
from degree to radian, and from radian to degree.
- \tparam T coordinate type, double (the default) or float
+ \tparam Units units,defaults to degree
+ \tparam CoordinateType coordinate type, double (the default) or float
(it might be int as well)
- \tparam C coordinate system, optional, should includes degree/radian
- indication, defaults to geographic<degree>
- \tparam D dimensions, optional, defaults to 2
+ \tparam CoordinateSystem coordinate system, optional, should include NOT degree/radian
+ indication, should be e.g. cs::geographic or cs::spherical
+ \tparam Dimensions dimensions, optional, defaults to 2
\note There is NO constructor with two values to avoid
exchanging lat and long
\note Construction with latitude and longitude can be done in both orders,
@@ -56,57 +57,78 @@
*/
template
<
- typename T = double,
- typename C = cs::geographic<degree>,
- std::size_t D = 2
+ typename Units = degree,
+ typename CoordinateType = double,
+ template<typename> class CoordinateSystem = cs::geographic,
+ std::size_t Dimensions = 2
>
-class point_ll : public point<T, D, C>
+class point : public model::point
+ <
+ CoordinateType,
+ Dimensions,
+ CoordinateSystem<Units>
+ >
{
+ typedef model::point
+ <
+ CoordinateType,
+ Dimensions,
+ CoordinateSystem<Units>
+ >
+ base_type;
public:
/// Default constructor, does not initialize anything
- inline point_ll() : point<T, D, C>() {}
+ inline point() : base_type() {}
/// Constructor with longitude/latitude
- inline point_ll(longitude<T> const& lo, latitude<T> const& la)
- : point<T, D, C>(lo, la) {}
+ inline point(longitude<CoordinateType> const& lo,
+ latitude<CoordinateType> const& la)
+ : base_type(lo, la) {}
/// Constructor with latitude/longitude
- inline point_ll(latitude<T> const& la, longitude<T> const& lo)
- : point<T, D, C>(lo, la) {}
+ inline point(latitude<CoordinateType> const& la,
+ longitude<CoordinateType> const& lo)
+ : base_type(lo, la) {}
/// Get longitude
- inline T const& lon() const { return this->template get<0>(); }
+ inline CoordinateType const& lon() const
+ { return this->template get<0>(); }
+
/// Get latitude
- inline T const& lat() const { return this->template get<1>(); }
+ inline CoordinateType const& lat() const
+ { return this->template get<1>(); }
/// Set longitude
- inline void lon(T const& v) { this->template set<0>(v); }
+ inline void lon(CoordinateType const& v)
+ { this->template set<0>(v); }
+
/// Set latitude
- inline void lat(T const& v) { this->template set<1>(v); }
+ inline void lat(CoordinateType const& v)
+ { this->template set<1>(v); }
/// Set longitude using dms class
- inline void lon(dms<east, T> const& v)
+ inline void lon(dms<east, CoordinateType> const& v)
{
this->template set<0>(v.as_value());
}
- inline void lon(dms<west, T> const& v)
+ inline void lon(dms<west, CoordinateType> const& v)
{
this->template set<0>(v.as_value());
}
- inline void lat(dms<north, T> const& v)
+ inline void lat(dms<north, CoordinateType> const& v)
{
this->template set<1>(v.as_value());
}
- inline void lat(dms<south, T> const& v)
+ inline void lat(dms<south, CoordinateType> const& v)
{
this->template set<1>(v.as_value());
}
};
-} // namespace model
+}} // namespace model::ll
// Adapt the point_ll to the concept
#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
@@ -115,77 +137,121 @@
template
<
+ typename Units,
typename CoordinateType,
- typename CoordinateSystem,
+ template<typename> class CoordinateSystem,
std::size_t DimensionCount
>
-struct tag<model::point_ll<CoordinateType, CoordinateSystem, DimensionCount> >
+struct tag
+ <
+ model::ll::point
+ <
+ Units,
+ CoordinateType,
+ CoordinateSystem,
+ DimensionCount
+ >
+ >
{
typedef point_tag type;
};
template
<
+ typename Units,
typename CoordinateType,
- typename CoordinateSystem,
+ template<typename> class CoordinateSystem,
std::size_t DimensionCount
>
struct coordinate_type
- <
- model::point_ll<CoordinateType, CoordinateSystem, DimensionCount>
- >
+ <
+ model::ll::point
+ <
+ Units,
+ CoordinateType,
+ CoordinateSystem,
+ DimensionCount
+ >
+ >
{
typedef CoordinateType type;
};
template
<
+ typename Units,
typename CoordinateType,
- typename CoordinateSystem,
+ template<typename> class CoordinateSystem,
std::size_t DimensionCount
>
struct coordinate_system
- <
- model::point_ll<CoordinateType, CoordinateSystem, DimensionCount>
- >
+ <
+ model::ll::point
+ <
+ Units,
+ CoordinateType,
+ CoordinateSystem,
+ DimensionCount
+ >
+ >
{
- typedef CoordinateSystem type;
+ typedef CoordinateSystem<Units> type;
};
template
<
+ typename Units,
typename CoordinateType,
- typename CoordinateSystem,
+ template<typename> class CoordinateSystem,
std::size_t DimensionCount
>
struct dimension
- <
- model::point_ll<CoordinateType, CoordinateSystem, DimensionCount>
- >
+ <
+ model::ll::point
+ <
+ Units,
+ CoordinateType,
+ CoordinateSystem,
+ DimensionCount
+ >
+ >
: boost::mpl::int_<DimensionCount>
{};
template
<
+ typename Units,
typename CoordinateType,
- typename CoordinateSystem,
+ template<typename> class CoordinateSystem,
std::size_t DimensionCount,
std::size_t Dimension
>
struct access
- <
- model::point_ll<CoordinateType, CoordinateSystem, DimensionCount>, Dimension
- >
+ <
+ model::ll::point
+ <
+ Units,
+ CoordinateType,
+ CoordinateSystem,
+ DimensionCount
+ >,
+ Dimension
+ >
{
- static inline CoordinateType get(
- model::point_ll<CoordinateType, CoordinateSystem, DimensionCount> const& p)
+ typedef model::ll::point
+ <
+ Units,
+ CoordinateType,
+ CoordinateSystem,
+ DimensionCount
+ > type;
+
+ static inline CoordinateType get(type const& p)
{
return p.template get<Dimension>();
}
- static inline void set(
- model::point_ll<CoordinateType, CoordinateSystem, DimensionCount>& p,
- CoordinateType const& value)
+ static inline void set(type& p, CoordinateType const& value)
{
p.template set<Dimension>(value);
}
@@ -196,4 +262,4 @@
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_GEOMETRIES_POINT_LL_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_LATLONG_POINT_LL_HPP
Modified: sandbox/geometry/boost/geometry/extensions/io/svg/svg_mapper.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/io/svg/svg_mapper.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/io/svg/svg_mapper.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -70,7 +70,7 @@
std::string const& style, int size,
Point const& point, TransformStrategy const& strategy)
{
- model::point_xy<int> ipoint;
+ model::d2::point_xy<int> ipoint;
geometry::transform(point, ipoint, strategy);
stream << geometry::svg(ipoint, style, size) << std::endl;
}
@@ -84,7 +84,7 @@
std::string const& style, int size,
Box const& box, TransformStrategy const& strategy)
{
- model::box<model::point_xy<int> > ibox;
+ model::box<model::d2::point_xy<int> > ibox;
geometry::transform(box, ibox, strategy);
stream << geometry::svg(ibox, style, size) << std::endl;
@@ -119,7 +119,7 @@
svg_map_range
<
range_type,
- model::linestring<model::point_xy<int> >
+ model::linestring<model::d2::point_xy<int> >
>::apply(stream, style, size, range, strategy);
}
};
@@ -127,13 +127,13 @@
template <typename Ring>
struct svg_map<ring_tag, false, Ring>
- : svg_map_range<Ring, model::linear_ring<model::point_xy<int> > >
+ : svg_map_range<Ring, model::linear_ring<model::d2::point_xy<int> > >
{};
template <typename Linestring>
struct svg_map<linestring_tag, false, Linestring>
- : svg_map_range<Linestring, model::linestring<model::point_xy<int> > >
+ : svg_map_range<Linestring, model::linestring<model::d2::point_xy<int> > >
{};
@@ -145,7 +145,7 @@
std::string const& style, int size,
Polygon const& polygon, TransformStrategy const& strategy)
{
- model::polygon<model::point_xy<int> > ipoly;
+ model::polygon<model::d2::point_xy<int> > ipoly;
geometry::transform(polygon, ipoly, strategy);
stream << geometry::svg(ipoly, style, size) << std::endl;
}
@@ -197,7 +197,7 @@
template <typename Point, bool SameScale = true>
class svg_mapper : boost::noncopyable
{
- typedef model::point_xy<int> map_point_type;
+ typedef model::d2::point_xy<int> map_point_type;
typedef strategy::transform::map_transformer
<
Point,
Modified: sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian2d.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian2d.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian2d.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -15,12 +15,12 @@
namespace boost { namespace geometry
{
-namespace model
+namespace model { namespace d2
{
-typedef nsphere<point_2d, double> circle;
+typedef model::nsphere<d2::point, double> circle;
-}
+}} // namespace model::d2
}} // namespace boost::geometry
Modified: sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian3d.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian3d.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/nsphere/geometries/cartesian3d.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -5,8 +5,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_EXTENSION_NSPHERE_CARTESIAN3D_HPP
-#define BOOST_GEOMETRY_EXTENSION_NSPHERE_CARTESIAN3D_HPP
+#ifndef BOOST_GEOMETRY_EXTENSION_NSPHERE_GEOMETRIES_CARTESIAN3D_HPP
+#define BOOST_GEOMETRY_EXTENSION_NSPHERE_GEOMETRIES_CARTESIAN3D_HPP
#include <boost/geometry/geometries/cartesian3d.hpp>
@@ -15,13 +15,13 @@
namespace boost { namespace geometry
{
-namespace model
+namespace model { namespace d3
{
-typedef nsphere<point_3d, double> sphere;
+typedef model::nsphere<d3::point, double> sphere;
-}
+}} // namespace model::d3
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_EXTENSION_NSPHERE_CARTESIAN3D_HPP
+#endif // BOOST_GEOMETRY_EXTENSION_NSPHERE_GEOMETRIES_CARTESIAN3D_HPP
Modified: sandbox/geometry/boost/geometry/geometries/cartesian2d.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/cartesian2d.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/cartesian2d.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -10,23 +10,25 @@
#define BOOST_GEOMETRY_GEOMETRIES_CARTESIAN2D_HPP
// Predeclare common Cartesian 2D points for convenience
+// Note that they are always "double"
#include <boost/geometry/geometries/geometries.hpp>
namespace boost { namespace geometry
{
-namespace model
+namespace model { namespace d2
{
-typedef point_xy<double, cs::cartesian> point_2d;
-typedef linestring<point_2d> linestring_2d;
-typedef linear_ring<point_2d> ring_2d;
-typedef polygon<point_2d> polygon_2d;
-typedef box<point_2d> box_2d;
-typedef segment<point_2d> segment_2d;
+typedef model::d2::point_xy<double, cs::cartesian> point;
+typedef model::linestring<point> linestring;
+typedef model::linear_ring<point> ring;
+typedef model::polygon<point> polygon;
+typedef model::box<point> box;
+typedef model::segment<point> segment;
-} // namespace model
+
+}} // namespace model::d2
}} // namespace boost::geometry
Modified: sandbox/geometry/boost/geometry/geometries/cartesian3d.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/cartesian3d.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/cartesian3d.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -6,8 +6,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_CARTESIAN3D_HPP
-#define BOOST_GEOMETRY_CARTESIAN3D_HPP
+#ifndef BOOST_GEOMETRY_GEOMETRIES_CARTESIAN3D_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_CARTESIAN3D_HPP
// Predeclare common Cartesian 3D points for convenience
@@ -16,19 +16,22 @@
namespace boost { namespace geometry
{
-namespace model
+namespace model { namespace d3
{
-typedef point<double, 3, cs::cartesian> point_3d;
-typedef linestring<point_3d> linestring_3d;
-typedef linear_ring<point_3d> ring_3d;
-typedef polygon<point_3d> polygon_3d;
-typedef box<point_3d> box_3d;
+// Todo: create point_xyz in between to enable methods .x(), .y(), .z()
+// the same way as d2::point has
-} // namespace model
+typedef model::point<double, 3, cs::cartesian> point;
+typedef model::linestring<point> linestring;
+typedef model::linear_ring<point> ring;
+typedef model::polygon<point> polygon;
+typedef model::box<point> box;
+
+}} // namespace model::d3
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_CARTESIAN3D_HPP
+#endif // BOOST_GEOMETRY_GEOMETRIES_CARTESIAN3D_HPP
Modified: sandbox/geometry/boost/geometry/geometries/point_xy.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/geometries/point_xy.hpp (original)
+++ sandbox/geometry/boost/geometry/geometries/point_xy.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -19,7 +19,7 @@
namespace boost { namespace geometry
{
-namespace model
+namespace model { namespace d2
{
/*!
@@ -27,36 +27,38 @@
\ingroup geometries
\tparam T numeric type, arguments can be, for example, double, float, int
*/
-template<typename T, typename C = cs::cartesian>
-class point_xy : public point<T, 2, C>
+template<typename CoordinateType, typename CoordinateSystem = cs::cartesian>
+class point_xy : public model::point<CoordinateType, 2, CoordinateSystem>
{
public:
/// Default constructor, does not initialize anything
- inline point_xy() : point<T, 2, C>() {}
+ inline point_xy()
+ : model::point<CoordinateType, 2, CoordinateSystem>() {}
/// Constructor with x/y values
- inline point_xy(T const& x, T const& y) : point<T, 2, C>(x, y) {}
+ inline point_xy(CoordinateType const& x, CoordinateType const& y)
+ : model::point<CoordinateType, 2, CoordinateSystem>(x, y) {}
/// Get x-value
- inline T const& x() const
+ inline CoordinateType const& x() const
{ return this->template get<0>(); }
/// Get y-value
- inline T const& y() const
+ inline CoordinateType const& y() const
{ return this->template get<1>(); }
/// Set x-value
- inline void x(T const& v)
+ inline void x(CoordinateType const& v)
{ this->template set<0>(v); }
/// Set y-value
- inline void y(T const& v)
+ inline void y(CoordinateType const& v)
{ this->template set<1>(v); }
};
-} // namespace model
+}} // namespace model::xy
// Adapt the point_xy to the concept
@@ -65,38 +67,38 @@
{
template <typename CoordinateType, typename CoordinateSystem>
-struct tag<model::point_xy<CoordinateType, CoordinateSystem> >
+struct tag<model::d2::point_xy<CoordinateType, CoordinateSystem> >
{
typedef point_tag type;
};
template<typename CoordinateType, typename CoordinateSystem>
-struct coordinate_type<model::point_xy<CoordinateType, CoordinateSystem> >
+struct coordinate_type<model::d2::point_xy<CoordinateType, CoordinateSystem> >
{
typedef CoordinateType type;
};
template<typename CoordinateType, typename CoordinateSystem>
-struct coordinate_system<model::point_xy<CoordinateType, CoordinateSystem> >
+struct coordinate_system<model::d2::point_xy<CoordinateType, CoordinateSystem> >
{
typedef CoordinateSystem type;
};
template<typename CoordinateType, typename CoordinateSystem>
-struct dimension<model::point_xy<CoordinateType, CoordinateSystem> >
+struct dimension<model::d2::point_xy<CoordinateType, CoordinateSystem> >
: boost::mpl::int_<2>
{};
template<typename CoordinateType, typename CoordinateSystem, std::size_t Dimension>
-struct access<model::point_xy<CoordinateType, CoordinateSystem>, Dimension >
+struct access<model::d2::point_xy<CoordinateType, CoordinateSystem>, Dimension >
{
static inline CoordinateType get(
- model::point_xy<CoordinateType, CoordinateSystem> const& p)
+ model::d2::point_xy<CoordinateType, CoordinateSystem> const& p)
{
return p.template get<Dimension>();
}
- static inline void set(model::point_xy<CoordinateType, CoordinateSystem>& p,
+ static inline void set(model::d2::point_xy<CoordinateType, CoordinateSystem>& p,
CoordinateType const& value)
{
p.template set<Dimension>(value);
Modified: sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_1.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_1.cpp (original)
+++ sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_1.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -70,7 +70,7 @@
//[area_polygon
//` Calculate the area of a polygon
namespace bg = boost::geometry;
- bg::model::polygon<bg::model::point_xy<double> > poly; /*< Declare >*/
+ bg::model::polygon<bg::model::d2::point_xy<double> > poly; /*< Declare >*/
bg::read_wkt("POLYGON((0 0,0 7,4 2,2 0,0 0))", poly); /*< Fill, in this case with WKT >*/
double area = bg::area(poly); /*< Calculate area >*/
//]
@@ -107,7 +107,7 @@
void example_as_wkt_point()
{
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
P p(5.12, 6.34);
// Points can be streamed like this:
std::cout << boost::geometry::dsv<P>(p) << std::endl;
@@ -121,8 +121,8 @@
void example_as_wkt_vector()
{
- std::vector<boost::geometry::model::point_xy<int> > v;
- boost::geometry::read_wkt<boost::geometry::model::point_xy<int> >("linestring(1 1,2 2,3 3,4 4)", std::back_inserter(v));
+ std::vector<boost::geometry::model::d2::point_xy<int> > v;
+ boost::geometry::read_wkt<boost::geometry::model::d2::point_xy<int> >("linestring(1 1,2 2,3 3,4 4)", std::back_inserter(v));
std::cout << boost::geometry::dsv(std::make_pair(v.begin(), v.end())) << std::endl;
}
@@ -130,10 +130,10 @@
void example_centroid_polygon()
{
- boost::geometry::model::polygon<boost::geometry::model::point_xy<double> > poly;
+ boost::geometry::model::polygon<boost::geometry::model::d2::point_xy<double> > poly;
boost::geometry::read_wkt("POLYGON((0 0,0 7,4 2,2 0,0 0))", poly);
// Center of polygon might have different type than points of polygon
- boost::geometry::model::point_xy<float> center;
+ boost::geometry::model::d2::point_xy<float> center;
boost::geometry::centroid(poly, center);
std::cout << "Centroid: " << boost::geometry::dsv(center) << std::endl;
}
@@ -141,8 +141,8 @@
void example_distance_point_point()
{
- boost::geometry::model::point_xy<double> p1(1, 1);
- boost::geometry::model::point_xy<double> p2(2, 3);
+ boost::geometry::model::d2::point_xy<double> p1(1, 1);
+ boost::geometry::model::d2::point_xy<double> p2(2, 3);
std::cout << "Distance p1-p2 is "
<< boost::geometry::distance(p1, p2)
<< " units" << std::endl;
@@ -179,28 +179,28 @@
void example_from_wkt_point()
{
- boost::geometry::model::point_xy<int> point;
+ boost::geometry::model::d2::point_xy<int> point;
boost::geometry::read_wkt("Point(1 2)", point);
std::cout << point.x() << "," << point.y() << std::endl;
}
void example_from_wkt_output_iterator()
{
- std::vector<boost::geometry::model::point_xy<int> > v;
- boost::geometry::read_wkt<boost::geometry::model::point_xy<int> >("linestring(1 1,2 2,3 3,4 4)", std::back_inserter(v));
+ std::vector<boost::geometry::model::d2::point_xy<int> > v;
+ boost::geometry::read_wkt<boost::geometry::model::d2::point_xy<int> >("linestring(1 1,2 2,3 3,4 4)", std::back_inserter(v));
std::cout << "vector has " << v.size() << " coordinates" << std::endl;
}
void example_from_wkt_linestring()
{
- boost::geometry::model::linestring<boost::geometry::model::point_xy<double> > line;
+ boost::geometry::model::linestring<boost::geometry::model::d2::point_xy<double> > line;
boost::geometry::read_wkt("linestring(1 1,2 2,3 3,4 4)", line);
std::cout << "linestring has " << line.size() << " coordinates" << std::endl;
}
void example_from_wkt_polygon()
{
- boost::geometry::model::polygon<boost::geometry::model::point_xy<double> > poly;
+ boost::geometry::model::polygon<boost::geometry::model::d2::point_xy<double> > poly;
boost::geometry::read_wkt("POLYGON((0 0,0 1,1 1,1 0,0 0))", poly);
std::cout << "Polygon has " << poly.outer().size() << " coordinates in outer ring" << std::endl;
}
@@ -220,7 +220,7 @@
void example_intersection_linestring()
{
//[intersection_linestring
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
std::vector<P> line1, line2;
boost::geometry::read_wkt("linestring(1 1,2 2)", line1);
boost::geometry::read_wkt("linestring(2 1,1 2)", line2);
@@ -234,7 +234,7 @@
{
//[intersects_linestring
//` Check if two linestrings (here: vectors) intersect each other
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
std::vector<P> line1, line2;
boost::geometry::read_wkt("linestring(1 1,2 2)", line1);
boost::geometry::read_wkt("linestring(2 1,1 2)", line2);
@@ -248,7 +248,7 @@
void example_intersection_segment()
{
//[intersection_segment
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
boost::geometry::model::segment<P> segment1, segment2;
boost::geometry::read_wkt("linestring(1 1,2 2)", segment1);
boost::geometry::read_wkt("linestring(2 1,1 2)", segment2);
@@ -262,7 +262,7 @@
{
//[intersection_segment_inserter
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
boost::geometry::model::segment<P> segment1, segment2;
boost::geometry::read_wkt("linestring(1 1,2 2)", segment1);
boost::geometry::read_wkt("linestring(2 1,1 2)", segment2);
@@ -280,7 +280,7 @@
{
//[intersects_segment
//` Check if two segments intersect each other
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
boost::geometry::model::segment<P> line1, line2;
boost::geometry::read_wkt("linestring(1 1,2 2)", line1);
boost::geometry::read_wkt("linestring(2 1,1 2)", line2);
@@ -292,7 +292,7 @@
void example_clip_linestring1()
{
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
boost::geometry::model::linestring<P> line;
boost::geometry::read_wkt("linestring(1.1 1.1, 2.5 2.1, 3.1 3.1, 4.9 1.1, 3.1 1.9)", line);
boost::geometry::model::box<P> cb(P(1.5, 1.5), P(4.5, 2.5));
@@ -304,7 +304,7 @@
void example_clip_linestring2()
{
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
std::vector<P> vector_in;
boost::geometry::read_wkt<P>("linestring(1.1 1.1, 2.5 2.1, 3.1 3.1, 4.9 1.1, 3.1 1.9)",
std::back_inserter(vector_in));
@@ -328,7 +328,7 @@
void example_intersection_polygon1()
{
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
typedef std::vector<boost::geometry::model::polygon<P> > PV;
boost::geometry::model::box<P> cb(P(1.5, 1.5), P(4.5, 2.5));
@@ -350,7 +350,7 @@
{
//[simplify
//` Simplify a linestring
- boost::geometry::model::linestring<boost::geometry::model::point_xy<double> > line, simplified;
+ boost::geometry::model::linestring<boost::geometry::model::d2::point_xy<double> > line, simplified;
boost::geometry::read_wkt("linestring(1.1 1.1, 2.5 2.1, 3.1 3.1, 4.9 1.1, 3.1 1.9)", line);
boost::geometry::simplify(line, simplified, 0.5); /*< Simplify it, using distance of 0.5 units >*/
std::cout
@@ -363,7 +363,7 @@
{
//[simplify_inserter
//` Simplify a linestring using an output iterator
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
typedef boost::geometry::model::linestring<P> L;
L line;
@@ -379,9 +379,9 @@
void example_within()
{
- boost::geometry::model::polygon<boost::geometry::model::point_xy<double> > poly;
+ boost::geometry::model::polygon<boost::geometry::model::d2::point_xy<double> > poly;
boost::geometry::read_wkt("POLYGON((0 0,0 7,4 2,2 0,0 0))", poly);
- boost::geometry::model::point_xy<float> point(3, 3);
+ boost::geometry::model::d2::point_xy<float> point(3, 3);
std::cout << "Point is "
<< (boost::geometry::within(point, poly) ? "IN" : "NOT in")
<< " polygon"
@@ -392,7 +392,7 @@
void example_within_strategy()
{
// TO BE UPDATED/FINISHED
- typedef boost::geometry::model::point_xy<double> P;
+ typedef boost::geometry::model::d2::point_xy<double> P;
typedef boost::geometry::model::polygon<P> POLY;
P p;
std::cout << within(p, poly, strategy::within::cross_count<P>) << std::endl;
@@ -404,7 +404,7 @@
//[length
//` The following simple example shows the calculation of the length of a linestring containing three points
using namespace boost::geometry;
- model::linestring<model::point_xy<double> > line;
+ model::linestring<model::d2::point_xy<double> > line;
read_wkt("linestring(0 0,1 1,4 8,3 2)", line);
std::cout << "linestring length is "
<< length(line)
@@ -434,8 +434,8 @@
void example_length_linestring_iterators2()
{
- std::vector<boost::geometry::model::point_xy<double> > line;
- boost::geometry::read_wkt<boost::geometry::model::point_xy<double> >("linestring(0 0,1 1,4 8,3 2)", std::back_inserter(line));
+ std::vector<boost::geometry::model::d2::point_xy<double> > line;
+ boost::geometry::read_wkt<boost::geometry::model::d2::point_xy<double> >("linestring(0 0,1 1,4 8,3 2)", std::back_inserter(line));
std::cout << "linestring length is "
<< boost::geometry::length(line)
<< " units" << std::endl;
@@ -477,9 +477,9 @@
void example_envelope_linestring()
{
- boost::geometry::model::linestring<boost::geometry::model::point_xy<double> > line;
+ boost::geometry::model::linestring<boost::geometry::model::d2::point_xy<double> > line;
boost::geometry::read_wkt("linestring(0 0,1 1,4 8,3 2)", line);
- boost::geometry::model::box<boost::geometry::model::point_xy<double> > box;
+ boost::geometry::model::box<boost::geometry::model::d2::point_xy<double> > box;
boost::geometry::envelope(line, box);
std::cout << "envelope is " << boost::geometry::dsv(box) << std::endl;
Modified: sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_2.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_2.cpp (original)
+++ sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_2.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -90,7 +90,7 @@
//` Snippets below assume the namespace boost::geometry is known
using namespace boost::geometry;
- //` It should be possible to use a very small part of the library, for example only the distance between two points.
+ //` It should be possible to use a very small part of the library, for example only the distance between two points.
int a[2] = {1,1};
int b[2] = {2,3};
double d = distance(a, b);
@@ -98,15 +98,15 @@
//` Other often used algorithms are point-in-polygon:
double points[][2] = {{2.0, 1.3}, {4.1, 3.0}, {5.3, 2.6}, {2.9, 0.7}, {2.0, 1.3}};
- model::polygon_2d poly;
+ model::d2::polygon poly;
append(poly, points);
boost::tuple<double, double> p = boost::make_tuple(3.7, 2.0);
std::cout << "Point p is in polygon? " << (within(p, poly) ? "YES" : "NO") << std::endl;
- //` or area:
+ //` or area:
std::cout << "Area: " << area(poly) << std::endl;
- //` It is possible, by the nature of a template library, to mix the point types declared above:
+ //` It is possible, by the nature of a template library, to mix the point types declared above:
double d2 = distance(a, p);
std::cout << "Distance a-p is:" << d2 << std::endl;
@@ -148,8 +148,8 @@
std::cout << dsv(p) << " <-> " << dsv(sph2) << std::endl;
- typedef model::point_xy<double> XY;
- typedef model::point_xy<int> PIXEL;
+ typedef model::d2::point_xy<double> XY;
+ typedef model::d2::point_xy<int> PIXEL;
XY xy(50, 50);
strategy::transform::map_transformer<XY, PIXEL, false> map(0, 0, 100, 100, 1024, 768);
PIXEL pix;
Modified: sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_4.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_4.cpp (original)
+++ sandbox/geometry/libs/geometry/doc/qbk/snippets/qbk_4.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -87,7 +87,7 @@
//"LINESTRING(-122.193 47.5075,-122.192 47.5108,-122.192 47.5147,-122.192 47.5184,-122.192 47.5224,-122.192 47.5265,-122.192 47.5307,-122.192 47.5327,-122.191 47.5348,-122.19 47.5395,-122.189 47.5443,-122.188 47.549,-122.187 47.5538,-122.185 47.5584,-122.183 47.5609,-122.182 47.563,-122.18 47.5667,-122.179 47.5676,-122.178 47.5711,-122.177 47.5726,-122.177 47.5742,-122.177 47.5762,-122.176 47.5781,-122.176 47.5801)"
};
- typedef boost::geometry::model::point_xy<double> point_type;
+ typedef boost::geometry::model::d2::point_xy<double> point_type;
std::ofstream svg("simplify_road.svg");
boost::geometry::svg_mapper<point_type> mapper(svg, 300, 300);
@@ -119,7 +119,7 @@
void svg_simplify_country()
{
- typedef boost::geometry::model::point_xy<double> point_type;
+ typedef boost::geometry::model::d2::point_xy<double> point_type;
std::ofstream svg("simplify_country.svg");
boost::geometry::svg_mapper<point_type> mapper(svg, 300, 300);
@@ -150,7 +150,7 @@
void svg_convex_hull_country()
{
- typedef boost::geometry::model::point_xy<double> point_type;
+ typedef boost::geometry::model::d2::point_xy<double> point_type;
std::ofstream svg("convex_hull_country.svg");
boost::geometry::svg_mapper<point_type> mapper(svg, 300, 300);
@@ -183,7 +183,7 @@
void svg_convex_hull_cities()
{
- typedef boost::geometry::model::point_xy<double> point_type;
+ typedef boost::geometry::model::d2::point_xy<double> point_type;
std::ofstream svg("convex_hull_cities.svg");
boost::geometry::svg_mapper<point_type> mapper(svg, 300, 300);
@@ -215,7 +215,7 @@
void svg_intersection_roads()
{
// Read the road network
- typedef boost::geometry::model::point_xy<double> point_type;
+ typedef boost::geometry::model::d2::point_xy<double> point_type;
typedef boost::geometry::model::linestring<point_type> line_type;
typedef boost::tuple<line_type, std::string> road_type;
@@ -262,7 +262,7 @@
void svg_intersection_countries()
{
// Read the road network
- typedef boost::geometry::model::point_xy<double> point_type;
+ typedef boost::geometry::model::d2::point_xy<double> point_type;
typedef boost::geometry::model::polygon<point_type> poly_type;
typedef boost::geometry::model::multi_polygon<poly_type> mp_type;
Modified: sandbox/geometry/libs/geometry/example/01_point_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/01_point_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/01_point_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -25,7 +25,7 @@
model::point<double, 2, cs::cartesian> pt1;
// 2: it's own type targetted to Cartesian (x,y) coordinates
- model::point_2d pt2;
+ model::d2::point pt2;
// 3: it supports Boost tuple's (by including the headerfile)
boost::tuple<double, double> pt3;
@@ -53,16 +53,16 @@
// Several ways of construction and setting point values
// 1: default, empty constructor, causing no initialization at all
- model::point_2d p1;
+ model::d2::point p1;
// 2: as shown above, assign
- model::point_2d p2;
+ model::d2::point p2;
assign(p2, 1, 1);
// 3: using "set" function
// set uses the concepts behind, such that it can be applied for
// every point-type (like assign)
- model::point_2d p3;
+ model::d2::point p3;
set<0>(p3, 1);
set<1>(p3, 1);
// set<2>(p3, 1); //will result in compile-error
@@ -71,11 +71,11 @@
// 3: for any point type, and other geometry objects:
// there is the "make" object generator
// (this one requires to specify the point-type).
- model::point_2d p4 = make<model::point_2d>(1,1);
+ model::d2::point p4 = make<model::d2::point>(1,1);
- // 5: for the point_2d type only: constructor with two values
- model::point_2d p5(1,1);
+ // 5: for the d2::point type only: constructor with two values
+ model::d2::point p5(1,1);
// 6: for boost tuples you can of course use make_tuple
Modified: sandbox/geometry/libs/geometry/example/02_linestring_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/02_linestring_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/02_linestring_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -71,13 +71,13 @@
// Define a linestring, which is a vector of points, and add some points
// (we add them deliberately in different ways)
- model::linestring_2d ls;
+ model::d2::linestring ls;
// points can be created using "make" and added to a linestring using the std:: "push_back"
- ls.push_back(make<model::point_2d>(1.1, 1.1));
+ ls.push_back(make<model::d2::point>(1.1, 1.1));
// points can also be assigned using "assign" and added to a linestring using "append"
- model::point_2d lp;
+ model::d2::point lp;
assign(lp, 2.5, 2.1);
append(ls, lp);
@@ -85,7 +85,7 @@
std::cout << boost::geometry::dsv(ls) << std::endl;
// The bounding box of linestrings can be calculated
- model::box_2d b;
+ model::d2::box b;
envelope(ls, b);
std::cout << boost::geometry::dsv(b) << std::endl;
@@ -102,13 +102,13 @@
std::cout << "number of points 3: " << num_points(ls) << std::endl;
// The distance from a point to a linestring can be calculated
- model::point_2d p(1.9, 1.2);
+ model::d2::point p(1.9, 1.2);
std::cout << "distance of " << boost::geometry::dsv(p)
<< " to line: " << distance(p, ls) << std::endl;
// A linestring is a vector. However, some algorithms consider "segments",
// which are the line pieces between two points of a linestring.
- double d = distance(p, model::segment<model::point_2d >(ls.front(), ls.back()));
+ double d = distance(p, model::segment<model::d2::point >(ls.front(), ls.back()));
std::cout << "distance: " << d << std::endl;
// Add some three points more, let's do it using a classic array.
@@ -119,7 +119,7 @@
// Output as iterator-pair on a vector
{
- std::vector<model::point_2d> v;
+ std::vector<model::d2::point> v;
std::copy(ls.begin(), ls.end(), std::back_inserter(v));
std::cout
@@ -139,7 +139,7 @@
std::reverse(boost::begin(ls), boost::end(ls));
// The other way, using a vector instead of a linestring, is also possible
- std::vector<model::point_2d> pv(ls.begin(), ls.end());
+ std::vector<model::d2::point> pv(ls.begin(), ls.end());
std::cout << "length: " << length(pv) << std::endl;
// If there are double points in the line, you can use unique to remove them
@@ -148,22 +148,22 @@
// (sidenote, we have to make copies, because
// ls.push_back(ls.back()) often succeeds but
// IS dangerous and erroneous!
- model::point_2d last = ls.back(), first = ls.front();
+ model::d2::point last = ls.back(), first = ls.front();
ls.push_back(last);
ls.insert(ls.begin(), first);
}
std::cout << "extra duplicate points: " << boost::geometry::dsv(ls) << std::endl;
{
- model::linestring_2d ls_copy;
+ model::d2::linestring ls_copy;
std::unique_copy(ls.begin(), ls.end(), std::back_inserter(ls_copy),
- boost::geometry::equal_to<model::point_2d>());
+ boost::geometry::equal_to<model::d2::point>());
ls = ls_copy;
std::cout << "uniquecopy: " << boost::geometry::dsv(ls) << std::endl;
}
// Lines can be simplified. This removes points, but preserves the shape
- model::linestring_2d ls_simplified;
+ model::d2::linestring ls_simplified;
simplify(ls, ls_simplified, 0.5);
std::cout << "simplified: " << boost::geometry::dsv(ls_simplified) << std::endl;
@@ -175,32 +175,32 @@
// 4) loop is defined for geometries to visit segments
// with state apart, and to be able to break out (not shown here)
{
- model::linestring_2d lscopy = ls;
- std::for_each(lscopy.begin(), lscopy.end(), translate_function<model::point_2d>);
- for_each_point(lscopy, scale_functor<model::point_2d>());
- for_each_point(lscopy, translate_function<model::point_2d>);
+ model::d2::linestring lscopy = ls;
+ std::for_each(lscopy.begin(), lscopy.end(), translate_function<model::d2::point>);
+ for_each_point(lscopy, scale_functor<model::d2::point>());
+ for_each_point(lscopy, translate_function<model::d2::point>);
std::cout << "modified line: " << boost::geometry::dsv(lscopy) << std::endl;
}
// Lines can be clipped using a clipping box. Clipped lines are added to the output iterator
- model::box_2d cb(model::point_2d(1.5, 1.5), model::point_2d(4.5, 2.5));
+ model::d2::box cb(model::d2::point(1.5, 1.5), model::d2::point(4.5, 2.5));
- std::vector<model::linestring_2d> clipped;
- intersection_inserter<model::linestring_2d> (cb, ls, std::back_inserter(clipped));
+ std::vector<model::d2::linestring> clipped;
+ intersection_inserter<model::d2::linestring> (cb, ls, std::back_inserter(clipped));
// Also possible: clip-output to a vector of vectors
- std::vector<std::vector<model::point_2d> > vector_out;
- intersection_inserter<std::vector<model::point_2d> >(cb, ls, std::back_inserter(vector_out));
+ std::vector<std::vector<model::d2::point> > vector_out;
+ intersection_inserter<std::vector<model::d2::point> >(cb, ls, std::back_inserter(vector_out));
std::cout << "clipped output as vector:" << std::endl;
- for (std::vector<std::vector<model::point_2d> >::const_iterator it
+ for (std::vector<std::vector<model::d2::point> >::const_iterator it
= vector_out.begin(); it != vector_out.end(); ++it)
{
std::cout << boost::geometry::dsv(*it) << std::endl;
}
// Calculate the convex hull of the linestring
- model::polygon_2d hull;
+ model::d2::polygon hull;
convex_hull(ls, hull);
std::cout << "Convex hull:" << boost::geometry::dsv(hull) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/03_polygon_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/03_polygon_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/03_polygon_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -29,7 +29,7 @@
// Define a polygon and fill the outer ring.
// In most cases you will read it from a file or database
- model::polygon_2d poly;
+ model::d2::polygon poly;
{
const double coor[][2] = {
{2.0, 1.3}, {2.4, 1.7}, {2.8, 1.8}, {3.4, 1.2}, {3.7, 1.6},
@@ -48,7 +48,7 @@
std::cout << dsv(poly) << std::endl;
// As with lines, bounding box of polygons can be calculated
- model::box_2d b;
+ model::d2::box b;
envelope(poly, b);
std::cout << dsv(b) << std::endl;
@@ -56,7 +56,7 @@
std::cout << "area: " << area(poly) << std::endl;
// And the centroid, which is the center of gravity
- model::point_2d cent;
+ model::d2::point cent;
centroid(poly, cent);
std::cout << "centroid: " << dsv(cent) << std::endl;
@@ -69,7 +69,7 @@
// Let's add one
{
poly.inners().resize(1);
- model::linear_ring<model::point_2d>& inner = poly.inners().back();
+ model::linear_ring<model::d2::point>& inner = poly.inners().back();
const double coor[][2] = { {4.0, 2.0}, {4.2, 1.4}, {4.8, 1.9}, {4.4, 2.2}, {4.0, 2.0} };
assign(inner, coor);
@@ -85,9 +85,9 @@
// You can test whether points are within a polygon
std::cout << "point in polygon:"
- << " p1: " << boolstr(within(make<model::point_2d>(3.0, 2.0), poly))
- << " p2: " << boolstr(within(make<model::point_2d>(3.7, 2.0), poly))
- << " p3: " << boolstr(within(make<model::point_2d>(4.4, 2.0), poly))
+ << " p1: " << boolstr(within(make<model::d2::point>(3.0, 2.0), poly))
+ << " p2: " << boolstr(within(make<model::d2::point>(3.7, 2.0), poly))
+ << " p3: " << boolstr(within(make<model::d2::point>(4.4, 2.0), poly))
<< std::endl;
// As with linestrings and points, you can derive from polygon to add, for example,
@@ -95,8 +95,8 @@
// We don't show this here.
// Clip the polygon using a bounding box
- model::box_2d cb(make<model::point_2d>(1.5, 1.5), make<model::point_2d>(4.5, 2.5));
- typedef std::vector<model::polygon_2d> polygon_list;
+ model::d2::box cb(make<model::d2::point>(1.5, 1.5), make<model::d2::point>(4.5, 2.5));
+ typedef std::vector<model::d2::polygon> polygon_list;
polygon_list v;
intersection(cb, poly, v);
@@ -106,11 +106,11 @@
std::cout << dsv(*it) << std::endl;
}
- typedef model::multi_polygon<model::polygon_2d> polygon_set;
+ typedef model::multi_polygon<model::d2::polygon> polygon_set;
polygon_set ps;
union_(cb, poly, ps);
- model::polygon_2d hull;
+ model::d2::polygon hull;
convex_hull(poly, hull);
std::cout << "Convex hull:" << dsv(hull) << std::endl;
@@ -118,14 +118,14 @@
// You don't have to use a vector, you can define a polygon with a deque
// You can specify the container for the points and for the inner rings independantly
- typedef model::polygon<model::point_2d, true, true, std::deque, std::deque> polygon_type;
+ typedef model::polygon<model::d2::point, true, true, std::deque, std::deque> polygon_type;
polygon_type poly2;
ring_type<polygon_type>::type& ring = exterior_ring(poly2);
- append(ring, make<model::point_2d>(2.8, 1.9));
- append(ring, make<model::point_2d>(2.9, 2.4));
- append(ring, make<model::point_2d>(3.3, 2.2));
- append(ring, make<model::point_2d>(3.2, 1.8));
- append(ring, make<model::point_2d>(2.8, 1.9));
+ append(ring, make<model::d2::point>(2.8, 1.9));
+ append(ring, make<model::d2::point>(2.9, 2.4));
+ append(ring, make<model::d2::point>(3.3, 2.2));
+ append(ring, make<model::d2::point>(3.2, 1.8));
+ append(ring, make<model::d2::point>(2.8, 1.9));
std::cout << dsv(poly2) << std::endl;
return 0;
Modified: sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -27,10 +27,10 @@
namespace bg = boost::geometry;
std::ofstream stream("05_a_intersection_polygon_example.svg");
- bg::svg_mapper<bg::model::point_2d> svg(stream, 500, 500);
+ bg::svg_mapper<bg::model::d2::point> svg(stream, 500, 500);
// Define a polygons and fill the outer rings.
- bg::model::polygon_2d a;
+ bg::model::d2::polygon a;
{
const double c[][2] = {
{160, 330}, {60, 260}, {20, 150}, {60, 40}, {190, 20}, {270, 130}, {260, 250}, {160, 330}
@@ -41,7 +41,7 @@
std::cout << "A: " << bg::dsv(a) << std::endl;
svg.add(a);
- bg::model::polygon_2d b;
+ bg::model::d2::polygon b;
{
const double c[][2] = {
{300, 330}, {190, 270}, {150, 170}, {150, 110}, {250, 30}, {380, 50}, {380, 250}, {300, 330}
@@ -57,11 +57,11 @@
// Calculate interesection(s)
- std::vector<bg::model::polygon_2d > intersection;
- bg::intersection<bg::model::polygon_2d>(a, b, intersection);
+ std::vector<bg::model::d2::polygon > intersection;
+ bg::intersection<bg::model::d2::polygon>(a, b, intersection);
std::cout << "Intersection of polygons A and B" << std::endl;
- BOOST_FOREACH(bg::model::polygon_2d const& polygon, intersection)
+ BOOST_FOREACH(bg::model::d2::polygon const& polygon, intersection)
{
std::cout << bg::dsv(polygon) << std::endl;
svg.map(polygon, "opacity:0.5;fill:none;stroke:rgb(255,0,0);stroke-width:6");
Modified: sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -27,13 +27,13 @@
namespace bg = boost::geometry;
// Define a polygons and fill the outer rings.
- bg::model::linestring_2d ls;
+ bg::model::d2::linestring ls;
{
const double c[][2] = { {0, 1}, {2, 5}, {5, 3} };
bg::assign(ls, c);
}
- bg::model::polygon_2d p;
+ bg::model::d2::polygon p;
{
const double c[][2] = { {3, 0}, {0, 3}, {4, 5}, {3, 0} };
bg::assign(p, c);
@@ -42,7 +42,7 @@
// Create SVG-mapper
std::ofstream stream("05_b_overlay_linestring_polygon_example.svg");
- bg::svg_mapper<bg::model::point_2d> svg(stream, 500, 500);
+ bg::svg_mapper<bg::model::d2::point> svg(stream, 500, 500);
// Determine extend by adding geometries
svg.add(p);
svg.add(ls);
@@ -52,7 +52,7 @@
// Calculate intersection points (turn points)
- typedef bg::detail::overlay::turn_info<bg::model::point_2d> turn_info;
+ typedef bg::detail::overlay::turn_info<bg::model::d2::point> turn_info;
std::vector<turn_info> turns;
bg::detail::get_turns::no_interrupt_policy policy;
bg::get_turns<bg::detail::overlay::assign_null_policy>(ls, p, turns, policy);
Modified: sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -19,17 +19,17 @@
{
using namespace boost::geometry;
- model::point_2d p(1, 1);
- model::point_2d p2;
+ model::d2::point p(1, 1);
+ model::d2::point p2;
// Example: translate a point over (5,5)
- strategy::transform::translate_transformer<model::point_2d, model::point_2d> translate(5, 5);
+ strategy::transform::translate_transformer<model::d2::point, model::d2::point> translate(5, 5);
transform(p, p2, translate);
std::cout << "transformed point " << boost::geometry::dsv(p2) << std::endl;
// Transform a polygon
- model::polygon_2d poly, poly2;
+ model::d2::polygon poly, poly2;
const double coor[][2] = { {0, 0}, {0, 7}, {2, 2}, {2, 0}, {0, 0} };
// note that for this syntax you have to include the two
// include files above (c_array_cartesian.hpp, std_as_linestring.hpp)
Modified: sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -113,36 +113,36 @@
svg_output<std::ofstream> svg(ofs, 0.5);
// G1 - create subject for affine transformations
- model::polygon_2d g1;
+ model::d2::polygon g1;
read_wkt("POLYGON((50 250, 400 250, 150 50, 50 250))", g1);
std::clog << "source box:\t" << boost::geometry::dsv(g1) << std::endl;
svg.put(g1, "g1");
// G1 - Translate -> G2
- translate_transformer<model::point_2d, model::point_2d> translate(0, 250);
- model::polygon_2d g2;
+ translate_transformer<model::d2::point, model::d2::point> translate(0, 250);
+ model::d2::polygon g2;
transform(g1, g2, translate);
std::clog << "translated:\t" << boost::geometry::dsv(g2) << std::endl;
svg.put(g2, "g2=g1.translate(0,250)");
// G2 - Scale -> G3
- scale_transformer<model::point_2d, model::point_2d> scale(0.5, 0.5);
- model::polygon_2d g3;
+ scale_transformer<model::d2::point, model::d2::point> scale(0.5, 0.5);
+ model::d2::polygon g3;
transform(g2, g3, scale);
std::clog << "scaled:\t" << boost::geometry::dsv(g3) << std::endl;
svg.put(g3, "g3=g2.scale(0.5,0.5)");
// G3 - Combine rotate and translate -> G4
- rotate_transformer<model::point_2d, model::point_2d, degree> rotate(45);
+ rotate_transformer<model::d2::point, model::d2::point, degree> rotate(45);
// Compose matrix for the two transformation
// Create transformer attached to the transformation matrix
- ublas_transformer<model::point_2d, model::point_2d, 2, 2>
+ ublas_transformer<model::d2::point, model::d2::point, 2, 2>
combined(boost::numeric::ublas::prod(rotate.matrix(), translate.matrix()));
//combined(rotate.matrix());
// Apply transformation to subject geometry point-by-point
- model::polygon_2d g4;
+ model::d2::polygon g4;
transform(g3, g4, combined);
std::clog << "rotated & translated:\t" << boost::geometry::dsv(g4) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -264,7 +264,7 @@
// Define a point in the Geographic coordinate system
typedef boost::geometry::model::point
<
- double, 2, boost::geometry::cs::geographic<boost::geometry::degree>
+ double, 2, boost::geometry::cs::geographic<boost::geometry::degree>
> point_type;
typedef boost::geometry::model::linestring<point_type> line_type;
@@ -281,7 +281,7 @@
// Init a bounding box, lateron used to define SVG map
- boost::geometry::model::box_2d box;
+ boost::geometry::model::d2::box box;
boost::geometry::assign_inverse(box);
// Read the cities
@@ -364,19 +364,19 @@
BOOST_FOREACH(road_type const& road, roads)
{
- mapper.map(road.get<0>(),
+ mapper.map(road.get<0>(),
"stroke:rgb(128,128,128);stroke-width:1");
}
- mapper.map(route,
+ mapper.map(route,
"stroke:rgb(0, 255, 0);stroke-width:6;opacity:0.5");
// Map cities
BOOST_FOREACH(city_type const& city, cities)
{
- mapper.map(city.get<0>(),
+ mapper.map(city.get<0>(),
"fill:rgb(255,255,0);stroke:rgb(0,0,0);stroke-width:1");
- mapper.text(city.get<0>(), city.get<1>(),
+ mapper.text(city.get<0>(), city.get<1>(),
"fill:rgb(0,0,0);font-family:Arial;font-size:10px", 5, 5);
}
Modified: sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -250,7 +250,7 @@
// Define a point in the Geographic coordinate system
typedef boost::geometry::model::point
<
- double, 2, boost::geometry::cs::geographic<boost::geometry::degree>
+ double, 2, boost::geometry::cs::geographic<boost::geometry::degree>
> point_type;
typedef boost::geometry::model::linestring<point_type> line_type;
@@ -269,7 +269,7 @@
// Init a bounding box, lateron used to define SVG map
- boost::geometry::model::box_2d box;
+ boost::geometry::model::d2::box box;
boost::geometry::assign_inverse(box);
graph_type graph;
@@ -352,19 +352,19 @@
BOOST_FOREACH(road_type const& road, roads)
{
- mapper.map(road.get<0>(),
+ mapper.map(road.get<0>(),
"stroke:rgb(128,128,128);stroke-width:1");
}
- mapper.map(route,
+ mapper.map(route,
"stroke:rgb(0, 255, 0);stroke-width:6;opacity:0.5");
// Map cities
BOOST_FOREACH(city_type const& city, cities)
{
- mapper.map(city.get<0>(),
+ mapper.map(city.get<0>(),
"fill:rgb(255,255,0);stroke:rgb(0,0,0);stroke-width:1");
- mapper.text(city.get<0>(), city.get<1>(),
+ mapper.text(city.get<0>(), city.get<1>(),
"fill:rgb(0,0,0);font-family:Arial;font-size:10px", 5, 5);
}
Modified: sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -19,7 +19,7 @@
#include <boost/geometry/util/write_dsv.hpp>
-struct triangle : public boost::array<boost::geometry::model::point_xy<double>, 4>
+struct triangle : public boost::array<boost::geometry::model::d2::point_xy<double>, 4>
{
inline void close()
{
@@ -71,7 +71,7 @@
std::cout << "Triangle: " << boost::geometry::dsv(t) << std::endl;
std::cout << "Area: " << boost::geometry::area(t) << std::endl;
- boost::geometry::model::point_xy<double> c;
+ boost::geometry::model::d2::point_xy<double> c;
boost::geometry::centroid(t, c);
std::cout << "Centroid: " << boost::geometry::dsv(c) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -86,16 +86,16 @@
std::cout << boost::geometry::length(myline) << std::endl;
- boost::geometry::model::box_2d cb(boost::geometry::model::point_2d(1.5, 1.5), boost::geometry::model::point_2d(4.5, 4.5));
+ boost::geometry::model::d2::box cb(boost::geometry::model::d2::point(1.5, 1.5), boost::geometry::model::d2::point(4.5, 4.5));
// This will NOT work because would need dynamicly allocating memory for point* in algorithms:
// std::vector<ln> clipped;
//boost::geometry::intersection(cb, myline, std::back_inserter(clipped));
// This works because outputs to a normal struct point, no point*
- std::vector<boost::geometry::model::linestring_2d> clipped;
- boost::geometry::strategy::intersection::liang_barsky<boost::geometry::model::box_2d, boost::geometry::model::point_2d> strategy;
- boost::geometry::detail::intersection::clip_range_with_box<boost::geometry::model::linestring_2d>(cb,
+ std::vector<boost::geometry::model::d2::linestring> clipped;
+ boost::geometry::strategy::intersection::liang_barsky<boost::geometry::model::d2::box, boost::geometry::model::d2::point> strategy;
+ boost::geometry::detail::intersection::clip_range_with_box<boost::geometry::model::d2::linestring>(cb,
myline, std::back_inserter(clipped), strategy);
Modified: sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -97,20 +97,20 @@
//std::vector<ring_type> unioned;
//boost::geometry::union<ring_type>(a, b, std::back_inserter(unioned));
- std::vector<boost::geometry::model::ring_2d> unioned;
- std::vector<boost::geometry::model::ring_2d> intersected;
+ std::vector<boost::geometry::model::d2::ring> unioned;
+ std::vector<boost::geometry::model::d2::ring> intersected;
// Temporarily not working
/*
- boost::geometry::intersection_inserter<boost::geometry::ring_2d>(a, b, std::back_inserter(intersected));
- boost::geometry::union_inserter<boost::geometry::ring_2d>(a, b, std::back_inserter(unioned));
+ boost::geometry::intersection_inserter<boost::geometry::d2::ring>(a, b, std::back_inserter(intersected));
+ boost::geometry::union_inserter<boost::geometry::d2::ring>(a, b, std::back_inserter(unioned));
double ai = 0, au = 0;
- BOOST_FOREACH(boost::geometry::ring_2d const& ring, intersected)
+ BOOST_FOREACH(boost::geometry::d2::ring const& ring, intersected)
{
ai += boost::geometry::area(ring);
}
- BOOST_FOREACH(boost::geometry::ring_2d const& ring, unioned)
+ BOOST_FOREACH(boost::geometry::d2::ring const& ring, unioned)
{
au += boost::geometry::area(ring);
}
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -28,7 +28,7 @@
#endif
// BSG 28-10-2010
-// TODO: celar up this test
+// TODO: clear up this test
// it is more a test than an example
// the results are sometimes WRONG
@@ -37,7 +37,7 @@
using namespace boost::geometry;
- typedef model::point_ll_deg latlon_point;
+ typedef model::ll::point<degree> latlon_point;
latlon_point city1;
// Amsterdam 52 22'23"N 4 53'32"E
@@ -58,30 +58,30 @@
latlon_point city3(longitude<>(dms<east>(2, 11, 0)), latitude<>(dms<north>(41, 23, 0)));
- model::point_ll_rad a_rad, r_rad, h_rad;
- transform(city1, a_rad);
- transform(city2, r_rad);
- transform(city3, h_rad);
+ model::ll::point<radian> city1_rad, city2_rad, city3_rad;
+ transform(city1, city1_rad);
+ transform(city2, city2_rad);
+ transform(city3, city3_rad);
#ifndef NO_PROJECTION
/*
- projection::sterea_ellipsoid<model::point_ll_rad, model::point_2d> proj
+ projection::sterea_ellipsoid<model::ll::point<radian>, model::d2::point> proj
(projection::init(
"+lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +units=m"));
*/
- projection::laea_ellipsoid<model::point_ll_rad, model::point_2d> proj
+ projection::laea_ellipsoid<model::ll::point<radian>, model::d2::point> proj
(projection::init(
" +lat_0=52 +lon_0=10 +x_0=4321000 +y_0=3210000 +ellps=GRS80 +units=m"));
- model::point_2d a_rd, r_rd, h_rd;
- proj.forward(a_rad, a_rd);
- proj.forward(h_rad, h_rd);
- proj.forward(r_rad, r_rd);
+ model::d2::point city1_prj, city2_prj, city3_prj;
+ proj.forward(city1_rad, city1_prj);
+ proj.forward(city3_rad, city3_prj);
+ proj.forward(city2_rad, city2_prj);
#else
- model::point_2d a_rd(121267, 487245);
- model::point_2d r_rd(92526.2, 438324);
- model::point_2d h_rd(80454.2, 455086);
+ model::d2::point city1_prj(121267, 487245);
+ model::d2::point city2_prj(92526.2, 438324);
+ model::d2::point city3_prj(80454.2, 455086);
#endif
// ------------------------------------------------------------------------------------------
@@ -90,12 +90,12 @@
std::cout << "Distance " << city1_name << "-" << city2_name << ": " << std::endl;
std::cout << "haversine: " << 0.001 * distance(city1, city2) << " km" << std::endl;
- std::cout << "haversine rad: " << 0.001 * distance(a_rad, r_rad) << " km" << std::endl;
+ std::cout << "haversine rad: " << 0.001 * distance(city1_rad, city2_rad) << " km" << std::endl;
std::cout << "haversine other radius: " << distance(city1, city2, strategy::distance::haversine<latlon_point>(6371.0) ) << " km" << std::endl;
std::cout << "andoyer: " << 0.001 * distance(city1, city2, strategy::distance::andoyer<latlon_point>() ) << " km" << std::endl;
std::cout << "vincenty: " << 0.001 * distance(city1, city2, strategy::distance::vincenty<latlon_point>() ) << " km" << std::endl;
- std::cout << "vincenty rad: " << 0.001 * distance(a_rad, r_rad, strategy::distance::vincenty<model::point_ll_rad>() ) << " km" << std::endl;
- std::cout << "Projected, pythagoras: " << 0.001 * distance(a_rd, r_rd) << " km" << std::endl;
+ std::cout << "vincenty rad: " << 0.001 * distance(city1_rad, city2_rad, strategy::distance::vincenty<model::ll::point<radian>>() ) << " km" << std::endl;
+ std::cout << "Projected, pythagoras: " << 0.001 * distance(city1_prj, city2_prj) << " km" << std::endl;
std::cout << std::endl;
std::cout << "Distance " << city1_name << "-" << city3_name << ": " << std::endl;
@@ -108,35 +108,35 @@
// ------------------------------------------------------------------------------------------
std::cout << std::endl << city3_name << " - line " << city1_name << "," << city2_name << std::endl;
- model::segment_2d ar_xy(a_rd, r_rd);
+ model::d2::segment ar_xy(city1_prj, city2_prj);
- double dr = distance(h_rd, ar_xy);
- std::cout << "in RD: " << 0.001 * dr << std::endl;
+ double dr = distance(city3_prj, ar_xy);
+ std::cout << "projected: " << 0.001 * dr << std::endl;
double const radius = 6378137.0;
- dr = distance(city3, model::segment_ll_deg(city1, city2));
+ dr = distance(city3, model::segment<latlon_point>(city1, city2));
std::cout << "in LL: " << 0.001 * dr << std::endl;
std::cout << std::endl << city2_name << " - line " << city1_name << "," << city3_name << std::endl;
- dr = distance(r_rd, model::segment_2d(a_rd, h_rd));
- std::cout << "in RD: " << 0.001 * dr << std::endl;
- dr = distance(city2, model::segment_ll_deg(city1, city3));
+ dr = distance(city2_prj, model::d2::segment(city1_prj, city3_prj));
+ std::cout << "projected: " << 0.001 * dr << std::endl;
+ dr = distance(city2, model::segment<latlon_point>(city1, city3));
std::cout << "in LL: " << 0.001 * dr << std::endl;
std::cout << std::endl;
-
+
// ------------------------------------------------------------------------------------------
// Compilation
// ------------------------------------------------------------------------------------------
// Next line does not compile because Vincenty cannot work on xy-points
- //std::cout << "vincenty on xy: " << 0.001 * distance(a_rd, r_rd, formulae::distance::vincenty<>() ) << " km" << std::endl;
+ //std::cout << "vincenty on xy: " << 0.001 * distance(city1_prj, city2_prj, formulae::distance::vincenty<>() ) << " km" << std::endl;
// Next line does not compile because you cannot (yet) assign degree to radian directly
- //point_ll_rad a_rad2 = city1;
+ //ll::point<radian> a_rad2 = city1;
// Next line does not compile because you cannot assign latlong to xy
- // point_2d axy = city1;
+ // d2::point axy = city1;
// ------------------------------------------------------------------------------------------
// Length
@@ -144,15 +144,15 @@
// Length calculations use distances internally. The lines below take automatically the default
// formulae for distance. However, you can also specify city1 formula explicitly.
- model::linestring_ll_deg line1;
+ model::linestring<latlon_point> line1;
append(line1, city1);
append(line1, city2);
std::cout << "length: " << length(line1) << std::endl;
std::cout << "length using Vincenty: " << length(line1, strategy::distance::vincenty<latlon_point>()) << std::endl;
- model::linestring_2d line2;
- append(line2, a_rd);
- append(line2, r_rd);
+ model::d2::linestring line2;
+ append(line2, city1_prj);
+ append(line2, city2_prj);
std::cout << "length: " << length(line2) << std::endl;
return 0;
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -62,8 +62,7 @@
{
using namespace boost::geometry;
- // Declare a latlong point, using doubles and degrees (= default)
- typedef model::point_ll_deg latlon_point;
+ typedef model::ll::point<degree> latlon_point;
latlon_point paris;
@@ -104,11 +103,11 @@
// Convert a latlong point to radians. This might be convenient, although algorithms
// are transparent on degree/radians
- model::point_ll_rad paris_rad;
+ model::ll::point<radian> paris_rad;
transform(paris, paris_rad);
std::cout << "Paris in radians: " << boost::geometry::dsv(paris_rad) << std::endl;
- model::point_ll_rad amsterdam_rad;
+ model::ll::point<radian> amsterdam_rad;
transform(amsterdam, amsterdam_rad);
std::cout << "Amsterdam in radians: " << boost::geometry::dsv(amsterdam_rad) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -26,13 +26,13 @@
// Construct a Robinson projection, using specified point types
// (This delivers a projection without virtual methods. Note that in p02 example
// the projection is created using a factory, which delivers a projection with virtual methods)
- projection::robin_spheroid<model::point_ll_deg, model::point_2d> prj(par);
+ projection::robin_spheroid<model::point_ll_deg, model::d2::point> prj(par);
// Define Amsterdam / Barcelona in decimal degrees / degrees/minutes
model::point_ll_deg amsterdam = parse<model::point_ll_deg>("52.4N", "5.9E");
model::point_ll_deg barcelona = parse<model::point_ll_deg>("41 23'N", "2 11'E");
- model::point_2d pa, pb;
+ model::d2::point pa, pb;
// Now do the projection. "Forward" means from latlong to meters.
// (Note that a map projection might fail. This is not 'exceptional'.
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -28,8 +28,8 @@
// Note that this is the only difference from p01_projection_example. It constructs a projection
// with virtual methods, which can be used polymorphically. Therefore it is a pointer. For
// convenience we use a boost shared pointer here.
- projection::factory<model::point_ll_deg, model::point_2d> fac;
- boost::shared_ptr<projection::projection<model::point_ll_deg, model::point_2d> > prj(fac.create_new(par));
+ projection::factory<model::point_ll_deg, model::d2::point> fac;
+ boost::shared_ptr<projection::projection<model::point_ll_deg, model::d2::point> > prj(fac.create_new(par));
// Define Amsterdam / Barcelona in decimal degrees / degrees/minutes
model::point_ll_deg amsterdam(longitude<>(5.9), latitude<>(52.4));
@@ -38,7 +38,7 @@
longitude<>(dms<east>(2, 11))
);
- model::point_2d pa, pb;
+ model::d2::point pa, pb;
// Do the forward projection
if (prj->forward(amsterdam, pa) && prj->forward(barcelona, pb))
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -55,28 +55,28 @@
// Our latlong polygon collection will be projected into this vector
// (Of course it is also possible to do this while reading and have one vector)
- std::vector<model::polygon_2d> xy_polygons;
+ std::vector<model::d2::polygon> xy_polygons;
// Declare transformation strategy which contains a projection
projection::project_transformer
<
model::point_ll_deg,
- model::point_2d
+ model::d2::point
> projection(projection_parameters);
// Project the polygons, and at the same time get the bounding box (in xy)
- model::box_2d bbox;
+ model::d2::box bbox;
assign_inverse(bbox);
for (std::vector<model::polygon_ll_deg>::const_iterator it = ll_polygons.begin();
it != ll_polygons.end();
++it)
{
- model::polygon_2d xy_polygon;
+ model::d2::polygon xy_polygon;
if (transform(*it, xy_polygon, projection))
{
// Update bbox with box of this projected polygon
- combine(bbox, make_envelope<model::box_2d>(xy_polygon));
+ combine(bbox, make_envelope<model::d2::box>(xy_polygon));
// Add projected polygon
xy_polygons.push_back(xy_polygon);
@@ -95,10 +95,10 @@
// Setup the transformation to SVG
// (alternatively this could be skipped because SVG can transform itself,
// but this example shows it like this)
- typedef boost::geometry::model::point_xy<int> svg_point;
+ typedef boost::geometry::model::d2::point_xy<int> svg_point;
boost::geometry::strategy::transform::map_transformer
<
- model::point_2d,
+ model::d2::point,
svg_point,
true,
true
@@ -110,7 +110,7 @@
boost::geometry::assign(box, 0, 0, 800, 600);
out << boost::geometry::svg(box, "fill:rgb(0,0,255)") << std::endl;
- for (std::vector<model::polygon_2d>::const_iterator it = xy_polygons.begin();
+ for (std::vector<model::d2::polygon>::const_iterator it = xy_polygons.begin();
it != xy_polygons.end();
++it)
{
Modified: sandbox/geometry/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -66,7 +66,7 @@
if (!boost::geometry::hex2wkb(*it, std::back_inserter(wkb)))
throw std::runtime_error("hex2wkb translation failed");
- boost::geometry::model::polygon_2d parcel;
+ boost::geometry::model::d2::polygon parcel;
if (!boost::geometry::read_wkb(wkb.begin(), wkb.end(), parcel))
throw std::runtime_error("read_wkb failed");
Modified: sandbox/geometry/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp (original)
+++ sandbox/geometry/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -41,7 +41,7 @@
typedef boost::geometry::model::multi_polygon
- <boost::geometry::model::polygon_2d> country_type;
+ <boost::geometry::model::d2::polygon> country_type;
// Adapt wxWidgets points to Boost.Geometry points such that they can be used
// in e.g. transformations (see below)
@@ -157,19 +157,19 @@
typedef boost::geometry::strategy::transform::map_transformer
<
- boost::geometry::model::point_2d, wxPoint,
+ boost::geometry::model::d2::point, wxPoint,
true, true
> map_transformer_type;
typedef boost::geometry::strategy::transform::inverse_transformer
<
- wxPoint, boost::geometry::model::point_2d
+ wxPoint, boost::geometry::model::d2::point
> inverse_transformer_type;
boost::shared_ptr<map_transformer_type> m_map_transformer;
boost::shared_ptr<inverse_transformer_type> m_inverse_transformer;
- boost::geometry::model::box_2d m_box;
+ boost::geometry::model::d2::box m_box;
std::vector<country_type> m_countries;
int m_focus;
@@ -259,7 +259,7 @@
m_owner->PrepareDC(dc);
// Transform the point to Lon/Lat
- bg::model::point_2d point;
+ bg::model::d2::point point;
bg::transform(event.GetPosition(), point, *m_inverse_transformer);
// Determine selected object
@@ -353,7 +353,7 @@
{
namespace bg = boost::geometry;
- BOOST_FOREACH(bg::model::polygon_2d const& poly, country)
+ BOOST_FOREACH(bg::model::d2::polygon const& poly, country)
{
// Use only outer, holes are (for the moment) ignored. This would need
// a holey-polygon compatible wx object
Modified: sandbox/geometry/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -84,11 +84,11 @@
{
std::string filename = "c:/data/spatial/shape/world_free/world.shp";
- std::vector<model::polygon_2d> polygons;
+ std::vector<model::d2::polygon> polygons;
try
{
- read_shapefile(filename, polygons, convert<model::polygon_2d>);
+ read_shapefile(filename, polygons, convert<model::d2::polygon>);
}
catch(const std::string& s)
{
@@ -97,9 +97,9 @@
}
// Do something with the polygons, for example simplify them
- for (std::vector<model::polygon_2d>::iterator it = polygons.begin(); it != polygons.end(); it++)
+ for (std::vector<model::d2::polygon>::iterator it = polygons.begin(); it != polygons.end(); it++)
{
- model::polygon_2d p;
+ model::d2::polygon p;
simplify(*it, p, 0.01);
std::cout << it->outer().size() << "," << p.outer().size() << std::endl;
*it = p;
@@ -107,7 +107,7 @@
std::cout << "Simplified " << polygons.size() << std::endl;
double sum = 0;
- for (std::vector<model::polygon_2d>::const_iterator it = polygons.begin(); it != polygons.end(); it++)
+ for (std::vector<model::d2::polygon>::const_iterator it = polygons.begin(); it != polygons.end(); it++)
{
sum += area(*it);
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/area.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/area.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/area.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -106,7 +106,7 @@
test_open_ccw<bg::model::point<double, 2, bg::cs::cartesian> >();
#ifdef HAVE_TTMATH
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/centroid.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/centroid.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/centroid.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -65,14 +65,14 @@
int test_main(int, char* [])
{
- test_2d<bg::model::point_xy<double> >();
+ test_2d<bg::model::d2::point_xy<double> >();
test_2d<boost::tuple<float, float> >();
- test_2d<bg::model::point_xy<float> >();
+ test_2d<bg::model::d2::point_xy<float> >();
test_3d<boost::tuple<double, double, double> >();
#if defined(HAVE_TTMATH)
- test_2d<bg::model::point_xy<ttmath_big> >();
+ test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/comparable_distance.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/comparable_distance.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/comparable_distance.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -129,9 +129,9 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/convex_hull.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/convex_hull.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/convex_hull.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -39,12 +39,12 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/correct.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/correct.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/correct.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -165,8 +165,8 @@
//test_all<double[2]>();
//test_all<point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -230,8 +230,8 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/difference.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/difference.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/difference.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -106,6 +106,6 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/disjoint.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -114,8 +114,8 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/dissolve.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/dissolve.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/dissolve.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -109,6 +109,6 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/distance.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/distance.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/distance.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -165,8 +165,8 @@
test_distance_segment<P>();
test_distance_array_as_linestring<P>();
- test_geometry<P, test::custom_segment>("POINT(1 3)", "LINESTRING(1 1,4 4)", sqrt(2.0));
- test_geometry<P, test::custom_segment>("POINT(3 1)", "LINESTRING(1 1,4 4)", sqrt(2.0));
+ test_geometry<P, bg::model::segment<P> >("POINT(1 3)", "LINESTRING(1 1,4 4)", sqrt(2.0));
+ test_geometry<P, bg::model::segment<P> >("POINT(3 1)", "LINESTRING(1 1,4 4)", sqrt(2.0));
test_geometry<P, P>("POINT(1 1)", "POINT(2 2)", sqrt(2.0));
test_geometry<P, P>("POINT(0 0)", "POINT(0 3)", 3.0);
@@ -217,10 +217,10 @@
//test_all<test::test_point>(); // located here because of 3D
#endif
- test_all<bg::model::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<int> >();
test_all<boost::tuple<float, float> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/envelope.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/envelope.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/envelope.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -46,9 +46,9 @@
//test_2d<float[2]>();
//test_2d<double[2]>();
test_2d<boost::tuple<float, float> >();
- test_2d<bg::model::point_xy<int> >();
- test_2d<bg::model::point_xy<float> >();
- test_2d<bg::model::point_xy<double> >();
+ test_2d<bg::model::d2::point_xy<int> >();
+ test_2d<bg::model::d2::point_xy<float> >();
+ test_2d<bg::model::d2::point_xy<double> >();
test_3d<test::test_point>();
Modified: sandbox/geometry/libs/geometry/test/algorithms/equals.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/equals.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/equals.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -99,11 +99,11 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/intersection.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -274,10 +274,10 @@
p = new test::test_point_xy; p->x = 0; p->y = 0; ln.push_back(p);
p = new test::test_point_xy; p->x = 10; p->y = 10; ln.push_back(p);
- bg::model::box<bg::model::point_xy<double> > box;
+ bg::model::box<bg::model::d2::point_xy<double> > box;
bg::assign(box, 2, 2, 8, 8);
- typedef bg::model::linestring<bg::model::point_xy<double> > output_type;
+ typedef bg::model::linestring<bg::model::d2::point_xy<double> > output_type;
std::vector<output_type> clip;
bg::intersection_inserter<output_type>(box, ln, std::back_inserter(clip));
@@ -306,11 +306,11 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
//test_pointer_version();
Modified: sandbox/geometry/libs/geometry/test/algorithms/intersects.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/intersects.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/intersects.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -70,10 +70,10 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/is_convex.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -108,12 +108,12 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<int> >();
- //test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/length.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/length.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/length.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -27,12 +27,12 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlaps.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlaps.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlaps.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -51,11 +51,11 @@
int test_main( int , char* [] )
{
- test_2d<bg::model::point_xy<int> >();
- test_2d<bg::model::point_xy<double> >();
+ test_2d<bg::model::d2::point_xy<int> >();
+ test_2d<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_2d<bg::model::point_xy<ttmath_big> >();
+ test_2d<bg::model::d2::point_xy<ttmath_big> >();
#endif
//test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/assemble.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -129,7 +129,7 @@
std::string ps = "POLYGON(" + exteriors[pe] + "," + interiors[pi] + ")";
std::string qs = "POLYGON(" + exteriors[qe] + "," + interiors[qi] + ")";
- bg::model::polygon_2d p, q;
+ bg::model::d2::polygon p, q;
bg::read_wkt(ps, p);
bg::read_wkt(qs, q);
bg::correct(p);
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -188,7 +188,7 @@
template <typename T>
inline void test_polygon(std::string const& wkt1, std::string const& wkt2, std::string const& name)
{
- typedef bg::model::point_xy<T> point;
+ typedef bg::model::d2::point_xy<T> point;
typedef bg::model::polygon<point> clock;
typedef bg::model::polygon<point, false> counter;
@@ -205,7 +205,7 @@
template <typename T>
inline void test_box_polygon(std::string const& wkt1, std::string const& wkt2, std::string const& name)
{
- typedef bg::model::point_xy<T> point;
+ typedef bg::model::d2::point_xy<T> point;
typedef bg::model::box<point> box;
typedef bg::model::polygon<point> clock;
typedef bg::model::polygon<point, false> counter;
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolver.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolver.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/dissolver.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -209,7 +209,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -171,8 +171,8 @@
// ticket#17
expected.push_back(boost::make_tuple(6, "LR,RL,LR,RL,RL,LR"));
- //test_all<bg::model::point_xy<float>, test_enrich_intersection_points>(expected);
- test_all<bg::model::point_xy<double>, test_enrich_intersection_points>(expected);
+ //test_all<bg::model::d2::point_xy<float>, test_enrich_intersection_points>(expected);
+ test_all<bg::model::d2::point_xy<double>, test_enrich_intersection_points>(expected);
//test_all<boost::tuple<double, double>, test_enrich_intersection_points>(expected);
*/
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/get_turn_info.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -851,6 +851,6 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/relative_order.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -198,6 +198,6 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_pies.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -137,7 +137,7 @@
bool multi, bool multi_st, bool svg)
{
boost::timer t;
- typedef bg::model::point_xy<T> point_type;
+ typedef bg::model::d2::point_xy<T> point_type;
typedef bg::model::polygon<point_type> polygon;
typedef bg::model::multi_polygon<polygon> multi_polygon;
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/intersection_stars.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -90,7 +90,7 @@
<< c_type << " (" << sizeof(CalculationType) << ")"
<< std::endl;
boost::timer t;
- typedef bg::model::point_xy<T> point_type;
+ typedef bg::model::d2::point_xy<T> point_type;
typedef bg::model::polygon<point_type> polygon;
T area_i = 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -94,7 +94,7 @@
void test_star_ellipse(int seed, int index, star_params const& par_p,
star_params const& par_q, bool svg, double tolerance)
{
- typedef bg::model::point_xy<T> point_type;
+ typedef bg::model::d2::point_xy<T> point_type;
typedef bg::model::polygon<point_type> polygon;
polygon p, q;
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/robustness/recursive_boxes.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -129,7 +129,7 @@
typedef bg::model::polygon
<
- bg::model::point_xy<T>
+ bg::model::d2::point_xy<T>
> polygon;
typedef bg::model::multi_polygon<polygon> mp;
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -227,7 +227,7 @@
#if ! defined(GEOMETRY_TEST_MULTI)
int test_main(int, char* [])
{
- test_self_all<bg::model::point_xy<double> >();
+ test_self_all<bg::model::d2::point_xy<double> >();
return 0;
}
#endif
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/split_rings.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/split_rings.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/split_rings.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -141,7 +141,7 @@
#if ! defined(GEOMETRY_TEST_MULTI)
int test_main(int, char* [])
{
- test_self_all<bg::model::point_xy<double> >();
+ test_self_all<bg::model::d2::point_xy<double> >();
return 0;
}
#endif
Modified: sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -96,7 +96,7 @@
std::ofstream svg(filename.str().c_str());
// Trick to have this always LongDouble
- //typedef bg::model::point_xy<long double> P;
+ //typedef bg::model::d2::point_xy<long double> P;
typedef typename bg::point_type<G1>::type P;
//typename bg::replace_point_type<G1, P>::type rg1;
//typename bg::replace_point_type<G2, P>::type rg2;
@@ -184,17 +184,17 @@
switch(mode)
{
case 1 :
- test_traverse_gmp<bg::model::point_xy<float> >("float");
+ test_traverse_gmp<bg::model::d2::point_xy<float> >("float");
break;
case 2 :
- test_traverse_gmp<bg::model::point_xy<double> >("double");
+ test_traverse_gmp<bg::model::d2::point_xy<double> >("double");
break;
case 3 :
- test_traverse_gmp<bg::model::point_xy<long double> >("long double");
+ test_traverse_gmp<bg::model::d2::point_xy<long double> >("long double");
break;
case 4 :
#if defined(HAVE_TTMATH)
- test_traverse_gmp<bg::model::point_xy<ttmath_big> >("ttmath_big");
+ test_traverse_gmp<bg::model::d2::point_xy<ttmath_big> >("ttmath_big");
#endif
break;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/perimeter.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/perimeter.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/perimeter.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -35,14 +35,14 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
- test_open<bg::model::point_xy<double> >();
+ test_open<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/reverse.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/reverse.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/reverse.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -45,8 +45,8 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/simplify.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/simplify.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/simplify.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -83,10 +83,10 @@
int test_main(int, char* [])
{
// Integer compiles, but simplify-process fails (due to distances)
- //test_all<bg::model::point_xy<int> >();
+ //test_all<bg::model::d2::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
test_spherical<bg::model::point<double, 2, bg::cs::spherical<bg::degree> > >();
Modified: sandbox/geometry/libs/geometry/test/algorithms/transform.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/transform.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/transform.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -99,9 +99,9 @@
int test_main(int, char* [])
{
- typedef bg::model::point_xy<double > P;
+ typedef bg::model::d2::point_xy<double > P;
test_all<P, P>();
- test_all<bg::model::point_xy<int>, bg::model::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<int>, bg::model::d2::point_xy<float> >();
test_all<bg::model::point<double, 2, bg::cs::spherical<bg::degree> >,
bg::model::point<double, 2, bg::cs::spherical<bg::radian> > >(bg::math::d2r);
Modified: sandbox/geometry/libs/geometry/test/algorithms/union.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/union.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/union.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -271,12 +271,12 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
- //test_all<bg::model::point_xy<long double> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<long double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/algorithms/unique.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/unique.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/unique.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -46,8 +46,8 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/algorithms/within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/algorithms/within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/algorithms/within.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -45,7 +45,7 @@
// Mixed point types
test_geometry
<
- bg::model::point_xy<float>,
+ bg::model::d2::point_xy<float>,
bg::model::polygon<P>
>("POINT(1 1)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", true);
@@ -67,11 +67,11 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/compile_test.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/compile_test.cpp (original)
+++ sandbox/geometry/libs/geometry/test/compile_test.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -59,7 +59,7 @@
template <typename T, template<typename, typename> class V>
void check_linestring()
{
- typedef bg::model::point_xy<T> P;
+ typedef bg::model::d2::point_xy<T> P;
typedef bg::model::linestring<P, V, std::allocator> line_type;
line_type line;
line.push_back(P(0,0));
@@ -124,7 +124,7 @@
>
void check_polygon()
{
- typedef bg::model::point_xy<T> P;
+ typedef bg::model::d2::point_xy<T> P;
typedef bg::model::polygon<P, VP, VR, true, std::allocator, std::allocator> Y;
Y poly;
poly.outer().push_back(P(0,0));
@@ -159,7 +159,7 @@
bg::centroid(poly, ctr);
// within
- bg::model::point_2d circ_centre(10,10);
+ bg::model::d2::point circ_centre(10,10);
bool w = bg::within(P(1, 1), poly);
//w = bg::within(poly, b); tbd
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/connect.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -203,7 +203,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/midpoints.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -50,8 +50,8 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/offset.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -127,7 +127,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -62,8 +62,8 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/remove_spikes.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -95,7 +95,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
#endif
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/selected.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -80,10 +80,10 @@
int test_main(int, char* [])
{
// Integer not applicable here, just because of the tests using floating point
- // test_all<bg::model::point_xy<int> >();
+ // test_all<bg::model::d2::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/area_ll.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -84,7 +84,7 @@
// Add the city "Alphen" to create a concave case
// Alphen 52 7' 48" N, 4 39' 0" E
LL alphen(
- bg::latitude<T>(bg::dms<bg::north, T>(52, 7, 48)),
+ bg::latitude<T>(bg::dms<bg::north, T>(52, 7, 48)),
bg::longitude<T>(bg::dms<bg::east, T>(4, 39)));
add_to_ring(dutch_prj, alphen, randstad.outer(), randstad_xy.outer());
}
@@ -98,19 +98,19 @@
{
// Gouda 52 1' 12" N, 4 42' 0" E
LL gouda(
- bg::latitude<T>(bg::dms<bg::north, T>(52, 1, 12)),
+ bg::latitude<T>(bg::dms<bg::north, T>(52, 1, 12)),
bg::longitude<T>(bg::dms<bg::east, T>(4, 42)));
// Woerden 52 5' 9" N, 4 53' 0" E
LL woerden(
- bg::latitude<T>(bg::dms<bg::north, T>(52, 5, 9)),
+ bg::latitude<T>(bg::dms<bg::north, T>(52, 5, 9)),
bg::longitude<T>(bg::dms<bg::east, T>(4, 53, 0)));
// Uithoorn 52 13' 48" N, 4 49' 48" E
LL uithoorn(bg::latitude<T>
- (bg::dms<bg::north, T>(52, 13, 48)),
+ (bg::dms<bg::north, T>(52, 13, 48)),
bg::longitude<T>(bg::dms<bg::east, T>(4, 49, 48)));
// Alphen 52 7' 48" N, 4 39' 0" E
LL alphen(bg::latitude<T>(
- bg::dms<bg::north, T>(52, 7, 48)),
+ bg::dms<bg::north, T>(52, 7, 48)),
bg::longitude<T>(bg::dms<bg::east, T>(4, 39)));
randstad.inners().resize(1);
@@ -164,13 +164,13 @@
template <typename T>
void test_latlong(double perc)
{
- test_area_polygon_ll<bg::model::point_xy<T>, bg::model::point_ll<T, bg::cs::geographic<bg::degree> > >(false, false, perc);
+ test_area_polygon_ll<bg::model::d2::point_xy<T>, bg::model::ll::point<bg::degree, T> >(false, false, perc);
// with concavities
- test_area_polygon_ll<bg::model::point_xy<T>, bg::model::point_ll<T, bg::cs::geographic<bg::degree> > >(true, false, perc);
+ test_area_polygon_ll<bg::model::d2::point_xy<T>, bg::model::ll::point<bg::degree, T> >(true, false, perc);
// with holes
- test_area_polygon_ll<bg::model::point_xy<T>, bg::model::point_ll<T, bg::cs::geographic<bg::degree> > >(false, true, perc);
+ test_area_polygon_ll<bg::model::d2::point_xy<T>, bg::model::ll::point<bg::degree, T> >(false, true, perc);
}
int test_main(int, char* [])
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -23,15 +23,15 @@
{
using namespace bg::strategy::distance;
- bg::model::point_ll_deg paris;
+ bg::model::ll::point<bg::degree> paris;
paris.lat(bg::dms<bg::north>(48, 52, 0));
paris.lon(bg::dms<bg::east>(2, 19, 59));
- bg::model::point_ll_deg amsterdam;
+ bg::model::ll::point<bg::degree> amsterdam;
amsterdam.lat(bg::dms<bg::north>(52, 22, 23));
amsterdam.lon(bg::dms<bg::east>(4, 53, 32));
- bg::model::point_ll_rad paris_rad, amsterdam_rad;
+ bg::model::ll::point<bg::radian> paris_rad, amsterdam_rad;
transform(amsterdam, amsterdam_rad);
transform(paris, paris_rad);
@@ -42,31 +42,31 @@
double d4 = 0.001 * distance(paris_rad, amsterdam);
std::cout << "Distances: " << d1 << " == " << d2 << " == " << d3 << " == " << d4 << std::endl;
- double d5 = 0.001 * distance(paris, amsterdam, vincenty<bg::model::point_ll_deg, bg::model::point_ll_deg>());
- double d6 = 0.001 * distance(paris_rad, amsterdam_rad, vincenty<bg::model::point_ll_rad, bg::model::point_ll_rad>());
- double d7 = 0.001 * distance(paris, amsterdam_rad, vincenty<bg::model::point_ll_deg, bg::model::point_ll_rad>());
- double d8 = 0.001 * bg::distance(paris_rad, amsterdam, vincenty<bg::model::point_ll_rad, bg::model::point_ll_deg>());
+ double d5 = 0.001 * distance(paris, amsterdam, vincenty<bg::model::ll::point<bg::degree>, bg::model::ll::point<bg::degree> >());
+ double d6 = 0.001 * distance(paris_rad, amsterdam_rad, vincenty<bg::model::ll::point<bg::radian>, bg::model::ll::point<bg::radian> >());
+ double d7 = 0.001 * distance(paris, amsterdam_rad, vincenty<bg::model::ll::point<bg::degree>, bg::model::ll::point<bg::radian> >());
+ double d8 = 0.001 * bg::distance(paris_rad, amsterdam, vincenty<bg::model::ll::point<bg::radian>, bg::model::ll::point<bg::degree> >());
std::cout << "Distances: " << d5 << " == " << d6 << " == " << d7 << " == " << d8 << std::endl;
- bg::model::point_ll_deg barcelona(
+ bg::model::ll::point<bg::degree> barcelona(
bg::latitude<>(bg::dms<bg::north>(41, 23)),
bg::longitude<>(bg::dms<bg::east>(2, 11))
);
// Now declare a line in latlong and calculate the distance, this MUST reverse...
- bg::model::linestring_ll_deg ab;
+ bg::model::linestring<bg::model::ll::point<bg::degree> > ab;
ab.push_back(amsterdam);
ab.push_back(barcelona);
double d9 = 0.001 * distance(ab, paris);
double d10 = 0.001 * distance(paris, ab);
- double d11 = 0.001 * distance(paris, ab, vincenty<bg::model::point_ll_deg, bg::model::point_ll_deg>());
- double d12 = 0.001 * distance(ab, paris, vincenty<bg::model::point_ll_deg, bg::model::point_ll_deg>());
+ double d11 = 0.001 * distance(paris, ab, vincenty<bg::model::ll::point<bg::degree>, bg::model::ll::point<bg::degree> >());
+ double d12 = 0.001 * distance(ab, paris, vincenty<bg::model::ll::point<bg::degree>, bg::model::ll::point<bg::degree> >());
std::cout << "Distances: " << d9 << " == " << d10 << " == " << d11 << " == " << d12 << std::endl;
// TODO: solve this case, it is reversed -> strategy should be reversed as well
// For this, first implement that linestring can have other coor.sys then point type...
- //double d13 = 0.001 * distance(ab, paris_rad, vincenty<point_ll_deg, point_ll_rad>());
+ //double d13 = 0.001 * distance(ab, paris_rad, vincenty<ll::point<bg::degree>, ll::point<bg::radian> >());
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/distance_mixed.vcproj 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -20,6 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\distance_mixed"
ConfigurationType="1"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -42,6 +43,7 @@
Optimization="0"
AdditionalIncludeDirectories="../../../../../..;../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX"
+ ExceptionHandling="2"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -92,6 +94,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\distance_mixed"
ConfigurationType="1"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/latlong/point_ll.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -31,7 +31,7 @@
BOOST_CHECK_CLOSE(bg::get<1>(p1), type(-12.0433), 0.001);
// Check degree/radian conversion
- bg::model::point_ll<type, bg::cs::geographic<bg::radian> > p2;
+ bg::model::ll::point<bg::radian, type> p2;
bg::transform(p1, p2);
BOOST_CHECK_CLOSE(bg::get<0>(p2), type(-1.3444), 0.001);
@@ -69,8 +69,8 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_ll<float> >();
- test_all<bg::model::point_ll<double> >();
+ test_all<bg::model::ll::point<bg::degree, float> >();
+ test_all<bg::model::ll::point<bg::degree, double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -53,7 +53,7 @@
void test_all()
{
typedef typename bg::coordinate_type<P>::type coord_type;
- typedef bg::model::point_ll<coord_type, bg::cs::geographic<bg::degree> > point_type;
+ typedef bg::model::ll::point<bg::degree, coord_type> point_type;
// aea
test_one<bg::projection::aea_ellipsoid<point_type, P>, point_type, P>
@@ -67,10 +67,10 @@
test_all<float[2]>();
test_all<double[2]>();
test_all<test::test_point>();
- //test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
- test_all<bg::model::point_xy<long double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<long double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projection_epsg.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -58,7 +58,7 @@
void test_deg_rad(double factor)
{
typedef typename bg::coordinate_type<P>::type coord_type;
- typedef bg::model::point_ll<coord_type, bg::cs::geographic<D> > point_type;
+ typedef bg::model::ll::point<D, coord_type> point_type;
test_one<28992, point_type, P>(4.897000 * factor, 52.371000 * factor, 121590.388077, 487013.903377);
test_one<29118, point_type, P>(4.897000 * factor, 52.371000 * factor, 4852882, 9129373);
@@ -77,10 +77,10 @@
test_all<float[2]>();
test_all<double[2]>();
test_all<test::test_point>();
- //test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
- test_all<bg::model::point_xy<long double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<long double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/gis/projections/projections.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -56,7 +56,7 @@
std::string const& parameters)
{
typedef typename bg::coordinate_type<P>::type coord_type;
- typedef bg::model::point_ll<coord_type, bg::cs::geographic<bg::degree> > lonlat_type;
+ typedef bg::model::ll::point<bg::degree, coord_type> lonlat_type;
lonlat_type ll;
ll.lon(lon);
@@ -84,7 +84,7 @@
std::string const& parameters)
{
typedef typename bg::coordinate_type<P>::type coord_type;
- typedef bg::model::point_ll<coord_type, bg::cs::geographic<bg::degree> > lonlat_type;
+ typedef bg::model::ll::point<bg::degree, coord_type> lonlat_type;
P xy;
bg::set<0>(xy, x);
@@ -353,12 +353,12 @@
//test_all<float[2]>();
//test_all<double[2]>();
//test_all<test::test_point>();
- //test_all<bg::model::point_xy<int> >();
- //test_all<bg::model::point_xy<float> >();
- //test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ //test_all<bg::model::d2::point_xy<double> >();
// Leave only one here, because this divides compilation time with 6 or 7
- test_all<bg::model::point_xy<long double> >();
+ test_all<bg::model::d2::point_xy<long double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/index/rtree.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/index/rtree.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/index/rtree.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -23,6 +23,6 @@
// TODO: mloskot - This is ONLY compilation test and
// placeholder to implement real test.
- bg::index::rtree<bg::model::box_2d, std::size_t> si(1, 6);
+ bg::index::rtree<bg::model::d2::box, std::size_t> si(1, 6);
x return 0;
}
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/multi_within.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -22,7 +22,7 @@
int test_main( int , char* [] )
{
- typedef bg::model::point_xy<double> gl_point;
+ typedef bg::model::d2::point_xy<double> gl_point;
typedef bg::circle gl_circle;
typedef bg::model::linear_ring<gl_point> gl_ring;
typedef bg::model::polygon<gl_point> gl_polygon;
Modified: sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/nsphere/within.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -18,7 +18,7 @@
template <typename Geometry>
void test_circle(std::string const& wkt_geometry, bool expected)
{
- bg::model::circle circle;
+ bg::model::d2::circle circle;
bg::assign(circle, 1.0, 1.0, 3.0);
Geometry geometry;
@@ -49,7 +49,7 @@
int test_main( int , char* [] )
{
- test_circles<bg::model::point_xy<double> >();
+ test_circles<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/iterators/box_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/box_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/box_iterator.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -48,7 +48,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/circular_iterator.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -101,7 +101,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/iterators/closing_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/closing_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/closing_iterator.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -106,7 +106,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/ever_circling_iterator.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -84,7 +84,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/iterators/segment_range_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/segment_range_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/segment_range_iterator.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -46,7 +46,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/iterators/segment_returning_iterator.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/iterators/segment_returning_iterator.cpp (original)
+++ sandbox/geometry/libs/geometry/test/iterators/segment_returning_iterator.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -56,7 +56,7 @@
int test_main(int, char* [])
{
// Test std::vector
- typedef std::vector<bg::model::point_2d> points_v;
+ typedef std::vector<bg::model::d2::point> points_v;
test_linestring<points_v>("linestring empty", "");
test_linestring<points_v>("linestring ()", "");
test_linestring<points_v>("linestring (1 1)", "");
@@ -65,7 +65,7 @@
test_linestring<points_v>("linestring (1 1, 2 2, 3 3, 4 4, 5 5, 6 6)", "11222233334444555566");
// Test std::list
- typedef std::list<bg::model::point_2d> points_l;
+ typedef std::list<bg::model::d2::point> points_l;
test_linestring<points_l>("linestring empty", "");
test_linestring<points_l>("linestring ()", "");
test_linestring<points_l>("linestring (1 1)", "");
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_area.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_area.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_area.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -26,7 +26,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_centroid.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_centroid.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_centroid.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -96,11 +96,11 @@
int test_main(int, char* [])
{
- //test_2d<bg::model::point_xy<float> >();
- test_2d<bg::model::point_xy<double> >();
- test_2d<bg::model::point_xy<long int> >(true);
- //test_2d<bg::model::point_xy<long long> >(true);
- test_2d<bg::model::point_xy<long double> >();
+ //test_2d<bg::model::d2::point_xy<float> >();
+ test_2d<bg::model::d2::point_xy<double> >();
+ test_2d<bg::model::d2::point_xy<long int> >(true);
+ //test_2d<bg::model::d2::point_xy<long long> >(true);
+ test_2d<bg::model::d2::point_xy<long double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -46,9 +46,9 @@
int test_main(int, char* [])
{
- //test_all<bg::model::point_xy<int> >();
- //test_all<bg::model::point_xy<float> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ //test_all<bg::model::d2::point_xy<float> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_correct.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -52,7 +52,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_dissolve.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_dissolve.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_dissolve.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -62,7 +62,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_distance.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -129,13 +129,13 @@
int test_main( int , char* [] )
{
test_2d<boost::tuple<float, float> >();
- test_2d<bg::model::point_xy<float> >();
- test_2d<bg::model::point_xy<double> >();
+ test_2d<bg::model::d2::point_xy<float> >();
+ test_2d<bg::model::d2::point_xy<double> >();
test_3d<boost::tuple<float, float, float> >();
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
- test_mixed<bg::model::point_xy<float>, bg::model::point_xy<double> >();
+ test_mixed<bg::model::d2::point_xy<float>, bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_envelope.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_envelope.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_envelope.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -48,8 +48,8 @@
int test_main( int , char* [] )
{
test_2d<boost::tuple<float, float> >();
- test_2d<bg::model::point_xy<float> >();
- test_2d<bg::model::point_xy<double> >();
+ test_2d<bg::model::d2::point_xy<float> >();
+ test_2d<bg::model::d2::point_xy<double> >();
test_3d<boost::tuple<float, float, float> >();
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_equals.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_equals.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_equals.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -45,7 +45,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_for_each.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -72,7 +72,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_intersection.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_intersection.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_intersection.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -159,7 +159,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_length.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_length.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_length.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -25,7 +25,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_perimeter.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -27,7 +27,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_reverse.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_reverse.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_reverse.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -44,8 +44,8 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_simplify.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -46,7 +46,7 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_union.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_union.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_union.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -128,7 +128,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_unique.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_unique.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_unique.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -47,8 +47,8 @@
int test_main( int , char* [] )
{
- test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/multi_within.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -41,11 +41,11 @@
int test_main( int , char* [] )
{
- //test_all<bg::model::point_xy<int> >();
- test_all<bg::model::point_xy<double> >();
+ //test_all<bg::model::d2::point_xy<int> >();
+ test_all<bg::model::d2::point_xy<double> >();
#if defined(HAVE_TTMATH)
- test_all<bg::model::point_xy<ttmath_big> >();
+ test_all<bg::model::d2::point_xy<ttmath_big> >();
#endif
return 0;
Modified: sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp (original)
+++ sandbox/geometry/libs/geometry/test/multi/algorithms/overlay/multi_svg_mapper.hpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -32,7 +32,7 @@
MultiPolygon const& multi_polygon,
TransformStrategy const& strategy)
{
- bg::model::multi_polygon<bg::model::polygon<bg::model::point_xy<int> > > impoly;
+ bg::model::multi_polygon<bg::model::polygon<bg::model::d2::point_xy<int> > > impoly;
bg::transform(multi_polygon, impoly, strategy);
stream << bg::svg(impoly, style, size) << std::endl;
}
Modified: sandbox/geometry/libs/geometry/test/ranges/box_range.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/ranges/box_range.cpp (original)
+++ sandbox/geometry/libs/geometry/test/ranges/box_range.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -64,6 +64,6 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/ranges/segment_range.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/ranges/segment_range.cpp (original)
+++ sandbox/geometry/libs/geometry/test/ranges/segment_range.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -70,6 +70,6 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
return 0;
}
Modified: sandbox/geometry/libs/geometry/test/util/closeable_view.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/closeable_view.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/closeable_view.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -122,7 +122,7 @@
{
test_non_geometry();
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
test_all<bg::model::point<int, 2, bg::cs::cartesian> >();
test_all<boost::tuple<double, double> >();
Modified: sandbox/geometry/libs/geometry/test/util/reversible_closeable.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/reversible_closeable.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/reversible_closeable.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -166,7 +166,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
test_all<bg::model::point<int, 2, bg::cs::cartesian> >();
test_all<boost::tuple<double, double> >();
Modified: sandbox/geometry/libs/geometry/test/util/reversible_view.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/util/reversible_view.cpp (original)
+++ sandbox/geometry/libs/geometry/test/util/reversible_view.cpp 2010-12-02 11:10:47 EST (Thu, 02 Dec 2010)
@@ -69,7 +69,7 @@
int test_main(int, char* [])
{
- test_all<bg::model::point_2d>();
+ test_all<bg::model::d2::point>();
test_all<bg::model::point<int, 2, bg::cs::cartesian> >();
test_all<boost::tuple<double, double> >();
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk