|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69916 - in trunk/boost/geometry: algorithms algorithms/detail/overlay algorithms/detail/sections extensions/algorithms/detail/overlay extensions/index/rtree extensions/io/svg
From: barend.gehrels_at_[hidden]
Date: 2011-03-13 07:02:17
Author: barendgehrels
Date: 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
New Revision: 69916
URL: http://svn.boost.org/trac/boost/changeset/69916
Log:
Renamed combine to expand
Added:
trunk/boost/geometry/algorithms/expand.hpp
- copied, changed from r69915, /trunk/boost/geometry/algorithms/combine.hpp
Removed:
trunk/boost/geometry/algorithms/combine.hpp
Text files modified:
trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp | 14 ++++++---
trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp | 6 ++--
trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp | 6 ++--
trunk/boost/geometry/algorithms/envelope.hpp | 16 +++++-----
trunk/boost/geometry/algorithms/expand.hpp | 60 ++++++++++++++++++++--------------------
trunk/boost/geometry/algorithms/make.hpp | 2
trunk/boost/geometry/extensions/algorithms/detail/overlay/dissolver.hpp | 3 +
trunk/boost/geometry/extensions/index/rtree/helpers.hpp | 2
trunk/boost/geometry/extensions/index/rtree/rtree_leaf.hpp | 4 +-
trunk/boost/geometry/extensions/index/rtree/rtree_node.hpp | 8 ++--
trunk/boost/geometry/extensions/io/svg/svg_mapper.hpp | 3 +
11 files changed, 65 insertions(+), 59 deletions(-)
Deleted: trunk/boost/geometry/algorithms/combine.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/combine.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
+++ (empty file)
@@ -1,313 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, 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_ALGORITHMS_COMBINE_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_COMBINE_HPP
-
-
-#include <cstddef>
-
-#include <boost/numeric/conversion/cast.hpp>
-
-#include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-#include <boost/geometry/util/select_coordinate_type.hpp>
-
-#include <boost/geometry/strategies/compare.hpp>
-#include <boost/geometry/policies/compare.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace combine
-{
-
-
-template
-<
- typename Box, typename Point,
- typename StrategyLess, typename StrategyGreater,
- std::size_t Dimension, std::size_t DimensionCount
->
-struct point_loop
-{
- typedef typename strategy::compare::detail::select_strategy
- <
- StrategyLess, 1, Point, Dimension
- >::type less_type;
-
- typedef typename strategy::compare::detail::select_strategy
- <
- StrategyGreater, -1, Point, Dimension
- >::type greater_type;
-
- typedef typename select_coordinate_type<Point, Box>::type coordinate_type;
-
- static inline void apply(Box& box, Point const& source)
- {
- less_type less;
- greater_type greater;
-
- coordinate_type const coord = get<Dimension>(source);
-
- if (less(coord, get<min_corner, Dimension>(box)))
- {
- set<min_corner, Dimension>(box, coord);
- }
-
- if (greater(coord, get<max_corner, Dimension>(box)))
- {
- set<max_corner, Dimension>(box, coord);
- }
-
- point_loop
- <
- Box, Point,
- StrategyLess, StrategyGreater,
- Dimension + 1, DimensionCount
- >::apply(box, source);
- }
-};
-
-
-template
-<
- typename Box, typename Point,
- typename StrategyLess, typename StrategyGreater,
- std::size_t DimensionCount
->
-struct point_loop
- <
- Box, Point,
- StrategyLess, StrategyGreater,
- DimensionCount, DimensionCount
- >
-{
- static inline void apply(Box&, Point const&) {}
-};
-
-
-template
-<
- typename Box, typename Geometry,
- typename StrategyLess, typename StrategyGreater,
- std::size_t Index,
- std::size_t Dimension, std::size_t DimensionCount
->
-struct indexed_loop
-{
- typedef typename strategy::compare::detail::select_strategy
- <
- StrategyLess, 1, Box, Dimension
- >::type less_type;
-
- typedef typename strategy::compare::detail::select_strategy
- <
- StrategyGreater, -1, Box, Dimension
- >::type greater_type;
-
- typedef typename select_coordinate_type
- <
- Box,
- Geometry
- >::type coordinate_type;
-
-
- static inline void apply(Box& box, Geometry const& source)
- {
- less_type less;
- greater_type greater;
-
- coordinate_type const coord = get<Index, Dimension>(source);
-
- if (less(coord, get<min_corner, Dimension>(box)))
- {
- set<min_corner, Dimension>(box, coord);
- }
-
- if (greater(coord, get<max_corner, Dimension>(box)))
- {
- set<max_corner, Dimension>(box, coord);
- }
-
- indexed_loop
- <
- Box, Geometry,
- StrategyLess, StrategyGreater,
- Index, Dimension + 1, DimensionCount
- >::apply(box, source);
- }
-};
-
-
-template
-<
- typename Box, typename Geometry,
- typename StrategyLess, typename StrategyGreater,
- std::size_t Index, std::size_t DimensionCount
->
-struct indexed_loop
- <
- Box, Geometry,
- StrategyLess, StrategyGreater,
- Index, DimensionCount, DimensionCount
- >
-{
- static inline void apply(Box&, Geometry const&) {}
-};
-
-
-
-// Changes a box such that the other box is also contained by the box
-template
-<
- typename Box, typename Geometry,
- typename StrategyLess, typename StrategyGreater
->
-struct combine_indexed
-{
- static inline void apply(Box& box, Geometry const& geometry)
- {
- indexed_loop
- <
- Box, Geometry,
- StrategyLess, StrategyGreater,
- 0, 0, dimension<Geometry>::type::value
- >::apply(box, geometry);
-
- indexed_loop
- <
- Box, Geometry,
- StrategyLess, StrategyGreater,
- 1, 0, dimension<Geometry>::type::value
- >::apply(box, geometry);
- }
-};
-
-}} // namespace detail::combine
-#endif // DOXYGEN_NO_DETAIL
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template
-<
- typename Tag,
- typename BoxOut, typename Geometry,
- typename StrategyLess, typename StrategyGreater
->
-struct combine
-{};
-
-
-// Box + point -> new box containing also point
-template
-<
- typename BoxOut, typename Point,
- typename StrategyLess, typename StrategyGreater
->
-struct combine<point_tag, BoxOut, Point, StrategyLess, StrategyGreater>
- : detail::combine::point_loop
- <
- BoxOut, Point,
- StrategyLess, StrategyGreater,
- 0, dimension<Point>::type::value
- >
-{};
-
-
-// Box + box -> new box containing two input boxes
-template
-<
- typename BoxOut, typename BoxIn,
- typename StrategyLess, typename StrategyGreater
->
-struct combine<box_tag, BoxOut, BoxIn, StrategyLess, StrategyGreater>
- : detail::combine::combine_indexed
- <BoxOut, BoxIn, StrategyLess, StrategyGreater>
-{};
-
-template
-<
- typename Box, typename Segment,
- typename StrategyLess, typename StrategyGreater
->
-struct combine<segment_tag, Box, Segment, StrategyLess, StrategyGreater>
- : detail::combine::combine_indexed
- <Box, Segment, StrategyLess, StrategyGreater>
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-/***
-*!
- \brief Combines a box with another geometry (box, point)
- \ingroup combine
- \tparam Box type of the box
- \tparam Geometry of second geometry, to be combined with the box
- \param box box to combine another geometry with, might be changed
- \param geometry other geometry
- \param strategy_less
- \param strategy_greater
- \note Strategy is currently ignored
- \todo Handle strategy
- *
-template
-<
- typename Box, typename Geometry,
- typename StrategyLess, typename StrategyGreater
->
-inline void combine(Box& box, Geometry const& geometry,
- StrategyLess const& strategy_less,
- StrategyGreater const& strategy_greater)
-{
- concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
-
- dispatch::combine
- <
- typename tag<Geometry>::type,
- Box,
- Geometry,
- StrategyLess, StrategyGreater
- >::apply(box, geometry);
-}
-***/
-
-
-/*!
-\brief Combines a box with another geometry (box, point)
-\ingroup combine
-\tparam Box type of the box
-\tparam Geometry \tparam_geometry
-\param box box to combine another geometry with, might be changed
-\param geometry \param_geometry
- */
-template <typename Box, typename Geometry>
-inline void combine(Box& box, Geometry const& geometry)
-{
- concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
-
- dispatch::combine
- <
- typename tag<Geometry>::type,
- Box, Geometry,
- strategy::compare::default_strategy,
- strategy::compare::default_strategy
- >::apply(box, geometry);
-}
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_COMBINE_HPP
Modified: trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/assign_parents.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -10,6 +10,7 @@
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/algorithms/detail/partition.hpp>
#include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
#include <boost/geometry/algorithms/detail/overlay/within_util.hpp>
@@ -83,7 +84,7 @@
template <typename Box, typename InputItem>
static inline void apply(Box& total, InputItem const& item)
{
- boost::geometry::combine(total, item.envelope);
+ geometry::expand(total, item.envelope);
}
};
@@ -92,7 +93,7 @@
template <typename Box, typename InputItem>
static inline bool apply(Box const& box, InputItem const& item)
{
- return ! boost::geometry::detail::disjoint::disjoint_box_box(box, item.envelope);
+ return ! geometry::detail::disjoint::disjoint_box_box(box, item.envelope);
}
};
@@ -192,7 +193,8 @@
// Copy to vector (with new approach this might be obsolete as well, using the map directly)
vector_type vector(count_total);
- for (map_iterator_type it = boost::begin(ring_map); it != boost::end(ring_map); ++it, ++index)
+ for (map_iterator_type it = boost::begin(ring_map);
+ it != boost::end(ring_map); ++it, ++index)
{
vector[index] = helper(it->first, it->second.get_area());
helper& item = vector[index];
@@ -273,7 +275,8 @@
if (check_for_orientation)
{
- for (map_iterator_type it = boost::begin(ring_map); it != boost::end(ring_map); ++it)
+ for (map_iterator_type it = boost::begin(ring_map);
+ it != boost::end(ring_map); ++it)
{
if (geometry::math::equals(it->second.get_area(), 0))
{
@@ -294,7 +297,8 @@
}
// Assign childlist
- for (map_iterator_type it = boost::begin(ring_map); it != boost::end(ring_map); ++it)
+ for (map_iterator_type it = boost::begin(ring_map);
+ it != boost::end(ring_map); ++it)
{
if (it->second.parent.source_index >= 0)
{
Modified: trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -50,7 +50,7 @@
#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/algorithms/combine.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
@@ -339,7 +339,7 @@
it != sections.end();
++it)
{
- geometry::combine(box, it->bounding_box);
+ geometry::expand(box, it->bounding_box);
}
}
@@ -809,7 +809,7 @@
InterruptPolicy
> : detail::get_turns::get_turns_cs
<
- Ring, Box, ReverseRing, ReverseBox,
+ Ring, Box, ReverseRing, ReverseBox,
Turns, TurnPolicy, InterruptPolicy
>
Modified: trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/sections/sectionalize.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -17,7 +17,7 @@
#include <boost/typeof/typeof.hpp>
#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/combine.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/closure.hpp>
@@ -329,10 +329,10 @@
<
int, 0, DimensionCount
>::apply(direction_classes, section.directions);
- geometry::combine(section.bounding_box, *previous);
+ geometry::expand(section.bounding_box, *previous);
}
- geometry::combine(section.bounding_box, *it);
+ geometry::expand(section.bounding_box, *it);
section.end_index = index + 1;
section.count++;
if (! duplicate)
Modified: trunk/boost/geometry/algorithms/envelope.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/envelope.hpp (original)
+++ trunk/boost/geometry/algorithms/envelope.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -14,8 +14,8 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <boost/geometry/algorithms/combine.hpp>
#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
@@ -31,12 +31,12 @@
/// Calculate envelope of an 2D or 3D segment
template<typename Geometry, typename Box>
-struct envelope_combine_one
+struct envelope_expand_one
{
static inline void apply(Geometry const& geometry, Box& mbr)
{
assign_inverse(mbr);
- geometry::combine(mbr, geometry);
+ geometry::expand(mbr, geometry);
}
};
@@ -51,7 +51,7 @@
it != boost::end(range);
++it)
{
- geometry::combine(mbr, *it);
+ geometry::expand(mbr, *it);
}
}
@@ -87,7 +87,7 @@
typename Geometry, typename Box,
typename StrategyLess, typename StrategyGreater
>
-struct envelope
+struct envelope
{
BOOST_MPL_ASSERT_MSG
(
@@ -108,7 +108,7 @@
Point, Box,
StrategyLess, StrategyGreater
>
- : detail::envelope::envelope_combine_one<Point, Box>
+ : detail::envelope::envelope_expand_one<Point, Box>
{};
@@ -123,7 +123,7 @@
BoxIn, BoxOut,
StrategyLess, StrategyGreater
>
- : detail::envelope::envelope_combine_one<BoxIn, BoxOut>
+ : detail::envelope::envelope_expand_one<BoxIn, BoxOut>
{};
@@ -138,7 +138,7 @@
Segment, Box,
StrategyLess, StrategyGreater
>
- : detail::envelope::envelope_combine_one<Segment, Box>
+ : detail::envelope::envelope_expand_one<Segment, Box>
{};
Copied: trunk/boost/geometry/algorithms/expand.hpp (from r69915, /trunk/boost/geometry/algorithms/combine.hpp)
==============================================================================
--- /trunk/boost/geometry/algorithms/combine.hpp (original)
+++ trunk/boost/geometry/algorithms/expand.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -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_ALGORITHMS_COMBINE_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_COMBINE_HPP
+#ifndef BOOST_GEOMETRY_ALGORITHMS_EXPAND_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_EXPAND_HPP
#include <cstddef>
@@ -27,7 +27,7 @@
{
#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace combine
+namespace detail { namespace expand
{
@@ -172,7 +172,7 @@
typename Box, typename Geometry,
typename StrategyLess, typename StrategyGreater
>
-struct combine_indexed
+struct expand_indexed
{
static inline void apply(Box& box, Geometry const& geometry)
{
@@ -192,7 +192,7 @@
}
};
-}} // namespace detail::combine
+}} // namespace detail::expand
#endif // DOXYGEN_NO_DETAIL
#ifndef DOXYGEN_NO_DISPATCH
@@ -205,7 +205,7 @@
typename BoxOut, typename Geometry,
typename StrategyLess, typename StrategyGreater
>
-struct combine
+struct expand
{};
@@ -215,8 +215,8 @@
typename BoxOut, typename Point,
typename StrategyLess, typename StrategyGreater
>
-struct combine<point_tag, BoxOut, Point, StrategyLess, StrategyGreater>
- : detail::combine::point_loop
+struct expand<point_tag, BoxOut, Point, StrategyLess, StrategyGreater>
+ : detail::expand::point_loop
<
BoxOut, Point,
StrategyLess, StrategyGreater,
@@ -231,8 +231,8 @@
typename BoxOut, typename BoxIn,
typename StrategyLess, typename StrategyGreater
>
-struct combine<box_tag, BoxOut, BoxIn, StrategyLess, StrategyGreater>
- : detail::combine::combine_indexed
+struct expand<box_tag, BoxOut, BoxIn, StrategyLess, StrategyGreater>
+ : detail::expand::expand_indexed
<BoxOut, BoxIn, StrategyLess, StrategyGreater>
{};
@@ -241,8 +241,8 @@
typename Box, typename Segment,
typename StrategyLess, typename StrategyGreater
>
-struct combine<segment_tag, Box, Segment, StrategyLess, StrategyGreater>
- : detail::combine::combine_indexed
+struct expand<segment_tag, Box, Segment, StrategyLess, StrategyGreater>
+ : detail::expand::expand_indexed
<Box, Segment, StrategyLess, StrategyGreater>
{};
@@ -253,29 +253,29 @@
/***
*!
- \brief Combines a box with another geometry (box, point)
- \ingroup combine
- \tparam Box type of the box
- \tparam Geometry of second geometry, to be combined with the box
- \param box box to combine another geometry with, might be changed
- \param geometry other geometry
- \param strategy_less
- \param strategy_greater
- \note Strategy is currently ignored
- \todo Handle strategy
+\brief Expands a box using the extend (envelope) of another geometry (box, point)
+\ingroup expand
+\tparam Box type of the box
+\tparam Geometry of second geometry, to be expanded with the box
+\param box box to expand another geometry with, might be changed
+\param geometry other geometry
+\param strategy_less
+\param strategy_greater
+\note Strategy is currently ignored
+\todo Handle strategy
*
template
<
typename Box, typename Geometry,
typename StrategyLess, typename StrategyGreater
>
-inline void combine(Box& box, Geometry const& geometry,
+inline void expand(Box& box, Geometry const& geometry,
StrategyLess const& strategy_less,
StrategyGreater const& strategy_greater)
{
concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
- dispatch::combine
+ dispatch::expand
<
typename tag<Geometry>::type,
Box,
@@ -287,19 +287,19 @@
/*!
-\brief Combines a box with another geometry (box, point)
-\ingroup combine
+\brief Expands a box using the extend (envelope) of another geometry (box, point)
+\ingroup expand
\tparam Box type of the box
\tparam Geometry \tparam_geometry
-\param box box to combine another geometry with, might be changed
+\param box box to expand another geometry with, might be changed
\param geometry \param_geometry
*/
template <typename Box, typename Geometry>
-inline void combine(Box& box, Geometry const& geometry)
+inline void expand(Box& box, Geometry const& geometry)
{
concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
- dispatch::combine
+ dispatch::expand
<
typename tag<Geometry>::type,
Box, Geometry,
@@ -310,4 +310,4 @@
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_ALGORITHMS_COMBINE_HPP
+#endif // BOOST_GEOMETRY_ALGORITHMS_EXPAND_HPP
Modified: trunk/boost/geometry/algorithms/make.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/make.hpp (original)
+++ trunk/boost/geometry/algorithms/make.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -135,7 +135,7 @@
\ingroup make
\details The make_inverse function initializes a 2D or 3D box with large coordinates, the
min corner is very large, the max corner is very small. This is useful e.g. in combination
- with the combine function, to determine the bounding box of a series of geometries.
+ with the expand function, to determine the bounding box of a series of geometries.
\tparam Geometry \tparam_geometry
\return The constructed geometry, here: a box
Modified: trunk/boost/geometry/extensions/algorithms/detail/overlay/dissolver.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/detail/overlay/dissolver.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/detail/overlay/dissolver.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -22,6 +22,7 @@
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/algorithms/detail/disjoint.hpp>
#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
@@ -506,7 +507,7 @@
++it, ++index)
{
index_vector.push_back(index);
- geometry::combine(total_box, it->box);
+ geometry::expand(total_box, it->box);
}
std::vector<output_type> unioned_collection;
Modified: trunk/boost/geometry/extensions/index/rtree/helpers.hpp
==============================================================================
--- trunk/boost/geometry/extensions/index/rtree/helpers.hpp (original)
+++ trunk/boost/geometry/extensions/index/rtree/helpers.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -19,7 +19,7 @@
/**
* \brief Given two boxes, returns the minimal box that contains them
*/
-// TODO: use geometry::combine
+// TODO: use geometry::expand
template <typename Box>
inline Box enlarge_box(Box const& b1, Box const& b2)
{
Modified: trunk/boost/geometry/extensions/index/rtree/rtree_leaf.hpp
==============================================================================
--- trunk/boost/geometry/extensions/index/rtree/rtree_leaf.hpp (original)
+++ trunk/boost/geometry/extensions/index/rtree/rtree_leaf.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/combine.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/extensions/index/rtree/rtree_node.hpp>
@@ -92,7 +92,7 @@
geometry::assign_inverse(r);
for(typename leaf_map::const_iterator it = m_nodes.begin(); it != m_nodes.end(); ++it)
{
- geometry::combine(r, it->first);
+ geometry::expand(r, it->first);
}
return r;
}
Modified: trunk/boost/geometry/extensions/index/rtree/rtree_node.hpp
==============================================================================
--- trunk/boost/geometry/extensions/index/rtree/rtree_node.hpp (original)
+++ trunk/boost/geometry/extensions/index/rtree/rtree_node.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -20,8 +20,8 @@
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/combine.hpp>
#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/extensions/index/rtree/helpers.hpp>
@@ -162,7 +162,7 @@
geometry::assign_inverse(result);
for(typename node_map::const_iterator it = m_nodes.begin(); it != m_nodes.end(); ++it)
{
- geometry::combine(result, it->first);
+ geometry::expand(result, it->first);
}
return result;
@@ -299,8 +299,8 @@
// check for the least enlargement
for (typename node_map::const_iterator it = m_nodes.begin(); it != m_nodes.end(); ++it)
{
- coordinate_type const
- diff_area = coordinate_type(compute_union_area(box, it->first))
+ coordinate_type const
+ diff_area = coordinate_type(compute_union_area(box, it->first))
- geometry::area(it->first);
if (first)
Modified: trunk/boost/geometry/extensions/io/svg/svg_mapper.hpp
==============================================================================
--- trunk/boost/geometry/extensions/io/svg/svg_mapper.hpp (original)
+++ trunk/boost/geometry/extensions/io/svg/svg_mapper.hpp 2011-03-13 07:02:13 EDT (Sun, 13 Mar 2011)
@@ -26,6 +26,7 @@
#include <boost/geometry/core/tag_cast.hpp>
#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/algorithms/transform.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/strategies/transform.hpp>
@@ -260,7 +261,7 @@
{
if (num_points(geometry) > 0)
{
- combine(m_bounding_box,
+ expand(m_bounding_box,
make_envelope
<
model::box<Point>
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