[Boost-commit] svn:boost r71818 - in branches/release/boost/geometry: . algorithms arithmetic core domains geometries geometries/register iterators multi multi/iterators policies ranges strategies util views

Subject: [Boost-commit] svn:boost r71818 - in branches/release/boost/geometry: . algorithms arithmetic core domains geometries geometries/register iterators multi multi/iterators policies ranges strategies util views
From: barend.gehrels_at_[hidden]
Date: 2011-05-08 08:45:22

Author: barendgehrels
Date: 2011-05-08 08:45:21 EDT (Sun, 08 May 2011)
New Revision: 71818
URL: http://svn.boost.org/trac/boost/changeset/71818

Log:
Merged small change (71816,71817), updated ring.hpp/linestring.hpp manually
Merged geometry.hpp from 71710 to 71817 (was not done in previous steps)
Removed ranges manually as it was not in source anymore and could not be merged
Removed:
   branches/release/boost/geometry/multi/iterators/
   branches/release/boost/geometry/ranges/
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/domains/   (props changed)
   branches/release/boost/geometry/geometries/   (props changed)
   branches/release/boost/geometry/geometry.hpp   (contents, 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)
Text files modified: 
   branches/release/boost/geometry/geometries/register/linestring.hpp |    30 ++++++++++++++++++++++++++++++          
   branches/release/boost/geometry/geometries/register/ring.hpp       |    29 ++++++++++++++++++++++++++++-           
   branches/release/boost/geometry/geometry.hpp                       |     9 +++++----                               
   3 files changed, 63 insertions(+), 5 deletions(-)

Modified: branches/release/boost/geometry/geometries/register/linestring.hpp
==============================================================================
--- branches/release/boost/geometry/geometries/register/linestring.hpp	(original)
+++ branches/release/boost/geometry/geometries/register/linestring.hpp	2011-05-08 08:45:21 EDT (Sun, 08 May 2011)
@@ -19,12 +19,42 @@
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
 
+/*!
+\brief \brief_macro{linestring}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_LINESTRING, linestring} The 
+    linestring may contain template parameters, which must be specified then.
+\param Linestring \param_macro_type{linestring}
 
+\qbk{
+[heading Example]
+[register_linestring]
+[register_linestring_output]
+}
+*/
 #define BOOST_GEOMETRY_REGISTER_LINESTRING(Linestring) \
 namespace boost { namespace geometry { namespace traits {  \
     template<> struct tag<Linestring> { typedef linestring_tag type; }; \
 }}}
 
 
+/*!
+\brief \brief_macro{templated linestring}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED, templated linestring} 
+    \details_macro_templated{linestring, point}
+\param Linestring \param_macro_type{linestring (without template parameters)}
+
+\qbk{
+[heading Example]
+[register_linestring_templated]
+[register_linestring_templated_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(Linestring) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<typename P> struct tag< Linestring<P> > { typedef linestring_tag type; }; \
+}}}
+
 
 #endif // BOOST_GEOMETRY_GEOMETRIES_REGISTER_LINESTRING_HPP

Modified: branches/release/boost/geometry/geometries/register/ring.hpp
==============================================================================
--- branches/release/boost/geometry/geometries/register/ring.hpp	(original)
+++ branches/release/boost/geometry/geometries/register/ring.hpp	2011-05-08 08:45:21 EDT (Sun, 08 May 2011)
@@ -15,16 +15,43 @@
 #ifndef BOOST_GEOMETRY_GEOMETRIES_REGISTER_RING_HPP
 #define BOOST_GEOMETRY_GEOMETRIES_REGISTER_RING_HPP
 
+
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
 
+/*!
+\brief \brief_macro{ring}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_RING, ring} The 
+    ring may contain template parameters, which must be specified then.
+\param Ring \param_macro_type{ring}
+
+\qbk{
+[heading Example]
+[register_ring]
+[register_ring_output]
+}
+*/
 #define BOOST_GEOMETRY_REGISTER_RING(Ring) \
 namespace boost { namespace geometry { namespace traits {  \
     template<> struct tag<Ring> { typedef ring_tag type; }; \
 }}}
 
 
-#define BOOST_GEOMETRY_REGISTER_RING_TEMPLATIZED(Ring) \
+/*!
+\brief \brief_macro{templated ring}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_RING_TEMPLATED, templated ring} 
+    \details_macro_templated{ring, point}
+\param Ring \param_macro_type{ring (without template parameters)}
+
+\qbk{
+[heading Example]
+[register_ring_templated]
+[register_ring_templated_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(Ring) \
 namespace boost { namespace geometry { namespace traits {  \
     template<typename P> struct tag< Ring<P> > { typedef ring_tag type; }; \
 }}}

Modified: branches/release/boost/geometry/geometry.hpp
==============================================================================
--- branches/release/boost/geometry/geometry.hpp	(original)
+++ branches/release/boost/geometry/geometry.hpp	2011-05-08 08:45:21 EDT (Sun, 08 May 2011)
@@ -55,6 +55,7 @@
 #include <boost/geometry/algorithms/num_geometries.hpp>
 #include <boost/geometry/algorithms/num_interior_rings.hpp>
 #include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/algorithms/overlaps.hpp>
 #include <boost/geometry/algorithms/perimeter.hpp>
 #include <boost/geometry/algorithms/reverse.hpp>
 #include <boost/geometry/algorithms/simplify.hpp>
@@ -72,13 +73,10 @@
 #include <boost/geometry/geometries/segment.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-
 // Include multi a.o. because it can give weird effects
-// if you don't (e.g. area=0 of a filled multipolygon)
+// if you don't (e.g. area=0 of a multipolygon)
 #include <boost/geometry/multi/multi.hpp>
 
-
-
 // check includes all concepts
 #include <boost/geometry/geometries/concepts/check.hpp>
 
@@ -88,6 +86,9 @@
 #include <boost/geometry/util/select_coordinate_type.hpp>
 #include <boost/geometry/util/write_dsv.hpp>
 
+#include <boost/geometry/views/box_view.hpp>
+#include <boost/geometry/views/segment_view.hpp>
+
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>