|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78717 - in branches/release: boost/geometry boost/geometry/algorithms boost/geometry/algorithms/detail boost/geometry/arithmetic boost/geometry/core boost/geometry/geometries boost/geometry/io boost/geometry/io/dsv 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/doxy/doxygen_input/groups libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/reference libs/geometry/doc/src libs/geometry/example libs/geometry/test
From: barend.gehrels_at_[hidden]
Date: 2012-05-28 09:04:26
Author: barendgehrels
Date: 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
New Revision: 78717
URL: http://svn.boost.org/trac/boost/changeset/78717
Log:
[geometry] merge since today's r78712
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 (contents, 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 (props changed)
branches/release/libs/geometry/doc/acknowledgments.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 (props changed)
branches/release/libs/geometry/doc/html/ (props changed)
branches/release/libs/geometry/doc/imports.qbk (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 (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/test/ (props changed)
Text files modified:
branches/release/boost/geometry/algorithms/detail/partition.hpp | 12 ++++++------
branches/release/boost/geometry/geometry.hpp | 1 +
branches/release/libs/geometry/doc/doxy/doxygen_input/groups/groups.hpp | 1 +
branches/release/libs/geometry/doc/make_qbk.py | 2 +-
branches/release/libs/geometry/doc/quickref.xml | 1 +
branches/release/libs/geometry/doc/reference.qbk | 4 ++++
branches/release/libs/geometry/doc/release_notes.qbk | 2 ++
7 files changed, 16 insertions(+), 7 deletions(-)
Modified: branches/release/boost/geometry/algorithms/detail/partition.hpp
==============================================================================
--- branches/release/boost/geometry/algorithms/detail/partition.hpp (original)
+++ branches/release/boost/geometry/algorithms/detail/partition.hpp 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -158,7 +158,7 @@
{
if (boost::size(input) > 0)
{
- if (boost::size(input) > min_elements && level < 100)
+ if (std::size_t(boost::size(input)) > min_elements && level < 100)
{
sub_divide::apply(box, collection, input, level + 1,
min_elements, policy, box_policy);
@@ -235,8 +235,8 @@
{
if (boost::size(input1) > 0 && boost::size(input2) > 0)
{
- if (boost::size(input1) > min_elements
- && boost::size(input2) > min_elements
+ if (std::size_t(boost::size(input1)) > min_elements
+ && std::size_t(boost::size(input2)) > min_elements
&& level < 100)
{
sub_divide::apply(box, collection1, input1, collection2,
@@ -339,7 +339,7 @@
VisitBoxPolicy box_visitor = visit_no_policy()
)
{
- if (boost::size(collection) > min_elements)
+ if (std::size_t(boost::size(collection)) > min_elements)
{
index_vector_type index_vector;
Box total;
@@ -381,8 +381,8 @@
VisitBoxPolicy box_visitor = visit_no_policy()
)
{
- if (boost::size(collection1) > min_elements
- && boost::size(collection2) > min_elements)
+ if (std::size_t(boost::size(collection1)) > min_elements
+ && std::size_t(boost::size(collection2)) > min_elements)
{
index_vector_type index_vector1, index_vector2;
Box total;
Modified: branches/release/boost/geometry/geometry.hpp
==============================================================================
--- branches/release/boost/geometry/geometry.hpp (original)
+++ branches/release/boost/geometry/geometry.hpp 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -64,6 +64,7 @@
#include <boost/geometry/algorithms/reverse.hpp>
#include <boost/geometry/algorithms/simplify.hpp>
#include <boost/geometry/algorithms/sym_difference.hpp>
+#include <boost/geometry/algorithms/touches.hpp>
#include <boost/geometry/algorithms/transform.hpp>
#include <boost/geometry/algorithms/union.hpp>
#include <boost/geometry/algorithms/unique.hpp>
Modified: branches/release/libs/geometry/doc/doxy/doxygen_input/groups/groups.hpp
==============================================================================
--- branches/release/libs/geometry/doc/doxy/doxygen_input/groups/groups.hpp (original)
+++ branches/release/libs/geometry/doc/doxy/doxygen_input/groups/groups.hpp 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -58,6 +58,7 @@
\defgroup strategies strategies: strategies
\defgroup svg x Extension svg: Stream SVG (Scalable Vector Graphics)
\defgroup sym_difference sym_difference: sym_difference of two geometries
+\defgroup touches touches: detect if a geometry self-touches or if two geometries touch
\defgroup traits traits: adapt geometries
\defgroup transform transform: apply transformations on geometries
\defgroup union union: calculate new geometry containing geometries A or B
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 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -73,7 +73,7 @@
, "envelope", "equals", "expand", "for_each", "intersection", "intersects"
, "length", "num_geometries", "num_interior_rings", "num_points"
, "overlaps", "perimeter", "reverse", "simplify", "sym_difference"
- , "transform", "union", "unique", "within"]
+ , "touches", "transform", "union", "unique", "within"]
access_functions = ["get", "set", "exterior_ring", "interior_rings"
, "num_points", "num_interior_rings", "num_geometries"]
Modified: branches/release/libs/geometry/doc/quickref.xml
==============================================================================
--- branches/release/libs/geometry/doc/quickref.xml (original)
+++ branches/release/libs/geometry/doc/quickref.xml 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -322,6 +322,7 @@
<member><link linkend="geometry.reference.algorithms.equals">equals</link></member>
<member><link linkend="geometry.reference.algorithms.intersects">intersects</link></member>
<member><link linkend="geometry.reference.algorithms.overlaps">overlaps</link></member>
+ <member><link linkend="geometry.reference.algorithms.touches">touches</link></member>
<member><link linkend="geometry.reference.algorithms.within">within</link></member>
</simplelist>
</entry>
Modified: branches/release/libs/geometry/doc/reference.qbk
==============================================================================
--- branches/release/libs/geometry/doc/reference.qbk (original)
+++ branches/release/libs/geometry/doc/reference.qbk 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -143,6 +143,10 @@
[include generated/sym_difference.qbk]
[/endsect]
+[section:touches touches]
+[include generated/touches.qbk]
+[endsect]
+
[section:transform transform]
[include generated/transform.qbk]
[endsect]
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 2012-05-28 09:04:24 EDT (Mon, 28 May 2012)
@@ -19,6 +19,7 @@
[*Breaking changes]
[*Bugfixes]
+
* the return type of comparable projected point strategy for integer points was wrong (integer), fixed
* several robustness issues in intersection of segments and polygons, fixed
* invalid intersection output is filtered out
@@ -33,6 +34,7 @@
* [@https://svn.boost.org/trac/boost/ticket/6696 6696] invalid intersection output, was (by chance) already fixed in Trunk before reported
[*Additional functionality]
+
* added algorithm "touches" (OGC SF compliant) for *polygon/*polygon
[*Documentation]
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