[Boost-commit] svn:boost r80130 - trunk/boost/geometry/multi/algorithms

Subject: [Boost-commit] svn:boost r80130 - trunk/boost/geometry/multi/algorithms
From: bruno.lalande_at_[hidden]
Date: 2012-08-21 18:09:37

Author: bruno.lalande
Date: 2012-08-21 18:09:37 EDT (Tue, 21 Aug 2012)
New Revision: 80130
URL: http://svn.boost.org/trac/boost/changeset/80130

Log:
Aligned multi/simplify to latest change.
Text files modified: 
   trunk/boost/geometry/multi/algorithms/simplify.hpp |    45 ++++++++------------------------------- 
   1 files changed, 10 insertions(+), 35 deletions(-)

Modified: trunk/boost/geometry/multi/algorithms/simplify.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/simplify.hpp	(original)
+++ trunk/boost/geometry/multi/algorithms/simplify.hpp	2012-08-21 18:09:37 EDT (Tue, 21 Aug 2012)
@@ -31,9 +31,10 @@
 namespace detail { namespace simplify
 {
 
-template<typename MultiGeometry, typename Strategy, typename Policy>
+template<typename Policy>
 struct simplify_multi
 {
+    template <typename MultiGeometry, typename Strategy>
     static inline void apply(MultiGeometry const& multi, MultiGeometry& out,
                     double max_distance, Strategy const& strategy)
     {
@@ -63,47 +64,21 @@
 namespace dispatch
 {
 
-template <typename MultiPoint, typename Strategy>
-struct simplify<multi_point_tag, MultiPoint, Strategy>
+template <typename MultiPoint>
+struct simplify<MultiPoint, multi_point_tag>
     : detail::simplify::simplify_copy
-        <
-            MultiPoint,
-            Strategy
-        >
-
 {};
 
 
-template <typename MultiLinestring, typename Strategy>
-struct simplify<multi_linestring_tag, MultiLinestring, Strategy>
-    : detail::simplify::simplify_multi
-        <
-            MultiLinestring,
-            Strategy,
-            detail::simplify::simplify_range
-                <
-                    typename boost::range_value<MultiLinestring>::type,
-                    Strategy,
-                    2
-                >
-        >
-
+template <typename MultiLinestring>
+struct simplify<MultiLinestring, multi_linestring_tag>
+    : detail::simplify::simplify_multi<detail::simplify::simplify_range<2> >
 {};
 
 
-template <typename MultiPolygon, typename Strategy>
-struct simplify<multi_polygon_tag, MultiPolygon, Strategy>
-    : detail::simplify::simplify_multi
-        <
-            MultiPolygon,
-            Strategy,
-            detail::simplify::simplify_polygon
-                <
-                    typename boost::range_value<MultiPolygon>::type,
-                    Strategy
-                >
-        >
-
+template <typename MultiPolygon>
+struct simplify<MultiPolygon, multi_polygon_tag>
+    : detail::simplify::simplify_multi<detail::simplify::simplify_polygon>
 {};