boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-09 23:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[clear] Add support for GeometryCollection in clear().

Browse Source
This commit is contained in:
Adam Wulkiewicz 2021-06-02 22:48:20 +02:00
parent 620e02f4b6
commit b1b29ec41d
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/geometry/algorithms/clear.hpp
View File

@ -148,6 +148,16 @@ struct clear<Geometry, dynamic_geometry_tag>
}; };
template <typename Geometry>
struct clear<Geometry, geometry_collection_tag>
{
static void apply(Geometry& geometry)
{
traits::clear<Geometry>::apply(geometry);
}
};
} // namespace dispatch } // namespace dispatch
#endif // DOXYGEN_NO_DISPATCH #endif // DOXYGEN_NO_DISPATCH

38
test/algorithms/clear_multi.cpp
View File

@ -1,35 +1,49 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
//
// Copyright (c) 2011-2015 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2011-2015 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2021.
// Modifications copyright (c) 2021, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Use, modification and distribution is subject to the Boost Software License, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#include <geometry_test_common.hpp> #include <geometry_test_common.hpp>
#include <boost/range/empty.hpp>
#include <boost/geometry/algorithms/clear.hpp> #include <boost/geometry/algorithms/clear.hpp>
#include <boost/geometry/algorithms/num_points.hpp> #include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/io/wkt/wkt.hpp> #include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/adapted/boost_variant.hpp>
#include <boost/geometry/geometries/geometries.hpp> #include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/geometry_collection.hpp>
#include <boost/geometry/geometries/point_xy.hpp> #include <boost/geometry/geometries/point_xy.hpp>
#include <boost/variant/variant.hpp>
template <typename Geometry> template <typename Geometry>
void test_geometry(std::string const& wkt, unsigned int expected) void test_geometry(std::string const& wkt, std::size_t expected_before, std::size_t expected_after)
{ {
Geometry geometry; Geometry geometry;
bg::read_wkt(wkt, geometry); bg::read_wkt(wkt, geometry);
boost::variant<Geometry> variant_geometry(geometry); boost::variant<Geometry> variant_geometry(geometry);
bg::model::geometry_collection<boost::variant<Geometry>> gc{ variant_geometry };
BOOST_CHECK_EQUAL(bg::num_points(geometry), expected_before);
bg::clear(geometry); bg::clear(geometry);
BOOST_CHECK_EQUAL(bg::num_points(geometry), expected); BOOST_CHECK_EQUAL(bg::num_points(geometry), expected_after);
BOOST_CHECK_EQUAL(bg::num_points(variant_geometry), expected_before);
bg::clear(variant_geometry); bg::clear(variant_geometry);
BOOST_CHECK_EQUAL(bg::num_points(variant_geometry), expected); BOOST_CHECK_EQUAL(bg::num_points(variant_geometry), expected_after);
BOOST_CHECK(! boost::empty(gc));
bg::clear(gc);
BOOST_CHECK(boost::empty(gc));
} }
@ -42,12 +56,12 @@ void test_all()
typedef bg::model::multi_linestring<ls> mls; typedef bg::model::multi_linestring<ls> mls;
typedef bg::model::multi_polygon<poly> mpoly; typedef bg::model::multi_polygon<poly> mpoly;
test_geometry<Point>("POINT(0 0)", 1); test_geometry<Point>("POINT(0 0)", 1, 1);
test_geometry<ls>("LINESTRING(0 0,0 1)", 0); test_geometry<ls>("LINESTRING(0 0,0 1)", 2, 0);
test_geometry<poly>("POLYGON((0 0,0 1,1 0,0 0))", 0); test_geometry<poly>("POLYGON((0 0,0 1,1 0,0 0))", 4, 0);
test_geometry<mpoint>("MULTIPOINT((0 0),(0 1),(1 0),(0 0))", 0); test_geometry<mpoint>("MULTIPOINT((0 0),(0 1),(1 0),(0 0))", 4, 0);
test_geometry<mls>("MULTILINESTRING((0 0,0 1),(1 0,0 0))", 0); test_geometry<mls>("MULTILINESTRING((0 0,0 1),(1 0,0 0))", 4, 0);
test_geometry<mpoly>("MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((10 0,10 1,11 0,10 0)))", 0); test_geometry<mpoly>("MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((10 0,10 1,11 0,10 0)))", 8, 0);
} }