boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-11 11:52:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/boostorg/geometry into feature/setops

Browse Source
This commit is contained in:
Menelaos Karavelas
2014-03-19 17:12:41 +02:00
parent 9ae6200a9d 79bbb5a408
commit 8c2e7ea282
5 changed files with 193 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/generated/append_status.qbk
View File

@@ -1,4 +1,3 @@
[/NOTE: adapted manually, multi-linestring/multi-polygon do compile but not run!]
[heading Supported geometries]
[table
[[ ][Point][Range]]
@@ -9,6 +8,6 @@
[[Ring][ [$img/ok.png] ][ [$img/ok.png] ]]
[[Polygon][ [$img/ok.png] ][ [$img/ok.png] ]]
[[MultiPoint][ [$img/ok.png] ][ [$img/ok.png] ]]
[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ]]
[[MultiPolygon][ [$img/nyi.png] ][ [$img/nyi.png] ]]
[[MultiLinestring][ [$img/ok.png] ][ [$img/ok.png] ]]
[[MultiPolygon][ [$img/ok.png] ][ [$img/ok.png] ]]
]

27
doc/reference/algorithms/append.qbk
View File

@@ -1,9 +1,14 @@
[/============================================================================
Boost.Geometry (aka GGL, Generic Geometry Library)
Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands.
Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
Copyright (c) 2009-2012 Bruno Lalande, Paris, France.
Copyright (c) 2009-2014 Barend Gehrels, Amsterdam, the Netherlands.
Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
Copyright (c) 2009-2014 Bruno Lalande, Paris, France.
This file was modified by Oracle on 2014.
Modifications copyright (c) 2014, Oracle and/or its affiliates.
Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
Use, modification and distribution is subject to the Boost Software License,
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -26,6 +31,22 @@
either the exterior ring (the default) or specify a zero-based index for one of the interior rings.
In the last case, the interior rings are not resized automatically,
so ensure that the zero-based index is smaller than the number of interior rings]]
[[__multi_linestring__][Appends point or range to the end of the
linestring with the given multi index.
The multi-linestring is not resized automatically, so ensure
that the multi index is smaller than then number of linestring
in the multi-linestring.]]
[[__multi_polygon__][Appends point or range to the end of the polygon
(without explicitly closing it) with the given multi-index.
The point or range is appended at the end of the
exterior ring (the default) or specify a zero-based ring index for
the interior rings.
The multi-polygon is not resized automatically, so ensure
that the multi index is smaller than then number of polygon
in the multi-polygon. The same applies for the interior rings
of the polygon: the interior rings are not resized
automatically, so ensure that the zero-based ring index is
smaller than the number of interior rings of the polygon.]]
]
[heading Complexity]

15
include/boost/geometry/algorithms/append.hpp
View File

@@ -1,8 +1,13 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
// This file was modified by Oracle on 2014.
// Modifications copyright (c) 2014, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -105,7 +110,7 @@ struct range_to_polygon
typedef typename ring_type<Polygon>::type ring_type;
static inline void apply(Polygon& polygon, Range const& range,
int ring_index, int )
int ring_index, int = 0)
{
if (ring_index == -1)
{
@@ -275,7 +280,7 @@ struct append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
\param range_or_point The point or range to add
\param ring_index The index of the ring in case of a polygon:
exterior ring (-1, the default) or interior ring index
\param multi_index Reserved for multi polygons or multi linestrings
\param multi_index The index of the geometry to which the points are appended
\qbk{[include reference/algorithms/append.qbk]}
}

59
include/boost/geometry/multi/algorithms/append.hpp
View File

@@ -1,8 +1,13 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
// This file was modified by Oracle on 2014.
// Modifications copyright (c) 2014, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -23,6 +28,34 @@
namespace boost { namespace geometry
{
#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace append
{
template <typename MultiGeometry, typename RangeOrPoint>
struct append_to_multigeometry
{
static inline void apply(MultiGeometry& multigeometry,
RangeOrPoint const& range_or_point,
int ring_index, int multi_index)
{
dispatch::append
<
typename boost::range_value<MultiGeometry>::type,
RangeOrPoint
>::apply(multigeometry[multi_index], range_or_point, ring_index);
}
};
}} // namespace detail::append
#endif // DOXYGEN_NO_DETAIL
#ifndef DOXYGEN_NO_DISPATCH
namespace dispatch
{
@@ -40,6 +73,26 @@ struct append_range<multi_point_tag, Geometry, Range>
: detail::append::append_range<Geometry, Range>
{};
template <typename MultiGeometry, typename RangeOrPoint>
struct append_point<multi_linestring_tag, MultiGeometry, RangeOrPoint>
: detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
{};
template <typename MultiGeometry, typename RangeOrPoint>
struct append_range<multi_linestring_tag, MultiGeometry, RangeOrPoint>
: detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
{};
template <typename MultiGeometry, typename RangeOrPoint>
struct append_point<multi_polygon_tag, MultiGeometry, RangeOrPoint>
: detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
{};
template <typename MultiGeometry, typename RangeOrPoint>
struct append_range<multi_polygon_tag, MultiGeometry, RangeOrPoint>
: detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
{};
}

127
test/algorithms/append.cpp
View File

@@ -1,9 +1,14 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
// This file was modified by Oracle on 2014.
// Modifications copyright (c) 2014, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -30,51 +35,113 @@
#include <test_common/test_point.hpp>
#include <test_geometries/wrapped_boost_array.hpp>
// includes for multi-geometries
#include <boost/geometry/multi/core/point_type.hpp>
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/geometries/concepts/check.hpp>
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
#include <boost/geometry/multi/algorithms/append.hpp>
#include <boost/geometry/multi/algorithms/clear.hpp>
#include <boost/geometry/multi/algorithms/num_points.hpp>
BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::vector)
BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::deque)
template <typename G>
void test_geometry(G& geometry, bool check)
template <bool EnableAll>
struct do_checks
{
typedef typename bg::point_type<G>::type P;
bg::append(geometry, bg::make_zero<P>());
if (check)
template <typename G>
static inline void apply(G const& geometry,
std::size_t size1,
std::size_t = 0,
std::size_t = 0)
{
BOOST_CHECK_EQUAL(bg::num_points(geometry), 1u);
BOOST_CHECK_EQUAL(bg::num_points(geometry), size1);
}
};
// Append a range
std::vector<P> v;
v.push_back(bg::make_zero<P>());
v.push_back(bg::make_zero<P>());
bg::append(geometry, v);
if (check)
template<>
struct do_checks<true>
{
template <typename G>
static inline void apply(G const& geometry,
std::size_t size1,
std::size_t size2 = 0,
std::size_t size3 = 0)
{
BOOST_CHECK_EQUAL(bg::num_points(geometry), 3u);
do_checks<false>::apply(geometry, size1);
BOOST_CHECK_EQUAL(bg::num_points(geometry[0]), size2);
BOOST_CHECK_EQUAL(bg::num_points(geometry[1]), size3);
}
};
bg::clear(geometry);
if (check)
template <bool HasMultiIndex, bool IsVariant>
struct test_geometry
{
template <typename G>
static inline void apply(G& geometry, bool check)
{
BOOST_CHECK_EQUAL(bg::num_points(geometry), 0u);
}
typedef typename bg::point_type<G>::type P;
typedef do_checks<HasMultiIndex && !IsVariant> checks;
bg::append(geometry, bg::make_zero<P>(), -1, 0);
if (check)
{
checks::apply(geometry, 1u, 1u, 0u);
}
// Append a range
std::vector<P> v;
v.push_back(bg::make_zero<P>());
v.push_back(bg::make_zero<P>());
bg::append(geometry, v, -1, 1);
if (check)
{
checks::apply(geometry, 3u, 1u, 2u);
}
bg::clear(geometry);
if (check)
{
do_checks<false>::apply(geometry, 0u);
}
}
};
//P p = boost::range::front(geometry);
}
template <typename G>
void test_geometry_and_variant(bool check = true)
{
G geometry;
boost::variant<G> variant_geometry = G();
test_geometry(geometry, check);
test_geometry(variant_geometry, check);
test_geometry<false, false>::apply(geometry, check);
test_geometry<false, true>::apply(variant_geometry, check);
}
template <typename MG>
void test_multigeometry_and_variant(bool check = true)
{
typedef typename boost::range_value<MG>::type G;
G geometry;
MG multigeometry;
bg::traits::push_back<MG>::apply(multigeometry, geometry);
bg::traits::push_back<MG>::apply(multigeometry, geometry);
boost::variant<MG> variant_multigeometry = multigeometry;
test_geometry<true, false>::apply(multigeometry, check);
test_geometry<true, true>::apply(variant_multigeometry, check);
}
template <typename P>
void test_all()
{
@@ -84,10 +151,18 @@ void test_all()
test_geometry_and_variant<bg::model::linestring<P> >();
test_geometry_and_variant<bg::model::ring<P> >();
test_geometry_and_variant<bg::model::polygon<P> >();
test_geometry_and_variant<bg::model::multi_point<P> >();
test_multigeometry_and_variant
<
bg::model::multi_linestring<bg::model::linestring<P> >
>();
test_multigeometry_and_variant
<
bg::model::multi_polygon<bg::model::polygon<P> >
>();
test_geometry_and_variant<std::vector<P> >();
test_geometry_and_variant<std::deque<P> >();
//test_geometry_and_variant<std::list<P> >();
}
int test_main(int, char* [])