|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r84395 - in branches/release: boost/geometry boost/geometry/algorithms boost/geometry/arithmetic boost/geometry/core boost/geometry/geometries boost/geometry/index boost/geometry/index/detail boost/geometry/index/detail/algorithms boost/geometry/io boost/geometry/io/dsv boost/geometry/io/svg boost/geometry/iterators boost/geometry/multi boost/geometry/policies boost/geometry/strategies boost/geometry/util boost/geometry/views libs/geometry/doc libs/geometry/doc/concept libs/geometry/doc/doxy libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/html/img/io libs/geometry/doc/index libs/geometry/doc/index/rtree libs/geometry/doc/reference libs/geometry/doc/reference/io libs/geometry/doc/src libs/geometry/doc/src/examples/io libs/geometry/example libs/geometry/index libs/geometry/index/example libs/geometry/index/test libs/geometry/index/test/algorithms libs/geometry/test
From: barend.gehrels_at_[hidden]
Date: 2013-05-20 16:31:48
Author: barendgehrels
Date: 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
New Revision: 84395
URL: http://svn.boost.org/trac/boost/changeset/84395
Log:
[geometry] merged up to 84394 into Release branch
Added:
branches/release/libs/geometry/doc/example_adapting_a_legacy_geometry_object_model.qbk
- copied unchanged from r84394, /trunk/libs/geometry/doc/example_adapting_a_legacy_geometry_object_model.qbk
branches/release/libs/geometry/doc/html/img/io/
- copied from r84394, /trunk/libs/geometry/doc/html/img/io/
branches/release/libs/geometry/doc/html/img/io/svg_mapper.png
- copied unchanged from r84394, /trunk/libs/geometry/doc/html/img/io/svg_mapper.png
branches/release/libs/geometry/doc/reference/io/
- copied from r84394, /trunk/libs/geometry/doc/reference/io/
branches/release/libs/geometry/doc/reference/io/svg.qbk
- copied unchanged from r84394, /trunk/libs/geometry/doc/reference/io/svg.qbk
branches/release/libs/geometry/doc/src/examples/io/
- copied from r84394, /trunk/libs/geometry/doc/src/examples/io/
branches/release/libs/geometry/doc/src/examples/io/svg.cpp
- copied unchanged from r84394, /trunk/libs/geometry/doc/src/examples/io/svg.cpp
Properties modified:
branches/release/boost/geometry/algorithms/ (props changed)
branches/release/boost/geometry/arithmetic/ (props changed)
branches/release/boost/geometry/core/ (props changed)
branches/release/boost/geometry/geometries/ (props changed)
branches/release/boost/geometry/geometry.hpp (props changed)
branches/release/boost/geometry/index/ (props changed)
branches/release/boost/geometry/io/ (props changed)
branches/release/boost/geometry/io/dsv/ (props changed)
branches/release/boost/geometry/iterators/ (props changed)
branches/release/boost/geometry/multi/ (props changed)
branches/release/boost/geometry/policies/ (props changed)
branches/release/boost/geometry/strategies/ (props changed)
branches/release/boost/geometry/util/ (props changed)
branches/release/boost/geometry/views/ (props changed)
branches/release/libs/geometry/doc/ (props changed)
branches/release/libs/geometry/doc/Jamfile.v2 (props changed)
branches/release/libs/geometry/doc/about_documentation.qbk (contents, props changed)
branches/release/libs/geometry/doc/acknowledgments.qbk (props changed)
branches/release/libs/geometry/doc/compiling.qbk (props changed)
branches/release/libs/geometry/doc/concept/ (props changed)
branches/release/libs/geometry/doc/copyright_note_policy.txt (props changed)
branches/release/libs/geometry/doc/design_rationale.qbk (props changed)
branches/release/libs/geometry/doc/doxy/ (props changed)
branches/release/libs/geometry/doc/generated/ (props changed)
branches/release/libs/geometry/doc/geometry.qbk (contents, props changed)
branches/release/libs/geometry/doc/html/ (props changed)
branches/release/libs/geometry/doc/imports.qbk (contents, props changed)
branches/release/libs/geometry/doc/index/ (props changed)
branches/release/libs/geometry/doc/introduction.qbk (props changed)
branches/release/libs/geometry/doc/make_qbk.py (contents, props changed)
branches/release/libs/geometry/doc/matrix.qbk (contents, props changed)
branches/release/libs/geometry/doc/quickref.xml (contents, props changed)
branches/release/libs/geometry/doc/quickstart.qbk (props changed)
branches/release/libs/geometry/doc/readme.txt (props changed)
branches/release/libs/geometry/doc/reference/ (props changed)
branches/release/libs/geometry/doc/reference.qbk (contents, props changed)
branches/release/libs/geometry/doc/release_notes.qbk (contents, props changed)
branches/release/libs/geometry/doc/src/ (props changed)
branches/release/libs/geometry/example/ (props changed)
branches/release/libs/geometry/index/ (props changed)
branches/release/libs/geometry/index/example/ (props changed)
branches/release/libs/geometry/index/test/ (props changed)
branches/release/libs/geometry/test/ (props changed)
Text files modified:
branches/release/boost/geometry/index/detail/algorithms/path_intersection.hpp | 50 ++++++++++++++------
branches/release/boost/geometry/index/detail/distance_predicates.hpp | 12 ++--
branches/release/boost/geometry/index/detail/predicates.hpp | 8 +-
branches/release/boost/geometry/index/predicates.hpp | 18 +++---
branches/release/boost/geometry/io/svg/svg_mapper.hpp | 53 ++++++++++++++++++++-
branches/release/boost/geometry/io/svg/write_svg.hpp | 13 +++-
branches/release/libs/geometry/doc/about_documentation.qbk | 2
branches/release/libs/geometry/doc/doxy/Doxyfile | 2
branches/release/libs/geometry/doc/geometry.qbk | 12 +++-
branches/release/libs/geometry/doc/html/index.html | 33 ++++++++-----
branches/release/libs/geometry/doc/imports.qbk | 2
branches/release/libs/geometry/doc/index/index.qbk | 9 ++
branches/release/libs/geometry/doc/index/introduction.qbk | 66 ++++++++++++++++++++++++++-
branches/release/libs/geometry/doc/index/rtree/creation.qbk | 36 +++++----------
branches/release/libs/geometry/doc/index/rtree/experimental.qbk | 7 +-
branches/release/libs/geometry/doc/index/rtree/query.qbk | 28 +++--------
branches/release/libs/geometry/doc/make_qbk.py | 5 +
branches/release/libs/geometry/doc/matrix.qbk | 2
branches/release/libs/geometry/doc/quickref.xml | 94 ++++++++++++++++++++--------------------
branches/release/libs/geometry/doc/reference.qbk | 17 +++++-
branches/release/libs/geometry/doc/release_notes.qbk | 13 +++++
branches/release/libs/geometry/index/example/benchmark_experimental.cpp | 22 ++++++++
branches/release/libs/geometry/index/test/algorithms/path_intersection.cpp | 26 ++++++++--
23 files changed, 357 insertions(+), 173 deletions(-)
Modified: branches/release/boost/geometry/index/detail/algorithms/path_intersection.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/algorithms/path_intersection.hpp (original)
+++ branches/release/boost/geometry/index/detail/algorithms/path_intersection.hpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -17,24 +17,33 @@
namespace dispatch {
-template <typename Indexable, typename LineString, typename Tag>
+template <typename Indexable, typename Geometry, typename IndexableTag, typename GeometryTag>
struct path_intersection
{
- BOOST_MPL_ASSERT_MSG((false), NOT_IMPLEMENTED_FOR_THIS_GEOMETRY, (path_intersection));
+ BOOST_MPL_ASSERT_MSG((false), NOT_IMPLEMENTED_FOR_THIS_GEOMETRY_OR_INDEXABLE, (path_intersection));
};
-template <typename Indexable, typename Linestring>
-struct path_intersection<Indexable, Linestring, point_tag>
+template <typename Indexable, typename Segment>
+struct path_intersection<Indexable, Segment, box_tag, segment_tag>
{
- BOOST_MPL_ASSERT_MSG((false), SEGMENT_POINT_INTERSECTION_UNAVAILABLE, (path_intersection));
+ typedef typename default_distance_result<typename ::boost::geometry::traits::point_type<Segment>::type>::type comparable_distance_type;
+
+ static inline bool apply(Indexable const& b, Segment const& segment, comparable_distance_type & comparable_distance)
+ {
+ typedef typename ::boost::geometry::traits::point_type<Segment>::type point_type;
+ point_type p1, p2;
+ geometry::detail::assign_point_from_index<0>(segment, p1);
+ geometry::detail::assign_point_from_index<1>(segment, p2);
+ return index::detail::segment_intersection(b, p1, p2, comparable_distance);
+ }
};
template <typename Indexable, typename Linestring>
-struct path_intersection<Indexable, Linestring, box_tag>
+struct path_intersection<Indexable, Linestring, box_tag, linestring_tag>
{
- typedef typename default_length_result<Linestring>::type length_type;
+ typedef typename default_length_result<Linestring>::type comparable_distance_type;
- static inline bool apply(Indexable const& b, Linestring const& path, length_type & comparable_distance)
+ static inline bool apply(Indexable const& b, Linestring const& path, comparable_distance_type & comparable_distance)
{
typedef typename ::boost::range_value<Linestring>::type point_type;
typedef typename ::boost::range_const_iterator<Linestring>::type const_iterator;
@@ -59,7 +68,7 @@
typename default_distance_result<point_type, point_type>::type
dist = geometry::distance(*it0, *it1);
- length_type rel_dist;
+ comparable_distance_type rel_dist;
if ( index::detail::segment_intersection(b, *it0, *it1, rel_dist) )
{
comparable_distance += dist * rel_dist;
@@ -76,19 +85,28 @@
} // namespace dispatch
-// TODO - change the name e.g. to path_intersection_distance
-// and segment_intersection e.g. to segment_intersection_relative_distance
+template <typename Indexable, typename SegmentOrLinestring>
+struct default_path_intersection_distance_type
+{
+ typedef typename dispatch::path_intersection<
+ Indexable, SegmentOrLinestring,
+ typename detail::traits::tag<Indexable>::type,
+ typename detail::traits::tag<SegmentOrLinestring>::type
+ >::comparable_distance_type type;
+};
-template <typename Indexable, typename Linestring> inline
+template <typename Indexable, typename SegmentOrLinestring> inline
bool path_intersection(Indexable const& b,
- Linestring const& path,
- typename default_length_result<Linestring>::type & distance)
+ SegmentOrLinestring const& path,
+ typename default_path_intersection_distance_type<Indexable, SegmentOrLinestring>::type & comparable_distance)
{
// TODO check Indexable and Linestring concepts
return dispatch::path_intersection<
- Indexable, Linestring, typename detail::traits::tag<Indexable>::type
- >::apply(b, path, distance);
+ Indexable, SegmentOrLinestring,
+ typename detail::traits::tag<Indexable>::type,
+ typename detail::traits::tag<SegmentOrLinestring>::type
+ >::apply(b, path, comparable_distance);
}
}}}} // namespace boost::geometry::index::detail
Modified: branches/release/boost/geometry/index/detail/distance_predicates.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/distance_predicates.hpp (original)
+++ branches/release/boost/geometry/index/detail/distance_predicates.hpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -143,14 +143,16 @@
}
};
-template <typename Linestring, typename Indexable, typename Tag>
-struct calculate_distance< path<Linestring>, Indexable, Tag>
+template <typename SegmentOrLinestring, typename Indexable, typename Tag>
+struct calculate_distance< path<SegmentOrLinestring>, Indexable, Tag>
{
- typedef typename geometry::default_length_result<Linestring>::type result_type;
+ typedef typename index::detail::default_path_intersection_distance_type<
+ Indexable, SegmentOrLinestring
+ >::type result_type;
- static inline bool apply(path<Linestring> const& p, Indexable const& i, result_type & result)
+ static inline bool apply(path<SegmentOrLinestring> const& p, Indexable const& i, result_type & result)
{
- return index::detail::path_intersection(i, p.linestring, result);
+ return index::detail::path_intersection(i, p.geometry, result);
}
};
Modified: branches/release/boost/geometry/index/detail/predicates.hpp
==============================================================================
--- branches/release/boost/geometry/index/detail/predicates.hpp (original)
+++ branches/release/boost/geometry/index/detail/predicates.hpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -151,14 +151,14 @@
unsigned count;
};
-template <typename Linestring>
+template <typename SegmentOrLinestring>
struct path
{
- path(Linestring const& ls, unsigned k)
- : linestring(ls)
+ path(SegmentOrLinestring const& g, unsigned k)
+ : geometry(g)
, count(k)
{}
- Linestring linestring;
+ SegmentOrLinestring geometry;
unsigned count;
};
Modified: branches/release/boost/geometry/index/predicates.hpp
==============================================================================
--- branches/release/boost/geometry/index/predicates.hpp (original)
+++ branches/release/boost/geometry/index/predicates.hpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -240,14 +240,14 @@
/*!
\brief Generate path() predicate.
-When path predicate is passed to the query, the returned values are k values on the path closest to
-its begin. \c path() predicate takes a \c Linestring defining the path and the maximum
+When path predicate is passed to the query, the returned values are k values along the path closest to
+its begin. \c path() predicate takes a \c Segment or a \c Linestring defining the path and the maximum
number of \c Values that should be returned.
\par Example
\verbatim
-bgi::query(spatial_index, bgi::path(pt, 5), std::back_inserter(result));
-bgi::query(spatial_index, bgi::path(pt, 5) && bgi::intersects(box), std::back_inserter(result));
+bgi::query(spatial_index, bgi::path(segment, 5), std::back_inserter(result));
+bgi::query(spatial_index, bgi::path(linestring, 5) && bgi::intersects(box), std::back_inserter(result));
\endverbatim
\warning
@@ -255,14 +255,14 @@
\ingroup predicates
-\param point The point from which distance is calculated.
+\param linestring The path along which distance is calculated.
\param k The maximum number of values to return.
*/
-template <typename Linestring> inline
-detail::path<Linestring>
-path(Linestring const& linestring, unsigned k)
+template <typename SegmentOrLinestring> inline
+detail::path<SegmentOrLinestring>
+path(SegmentOrLinestring const& linestring, unsigned k)
{
- return detail::path<Linestring>(linestring, k);
+ return detail::path<SegmentOrLinestring>(linestring, k);
}
#endif // BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
Modified: branches/release/boost/geometry/io/svg/svg_mapper.hpp
==============================================================================
--- branches/release/boost/geometry/io/svg/svg_mapper.hpp (original)
+++ branches/release/boost/geometry/io/svg/svg_mapper.hpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -214,6 +214,15 @@
}
+/*!
+\brief Helper class to create SVG maps
+\tparam Point Point type, for input geometries.
+\tparam SameScale Boolean flag indicating if horizontal and vertical scale should
+ be the same. The default value is true
+\ingroup svg
+
+\qbk{[include reference/io/svg.qbk]}
+*/
template <typename Point, bool SameScale = true>
class svg_mapper : boost::noncopyable
{
@@ -252,21 +261,39 @@
}
public :
- svg_mapper(std::ostream& s, int w, int h
+
+ /*!
+ \brief Constructor, initializing the SVG map. Opens and initializes the SVG.
+ Should be called explicitly.
+ \param stream Output stream, should be a stream already open
+ \param width Width of the SVG map (in SVG pixels)
+ \param height Height of the SVG map (in SVG pixels)
+ \param width_height Optional information to increase width and/or height
+ */
+ explicit svg_mapper(std::ostream& stream, int width, int height
, std::string const& width_height = "width=\"100%\" height=\"100%\"")
- : m_stream(s)
- , m_width(w)
- , m_height(h)
+ : m_stream(stream)
+ , m_width(width)
+ , m_height(height)
, m_width_height(width_height)
{
assign_inverse(m_bounding_box);
}
+ /*!
+ \brief Destructor, called automatically. Closes the SVG by streaming <\/svg>
+ */
virtual ~svg_mapper()
{
m_stream << "</svg>" << std::endl;
}
+ /*!
+ \brief Adds a geometry to the transformation matrix. After doing this,
+ the specified geometry can be mapped fully into the SVG map
+ \tparam Geometry \tparam_geometry
+ \param geometry \param_geometry
+ */
template <typename Geometry>
void add(Geometry const& geometry)
{
@@ -280,6 +307,14 @@
}
}
+ /*!
+ \brief Maps a geometry into the SVG map using the specified style
+ \tparam Geometry \tparam_geometry
+ \param geometry \param_geometry
+ \param style String containing verbatim SVG style information
+ \param size Optional size (used for SVG points) in SVG pixels. For linestrings,
+ specify linewidth in the SVG style information
+ */
template <typename Geometry>
void map(Geometry const& geometry, std::string const& style,
int size = -1)
@@ -300,6 +335,16 @@
svg_map(m_stream, style, size, geometry, *m_matrix);
}
+ /*!
+ \brief Adds a text to the SVG map
+ \tparam TextPoint \tparam_point
+ \param point Location of the text (in map units)
+ \param s The text itself
+ \param style String containing verbatim SVG style information, of the text
+ \param offset_x Offset in SVG pixels, defaults to 0
+ \param offset_y Offset in SVG pixels, defaults to 0
+ \param lineheight Line height in SVG pixels, in case the text contains \n
+ */
template <typename TextPoint>
void text(TextPoint const& point, std::string const& s,
std::string const& style,
Modified: branches/release/boost/geometry/io/svg/write_svg.hpp
==============================================================================
--- branches/release/boost/geometry/io/svg/write_svg.hpp (original)
+++ branches/release/boost/geometry/io/svg/write_svg.hpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -224,7 +224,7 @@
/*!
\brief Generic geometry template manipulator class, takes corresponding output class from traits class
\ingroup svg
-\details Stream manipulator, streams geometry classes as Virtual Earth shape
+\details Stream manipulator, streams geometry classes as SVG (Scalable Vector Graphics)
*/
template <typename G>
class svg_manipulator
@@ -256,15 +256,20 @@
};
/*!
-\brief Main svg function to stream geometries as SVG
+\brief Manipulator to stream geometries as SVG
+\tparam Geometry \tparam_geometry
+\param geometry \param_geometry
+\param style String containing verbatim SVG style information
+\param size Optional size (used for SVG points) in SVG pixels. For linestrings,
+ specify linewidth in the SVG style information
\ingroup svg
*/
template <typename Geometry>
-inline svg_manipulator<Geometry> svg(Geometry const& t, std::string const& style, int size = -1)
+inline svg_manipulator<Geometry> svg(Geometry const& geometry, std::string const& style, int size = -1)
{
concept::check<Geometry const>();
- return svg_manipulator<Geometry>(t, style, size);
+ return svg_manipulator<Geometry>(geometry, style, size);
}
}} // namespace boost::geometry
Modified: branches/release/libs/geometry/doc/about_documentation.qbk
==============================================================================
--- branches/release/libs/geometry/doc/about_documentation.qbk (original)
+++ branches/release/libs/geometry/doc/about_documentation.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -10,7 +10,7 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================/]
-[section:aboutdoc About this documentation]
+[section:aboutdoc About this Documentation]
Within the Boost community there are several styles of documenting. Most libraries nowadays are using QuickBook, the WikiWiki style documentation.
Modified: branches/release/libs/geometry/doc/doxy/Doxyfile
==============================================================================
--- branches/release/libs/geometry/doc/doxy/Doxyfile (original)
+++ branches/release/libs/geometry/doc/doxy/Doxyfile 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -184,6 +184,8 @@
../../../../boost/geometry/geometries/adapted \
../../../../boost/geometry/geometries/register \
../../../../boost/geometry/iterators \
+ ../../../../boost/geometry/io/wkt \
+ ../../../../boost/geometry/io/svg \
../../../../boost/geometry/multi/algorithms \
../../../../boost/geometry/multi/algorithms/detail \
../../../../boost/geometry/multi/core \
Modified: branches/release/libs/geometry/doc/geometry.qbk
==============================================================================
--- branches/release/libs/geometry/doc/geometry.qbk (original)
+++ branches/release/libs/geometry/doc/geometry.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -115,15 +115,17 @@
[include imports.qbk]
[include introduction.qbk]
-[include quickstart.qbk]
+[include compiling.qbk]
[include design_rationale.qbk]
-[include compiling.qbk]
+[include quickstart.qbk]
-[section Spatial indexes]
+[section Spatial Indexes]
[include index/index.qbk]
[endsect]
+[include reference.qbk]
+
[section Indexes]
[include matrix.qbk]
[section Alphabetical Index]
@@ -131,7 +133,9 @@
[endsect]
[endsect]
-[include reference.qbk]
+[section Examples]
+[include example_adapting_a_legacy_geometry_object_model.qbk]
+[endsect]
[include release_notes.qbk]
Modified: branches/release/libs/geometry/doc/html/index.html
==============================================================================
--- branches/release/libs/geometry/doc/html/index.html (original)
+++ branches/release/libs/geometry/doc/html/index.html 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Chapter 1. Geometry</title>
<link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="index.html" title="Chapter 1. Geometry">
<link rel="next" href="geometry/introduction.html" title="Introduction">
</head>
@@ -46,15 +46,17 @@
<p><b>Table of Contents</b></p>
<dl>
<dt><span class="section">Introduction</span></dt>
-<dt><span class="section">Quick Start</span></dt>
-<dt><span class="section">Design Rationale</span></dt>
<dt><span class="section">Compilation</span></dt>
-<dt><span class="section">Spatial indexes</span></dt>
-<dd><dl><dt><span class="section">R-tree</span></dt></dl></dd>
-<dt><span class="section">Indexes</span></dt>
+<dt><span class="section">Design Rationale</span></dt>
+<dt><span class="section">Quick Start</span></dt>
+<dt><span class="section">Spatial Indexes</span></dt>
<dd><dl>
-<dt><span class="section">Reference matrix</span></dt>
-<dt><span class="section">Alphabetical Index</span></dt>
+<dt><span class="section">Introduction</span></dt>
+<dt><span class="section">Quick Start</span></dt>
+<dt><span class="section"><a href="geometry/spatial_indexes/creation_and_modification.html">Creation
+ and Modification</a></span></dt>
+<dt><span class="section">Queries</span></dt>
+<dt><span class="section">Examples</span></dt>
</dl></dd>
<dt><span class="section">Reference</span></dt>
<dd><dl>
@@ -70,23 +72,28 @@
<dt><span class="section">Exceptions</span></dt>
<dt><span class="section">Iterators</span></dt>
<dt><span class="section">Models</span></dt>
-<dt><span class="section">Spatial indexes</span></dt>
+<dt><span class="section">Spatial Indexes</span></dt>
<dt><span class="section">Strategies</span></dt>
<dt><span class="section">Views</span></dt>
</dl></dd>
+<dt><span class="section">Indexes</span></dt>
+<dd><dl>
+<dt><span class="section">Reference Matrix</span></dt>
+<dt><span class="section">Alphabetical Index</span></dt>
+</dl></dd>
<dt><span class="section">Release Notes</span></dt>
-<dt><span class="section">About this documentation</span></dt>
+<dt><span class="section">About this Documentation</span></dt>
<dt><span class="section">Acknowledgments</span></dt>
</dl>
</div>
<h3>
<a name="geometry.h0"></a>
- <span><a name="geometry.contributions"></a></span><a class="link" href="index.html#geometry.contributions">Contributions</a>
+ <span class="phrase"><a name="geometry.contributions"></a></span><a class="link" href="index.html#geometry.contributions">Contributions</a>
</h3>
<p>
Boost.Geometry contains contributions by:
</p>
-<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
<li class="listitem">
Akira Takahashi (adaption of Boost.Fusion)
</li>
@@ -102,7 +109,7 @@
</ul></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: May 12, 2013 at 10:55:03 GMT</small></p></td>
+<td align="left"><p><small>Last revised: May 16, 2013 at 10:14:50 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: branches/release/libs/geometry/doc/imports.qbk
==============================================================================
--- branches/release/libs/geometry/doc/imports.qbk (original)
+++ branches/release/libs/geometry/doc/imports.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -104,5 +104,7 @@
[import src/examples/geometries/register/multi_linestring.cpp]
[import src/examples/geometries/register/multi_polygon.cpp]
+[import src/examples/io/svg.cpp]
+
[import src/examples/views/box_view.cpp]
[import src/examples/views/segment_view.cpp]
Modified: branches/release/libs/geometry/doc/index/index.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/index.qbk (original)
+++ branches/release/libs/geometry/doc/index/index.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -33,6 +33,11 @@
[include imports.qbk]
-[/include introduction.qbk/]
+[include introduction.qbk]
-[include rtree.qbk]
+[/include rtree.qbk]
+[include rtree/quickstart.qbk]
+[include rtree/creation.qbk]
+[include rtree/query.qbk]
+[include rtree/examples.qbk]
+[/include rtree/experimental.qbk]
Modified: branches/release/libs/geometry/doc/index/introduction.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/introduction.qbk (original)
+++ branches/release/libs/geometry/doc/index/introduction.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -1,7 +1,7 @@
[/============================================================================
Boost.Geometry Index
- Copyright (c) 2011-2012 Adam Wulkiewicz.
+ Copyright (c) 2011-2013 Adam Wulkiewicz.
Use, modification and distribution is subject to the Boost Software License,
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,10 +10,68 @@
[section Introduction]
-The __boost_geometry_index__ is intetended to gather containers (spatial indexes) which may be used to accelerate spatial searching.
-It is a part of the __boost_geometry__ library. In general, spatial indexes stores geometric objects' representations and
-allows searching for objects occupying some space or close to some point in space.
+The __boost_geometry_index__ is intended to gather data structures called spatial
+indexes which may be used to accelerate searching for objects in space. In general,
+spatial indexes stores geometric objects' representations and allows searching for
+objects occupying some space or close to some point in space.
Currently, only one spatial index is implemented - __rtree__.
+[heading __rtree__]
+
+__rtree__ is a tree data structure used for spatial searching. It was proposed by
+Antonin Guttman in 1984 [footnote Guttman, A. (1984). /R-Trees: A Dynamic Index Structure for Spatial Searching/]
+as an expansion of B-tree for multi-dimensional data. It may be used to store points or volumetric data in order to
+perform a spatial query. This query may for example return objects that are inside some area or are close to some point in space
+[footnote Cheung, K.; Fu, A. (1998). /Enhanced Nearest Neighbour Search on the R-tree/]. It's possible to insert new objects or
+to remove the ones already stored.
+
+The __rtree__ structure is presented on the image below. Each __rtree__'s node store a box descring the space occupied by
+its children nodes. At the bottom of the structure, there are leaf-nodes which contains values
+(geometric objects representations).
+
+[$img/index/rtree/rstar.png]
+
+The __rtree__ is a self-balanced data structure. The key part of balancing algorithm is node splitting algorithm
+[footnote Greene, D. (1989). /An implementation and performance analysis of spatial data access methods/]
+[footnote Beckmann, N.; Kriegel, H. P.; Schneider, R.; Seeger, B. (1990). /The R*-tree: an efficient and robust access method for points and rectangles/].
+Each algorithm produces different splits so the internal structure of a tree may be different for each one of them.
+In general more complex algorithms analyses elements better and produces less overlapping nodes. In the searching process less nodes must be traversed
+in order to find desired obejcts. On the other hand more complex analysis takes more time. In general faster inserting will result in slower searching
+and vice versa. The performance of the R-tree depends on balancing algorithm, parameters and data inserted into the container.
+Example structures of trees created by use of three different algorithms and operations time are presented below. Data used in benchmark was random,
+non-overlapping boxes.
+
+[table
+[[] [linear algorithm] [quadratic algorithm] [R*-tree]]
+[[*Example structure*] [[$img/index/rtree/linear.png]] [[$img/index/rtree/quadratic.png]] [[$img/index/rtree/rstar.png]]]
+[[*1M Values inserts*] [1.65s] [2.51s] [4.96s]]
+[[*100k spatial queries*] [0.87s] [0.25s] [0.09s]]
+[[*100k knn queries*] [3.25s] [1.41s] [0.51s]]
+]
+
+[heading Implementation details]
+
+Key features of this implementation of the __rtree__ are:
+
+* capable to store arbitrary __value__ type,
+* three different creation algorithms - linear, quadratic or rstar,
+* parameters (including maximal and minimal number of elements) may be passed as compile- or run-time parameters,
+* advanced queries - e.g. search for 5 nearest values to some point and intersecting some region but not within the other one,
+* C++11 conformant: move semantics, stateful allocators,
+* capable to store __value__ type with no default constructor.
+
+[heading Dependencies]
+
+R-tree depends on *Boost.Move*, *Boost.Container*, *Boost.Tuple*, *Boost.Utility*, *Boost.MPL*.
+
+[heading Contributors]
+
+The spatial index was originally started by Federico J. Fernandez during the Google Summer of Code 2008 program, mentored by Hartmut Kaiser.
+
+[heading Spatial thanks]
+
+I'd like to thank Barend Gehrels, Bruno Lalande, Mateusz Åoskot, Lucanus J. Simonson for their support and ideas.
+
[endsect]
+
Modified: branches/release/libs/geometry/doc/index/rtree/creation.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/rtree/creation.qbk (original)
+++ branches/release/libs/geometry/doc/index/rtree/creation.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -8,11 +8,11 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================/]
-[section Creation and modification]
+[section Creation and Modification]
-[section Template parameters]
+[h4 Template parameters]
-__rtree__ has 5 parameters:
+__rtree__ has 5 parameters but only 2 are required:
rtree<Value,
Parameters,
@@ -26,9 +26,7 @@
* `EqualTo` - function object comparing `__value__`s,
* `Allocator` - `Value`s allocator, all allocators needed by the container are created from it.
-[endsect]
-
-[section Values and Indexables]
+[h4 Values and Indexables]
__rtree__ may store `__value__`s of any type as long as passed function objects know how to interpret those `__value__`s, that is
extract an `__indexable__` that the __rtree__ can handle and compare `__value__`s.
@@ -63,11 +61,7 @@
* for `tuple<...>` - compares all components of the `__value__`. If the component is a `Geometry`, `geometry::equals()`
function is used. For other types it uses `operator==()`.
-[endsect]
-
-[section Balancing algorithms]
-
-[heading Compile-time]
+[h4 Balancing algorithms compile-time parameters]
`__value__`s may be inserted to the __rtree__ in many various ways. Final internal structure
of the __rtree__ depends on algorithms used in the insertion process and parameters. The most important is
@@ -85,7 +79,7 @@
index::rtree< __value__, index::rstar<16> > rt;
-[heading Run-time]
+[h4 Balancing algorithms run-time parameters]
Balancing algorithm parameters may be passed to the __rtree__ in run-time.
To use run-time versions of the __rtree__ one may pass parameters which
@@ -102,13 +96,11 @@
The obvious drawback is a slightly slower __rtree__.
-[heading Non-default parameters]
+[h4 Non-default parameters]
Non-default R-tree parameters are described in the reference.
-[endsect]
-
-[section Copying, moving and swapping]
+[h4 Copying, moving and swapping]
The __rtree__ is copyable and movable container. Move semantics is implemented using Boost.Move library
so it's possible to move the container on a compilers without rvalue references support.
@@ -131,9 +123,7 @@
// swap
rt3.swap(rt2);
-[endsect]
-
-[section Inserting and removing Values]
+[h4 Inserting and removing Values]
The following code creates an __rtree__ using quadratic balancing algorithm.
@@ -163,7 +153,7 @@
some number of `__value__`s corresponding to geometrical objects (e.g. `Polygons`)
stored in another container.
-[heading Additional interface]
+[h4 Additional interface]
The __rtree__ allows creation, inserting and removing of Values from a range. The range may be passed as
[first, last) Iterators pair or as a Range.
@@ -204,7 +194,7 @@
// remove values with remove(Range)
rt3.remove(values);
-[heading Insert iterator]
+[h4 Insert iterator]
There are functions like `std::copy()`, or __rtree__'s queries that copy values to an output iterator.
In order to insert values to a container in this kind of function insert iterators may be used.
@@ -226,6 +216,4 @@
RTree rt2;
rt1.spatial_query(Box(/*...*/), bgi::inserter(rt2));
-[endsect]
-
-[endsect] [/ Creation and modification /]
+[endsect] [/ Creation and Modification /]
Modified: branches/release/libs/geometry/doc/index/rtree/experimental.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/rtree/experimental.qbk (original)
+++ branches/release/libs/geometry/doc/index/rtree/experimental.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -8,7 +8,7 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================/]
-[section Experimental features]
+[section Experimental Features]
This section describes experimental features which are implemented but unavailable by default.
Be aware that they may not be released in the future or functionalities may be released but
@@ -33,14 +33,15 @@
[heading Path query]
-Path query returns `k` first `__value__`s intersecting a path defined by a `Linestring`. The result of a query returning first 5
+Path query returns `k` first `__value__`s intersecting a path defined by a `Segment` or a`Linestring`. The result of a query returning first 5
values intersecting a path is presented below. Path's flow is denoted by blue arrows, returned values are orange.
[$img/index/rtree/path.png]
-To perform this query one may pass a `path()` predicate taking a `Linestring` and maximum number of `__value__`s which
+To perform this query one may pass a `path()` predicate taking a `Segment` or a `Linestring` and maximum number of `__value__`s which
should be returned:
+ rtree.query(index::path(segment, k), std::back_inserter(returned_values));
rtree.query(index::path(linestring, k), std::back_inserter(returned_values));
[warning Only one distance predicate may be used in a query. This means that there can be only one `nearest()` or `path()` predicate passed. Passing more of them will result in compile-time error.]
Modified: branches/release/libs/geometry/doc/index/rtree/query.qbk
==============================================================================
--- branches/release/libs/geometry/doc/index/rtree/query.qbk (original)
+++ branches/release/libs/geometry/doc/index/rtree/query.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -22,7 +22,7 @@
* are nearest to some point,
* overlapping a box and has user-defined property.
-[section Performing a query]
+[h4 Performing a query]
There are three ways to perform a query presented below. All of them returns `__value__`s intersecting some
region defined as a `__box__`.
@@ -45,9 +45,7 @@
BOOST_FOREACH(__value__ & v, rt | index::adaptors::queried(bgi::intersects(box_region)))
; // do something with v
-[endsect]
-
-[section Spatial predicates]
+[h4 Spatial predicates]
Queries using spatial predicates returns `__value__`s which are related somehow to some Geometry - box, polygon, etc.
Names of spatial predicates correspond to names of __boost_geometry__ algorithms. Examples of some
@@ -77,11 +75,9 @@
// the same as
rt.query(index::disjoint(box), std::back_inserter(result));
-[endsect]
-
-[section Distance predicates]
+[h4 Distance predicates]
-[heading Nearest neighbours queries]
+[h5 Nearest neighbours queries]
Nearest neighbours queries returns `__value__`s which are closest to some point in space.
Additionally it is possible to define how the distance to the `Value` should be calculated.
@@ -89,7 +85,7 @@
[$img/index/rtree/knn.png]
-[heading k nearest neighbours]
+[h5 k nearest neighbours]
There are three ways of performing knn queries. Following queries returns
`k` `__value__`s closest to some point in space. For `__box__`es
@@ -113,9 +109,7 @@
BOOST_FOREACH(__value__ & v, rt | index::adaptors::queried(index::nearest(pt, k)))
; // do something with v
-[endsect]
-
-[section User-defined unary predicate]
+[h4 User-defined unary predicate]
The user may pass a `UnaryPredicate` - function, function object or lambda expression taking const reference to Value and returning bool.
This object may be passed to the query in order to check if `__value__` should be returned by the query. To do it one
@@ -161,9 +155,7 @@
rt.query(index::intersects(box) && !index::satisfies(is_not_red),
std::back_inserter(result));
-[endsect]
-
-[section Passing a set of predicates]
+[h4 Passing a set of predicates]
It's possible to use some number of predicates in one query by connecting them with `operator&&` e.g. `Pred1 && Pred2 && Pred3 && ...`.
@@ -185,9 +177,7 @@
BOOST_FOREACH(Value & v, rt | index::adaptors::queried(index::nearest(pt, k) && index::covered_by(b)))
; // do something with v
-[endsect]
-
-[section Inserting query results into the other R-tree]
+[h4 Inserting query results into the other R-tree]
There are several ways of inserting Values returned by a query to the other R-tree container.
The most basic way is creating a temporary container for Values and insert them later.
@@ -214,6 +204,4 @@
RTree rt4(rt1 | bgi::adaptors::queried(bgi::intersects(Box(/*...*/)))));
-[endsect]
-
[endsect] [/ Queries /]
Modified: branches/release/libs/geometry/doc/make_qbk.py
==============================================================================
--- branches/release/libs/geometry/doc/make_qbk.py (original)
+++ branches/release/libs/geometry/doc/make_qbk.py 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -145,8 +145,11 @@
model_to_quickbook2("d2_1_1point__xy", "point_xy")
group_to_quickbook("arithmetic")
-group_to_quickbook("register")
group_to_quickbook("enum")
+group_to_quickbook("register")
+group_to_quickbook("svg")
+class_to_quickbook("svg_mapper")
+group_to_quickbook("wkt")
os.chdir("index")
execfile("make_qbk.py")
Modified: branches/release/libs/geometry/doc/matrix.qbk
==============================================================================
--- branches/release/libs/geometry/doc/matrix.qbk (original)
+++ branches/release/libs/geometry/doc/matrix.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -10,6 +10,6 @@
http://www.boost.org/LICENSE_1_0.txt)
=============================================================================/]
-[section:matrix Reference matrix]
+[section:matrix Reference Matrix]
[xinclude quickref.xml]
[endsect]
Modified: branches/release/libs/geometry/doc/quickref.xml
==============================================================================
--- branches/release/libs/geometry/doc/quickref.xml (original)
+++ branches/release/libs/geometry/doc/quickref.xml 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -643,69 +643,69 @@
<entry valign="top">
<bridgehead renderas="sect3">R-tree</bridgehead>
<simplelist type="vert" columns="1">
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree">boost::geometry::index::rtree</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree">boost::geometry::index::rtree</link></member>
</simplelist>
<bridgehead renderas="sect3">R-tree parameters</bridgehead>
<simplelist type="vert" columns="1">
- <member><link linkend="geometry.reference.spatial_indexes.rtree.parameters.boost__geometry__index__linear">boost::geometry::index::linear</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.parameters.boost__geometry__index__quadratic">boost::geometry::index::quadratic</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.parameters.boost__geometry__index__rstar">boost::geometry::index::rstar</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.parameters.boost__geometry__index__dynamic_linear">boost::geometry::index::dynamic_linear</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.parameters.boost__geometry__index__dynamic_quadratic">boost::geometry::index::dynamic_quadratic</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.parameters.boost__geometry__index__dynamic_rstar">boost::geometry::index::dynamic_rstar</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.parameters.boost__geometry__index__linear">boost::geometry::index::linear</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.parameters.boost__geometry__index__quadratic">boost::geometry::index::quadratic</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.parameters.boost__geometry__index__rstar">boost::geometry::index::rstar</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.parameters.boost__geometry__index__dynamic_linear">boost::geometry::index::dynamic_linear</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.parameters.boost__geometry__index__dynamic_quadratic">boost::geometry::index::dynamic_quadratic</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.parameters.boost__geometry__index__dynamic_rstar">boost::geometry::index::dynamic_rstar</link></member>
</simplelist>
<bridgehead renderas="sect3">R-tree constructors and destructor</bridgehead>
<simplelist type="vert" columns="1">
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree__">rtree()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_parameters_type_const____indexable_getter_const____value_equal_const____allocator_type_const___">rtree(parameters_type const &, indexable_getter const &, value_equal const &, allocator_type const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_iterator__iterator_">rtree(Iterator, Iterator)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_range_const___">rtree(Range const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_rtree_const___">rtree(rtree const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_rtree_const____allocator_type_const___">rtree(rtree const &, allocator_type const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_rtree____">rtree(rtree &&)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.rtree_rtree_____allocator_type_const___">rtree(rtree &&, allocator_type const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree._rtree__">~rtree()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree__">rtree()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_parameters_type_const____indexable_getter_const____value_equal_const____allocator_type_const___">rtree(parameters_type const &, indexable_getter const &, value_equal const &, allocator_type const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_iterator__iterator_">rtree(Iterator, Iterator)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_range_const___">rtree(Range const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_rtree_const___">rtree(rtree const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_rtree_const____allocator_type_const___">rtree(rtree const &, allocator_type const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_rtree____">rtree(rtree &&)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.rtree_rtree_____allocator_type_const___">rtree(rtree &&, allocator_type const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree._rtree__">~rtree()</link></member>
</simplelist>
</entry>
<entry valign="top">
<bridgehead renderas="sect3">R-tree member functions</bridgehead>
<simplelist type="vert" columns="1">
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.operator__rtree_const___">operator=(const rtree &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.operator__rtree____">operator=(rtree &&)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.swap_rtree___">swap(rtree &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.insert_value_type_const___">insert(value_type const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.insert_iterator__iterator_">insert(Iterator, Iterator)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.insert_range_const___">insert(Range const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.remove_value_type_const___">remove(value_type const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.remove_iterator__iterator_">remove(Iterator, Iterator)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.remove_range_const___">remove(Range const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.query_predicates_const____outiter_">query(Predicates const &, OutIter)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.size__">size()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.empty__">empty()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.clear__">clear()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.bounds__">bounds()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.count_valueorindexable_const___">count(ValueOrIndexable const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.parameters__">parameters()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.indexable_get__">indexable_get()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.value_eq__">value_eq()</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.boost__geometry__index__rtree.get_allocator__">get_allocator()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.operator__rtree_const___">operator=(const rtree &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.operator__rtree____">operator=(rtree &&)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.swap_rtree___">swap(rtree &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.insert_value_type_const___">insert(value_type const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.insert_iterator__iterator_">insert(Iterator, Iterator)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.insert_range_const___">insert(Range const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.remove_value_type_const___">remove(value_type const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.remove_iterator__iterator_">remove(Iterator, Iterator)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.remove_range_const___">remove(Range const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.query_predicates_const____outiter_">query(Predicates const &, OutIter)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.size__">size()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.empty__">empty()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.clear__">clear()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.bounds__">bounds()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.count_valueorindexable_const___">count(ValueOrIndexable const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.parameters__">parameters()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.indexable_get__">indexable_get()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.value_eq__">value_eq()</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.boost__geometry__index__rtree.get_allocator__">get_allocator()</link></member>
</simplelist>
</entry>
<entry valign="top">
<bridgehead renderas="sect3">R-tree free functions (boost::geometry::index::)</bridgehead>
<simplelist type="vert" columns="1">
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.insert_rtree_________value_const___">insert(rtree<...> &, Value const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.insert_rtree_________iterator__iterator_">insert(rtree<...> &, Iterator, Iterator)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.insert_rtree_________range_const___">insert(rtree<...> &, Range const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.remove_rtree_________value_const___">remove(rtree<...> &, Value const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.remove_rtree_________iterator__iterator_">remove(rtree<...> &, Iterator, Iterator)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.remove_rtree_________range_const___">remove(rtree<...> &, Range const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.query_rtree______const____predicates_const____outiter_">query(rtree<...> const &, Predicates const &, OutIter)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.clear_rtree________">clear(rtree<...> &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.size_rtree______const___">size(rtree<...> const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.empty_rtree______const___">empty(rtree<...> const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.bounds_rtree______const___">bounds(rtree<...> const &)</link></member>
- <member><link linkend="geometry.reference.spatial_indexes.rtree.group__rtree__functions.swap_rtree_________rtree________">swap(rtree<...> &, rtree<...> &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.insert_rtree_________value_const___">insert(rtree<...> &, Value const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.insert_rtree_________iterator__iterator_">insert(rtree<...> &, Iterator, Iterator)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.insert_rtree_________range_const___">insert(rtree<...> &, Range const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.remove_rtree_________value_const___">remove(rtree<...> &, Value const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.remove_rtree_________iterator__iterator_">remove(rtree<...> &, Iterator, Iterator)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.remove_rtree_________range_const___">remove(rtree<...> &, Range const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.query_rtree______const____predicates_const____outiter_">query(rtree<...> const &, Predicates const &, OutIter)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.clear_rtree________">clear(rtree<...> &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.size_rtree______const___">size(rtree<...> const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.empty_rtree______const___">empty(rtree<...> const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.bounds_rtree______const___">bounds(rtree<...> const &)</link></member>
+ <member><link linkend="geometry.reference.spatial_indexes.group__rtree__functions.swap_rtree_________rtree________">swap(rtree<...> &, rtree<...> &)</link></member>
</simplelist>
</entry>
</row>
Modified: branches/release/libs/geometry/doc/reference.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference.qbk (original)
+++ branches/release/libs/geometry/doc/reference.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -219,6 +219,17 @@
[endsect]
+[section:io IO (input/output)]
+[section:wkt WKT (Well-Known Text)]
+[/include generated/wkt.qbk/]
+[endsect]
+[section:svg SVG (Scalable Vector Graphics)]
+[include generated/svg.qbk]
+[include generated/svg_mapper.qbk]
+[endsect]
+[endsect]
+
+
[section:iterators Iterators]
[include generated/closing_iterator.qbk]
[include generated/circular_iterator.qbk]
@@ -242,9 +253,9 @@
[endsect]
-[section:spatial_indexes Spatial indexes]
+[section:spatial_indexes Spatial Indexes]
-[section:rtree R-tree]
+[/section:rtree R-tree]
[include index/generated/rtree.qbk]
[include index/generated/rtree_functions.qbk]
[section:parameters R-tree parameters (boost::geometry::index::)]
@@ -255,7 +266,7 @@
[include index/generated/rtree_dynamic_quadratic.qbk]
[include index/generated/rtree_dynamic_rstar.qbk]
[endsect]
-[endsect]
+[/endsect]
[section:observers Observers (boost::geometry::index::)]
[include index/generated/indexable.qbk]
Modified: branches/release/libs/geometry/doc/release_notes.qbk
==============================================================================
--- branches/release/libs/geometry/doc/release_notes.qbk (original)
+++ branches/release/libs/geometry/doc/release_notes.qbk 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -20,9 +20,18 @@
[*Additional functionality]
* added Spatial Index, developed for Boost.Geometry by Adam Wulkiewicz. The spatial index was originally started by Federico J. Fernandez during the Google Summer of Code 2008 program, mentored by Hartmut Kaiser.
+* added SVG-output, this was already in extensions for several years
+
+[*Documentation]
+
+* small fixes of missing words
[*Bugfixes]
+
* collinear opposite segments did sometimes (in circles) have a robustness issue, fixed
+* fixed insertion of false intersection point (found by buffer)
+* applied patch of Vladimir Petrovic for debugging traversals
+
[*Solved tickets]
@@ -34,6 +43,10 @@
* [@https://svn.boost.org/trac/boost/ticket/8403 8403] silenced compiler warning C4127: conditional expression is constant
* [@https://svn.boost.org/trac/boost/ticket/8405 8405] silenced compiler warning C4189: '...' : local variable is initialized but not referenced
+[*Internal changes]
+
+* Made several algorithms variant-aware (append, area, clear, convert, equals, length, num_points)
+
[/=================]
[heading Boost 1.53]
Modified: branches/release/libs/geometry/index/example/benchmark_experimental.cpp
==============================================================================
--- branches/release/libs/geometry/index/example/benchmark_experimental.cpp (original)
+++ branches/release/libs/geometry/index/example/benchmark_experimental.cpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -18,6 +18,7 @@
#include <boost/geometry/index/rtree.hpp>
#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/segment.hpp>
namespace bg = boost::geometry;
namespace bgi = bg::index;
@@ -25,6 +26,7 @@
typedef bg::model::point<double, 2, bg::cs::cartesian> P;
typedef bg::model::box<P> B;
typedef bg::model::linestring<P> LS;
+typedef bg::model::segment<P> S;
template <typename I1, typename I2, typename O>
void mycopy(I1 first, I2 last, O o)
@@ -283,7 +285,7 @@
temp += result.size();
}
dur_t time = clock_t::now() - start;
- std::cout << time << " - query(path(LS, " << path_values_count << ")) " << path_queries_count << " found " << temp << '\n';
+ std::cout << time << " - query(path(LS6, " << path_values_count << ")) " << path_queries_count << " found " << temp << '\n';
}
{
@@ -303,7 +305,23 @@
temp += result.size();
}
dur_t time = clock_t::now() - start;
- std::cout << time << " - query(path(LS, " << path_values_count << ")) " << path_queries_count2 << " found " << temp << '\n';
+ std::cout << time << " - query(path(LS2, " << path_values_count << ")) " << path_queries_count2 << " found " << temp << '\n';
+ }
+
+ {
+ clock_t::time_point start = clock_t::now();
+ size_t temp = 0;
+ for (size_t i = 0 ; i < path_queries_count2 ; ++i )
+ {
+ float x = coords[i].first;
+ float y = coords[i].second;
+ S seg(P(x, y), P(x+max_val/100, y+max_val/100));
+ result.clear();
+ t.query(bgi::path(seg, path_values_count), std::back_inserter(result));
+ temp += result.size();
+ }
+ dur_t time = clock_t::now() - start;
+ std::cout << time << " - query(path(S, " << path_values_count << ")) " << path_queries_count2 << " found " << temp << '\n';
}
#endif
{
Modified: branches/release/libs/geometry/index/test/algorithms/path_intersection.cpp
==============================================================================
--- branches/release/libs/geometry/index/test/algorithms/path_intersection.cpp (original)
+++ branches/release/libs/geometry/index/test/algorithms/path_intersection.cpp 2013-05-20 16:31:45 EDT (Mon, 20 May 2013)
@@ -11,6 +11,12 @@
#include <boost/geometry/index/detail/algorithms/path_intersection.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+
//#include <boost/geometry/io/wkt/read.hpp>
template <typename Box, typename Linestring>
@@ -18,11 +24,24 @@
bool expected_result,
typename bg::default_length_result<Linestring>::type expected_dist)
{
- typename bg::default_length_result<Linestring>::type dist;
+ typename bgi::detail::default_path_intersection_distance_type<Box, Linestring>::type dist;
+
bool value = bgi::detail::path_intersection(box, path, dist);
BOOST_CHECK(value == expected_result);
if ( value && expected_result )
BOOST_CHECK_CLOSE(dist, expected_dist, 0.0001);
+
+ if ( ::boost::size(path) == 2 )
+ {
+ typedef typename ::boost::range_value<Linestring>::type P;
+ typedef bg::model::segment<P> Seg;
+ typename bgi::detail::default_path_intersection_distance_type<Box, Seg>::type dist;
+ Seg seg(*::boost::begin(path), *(::boost::begin(path)+1));
+ bool value = bgi::detail::path_intersection(box, seg, dist);
+ BOOST_CHECK(value == expected_result);
+ if ( value && expected_result )
+ BOOST_CHECK_CLOSE(dist, expected_dist, 0.0001);
+ }
}
template <typename Box, typename Linestring>
@@ -37,11 +56,6 @@
test_path_intersection(box, path, expected_result, expected_dist);
}
-#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-#include <boost/geometry/geometries/linestring.hpp>
-
void test_large_integers()
{
typedef bg::model::point<int, 2, bg::cs::cartesian> int_point_type;
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