boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 13:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[buffer] Allow const inputs and fix empty check

Browse Source
This commit is contained in:
Adam Wulkiewicz 2022-06-28 15:59:42 +02:00
parent 01d5066d16
commit 09f5bc64a1
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
View File

@ -2,8 +2,8 @@
// Copyright (c) 2012-2020 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2017-2021.
// Modifications copyright (c) 2017-2021 Oracle and/or its affiliates.
// This file was modified by Oracle on 2017-2022.
// Modifications copyright (c) 2017-2022 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,
@ -37,6 +37,8 @@
#include <boost/geometry/core/exterior_ring.hpp>
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/geometries/helper_geometry.hpp>
#include <boost/geometry/strategies/buffer.hpp>
#include <boost/geometry/strategies/side.hpp>
@ -54,11 +56,11 @@ namespace boost { namespace geometry
namespace detail { namespace buffer
{
template <typename Range, typename DistanceStrategy, typename Strategies>
inline void simplify_input(Range const& range,
DistanceStrategy const& distance,
Range& simplified,
Strategies const& strategies)
template <typename RangeIn, typename RangeOut, typename DistanceStrategy, typename Strategies>
inline void simplify_input(RangeIn const& range,
DistanceStrategy const& distance,
RangeOut& simplified,
Strategies const& strategies)
{
// We have to simplify the ring before to avoid very small-scaled
// features in the original (convex/concave/convex) being enlarged
@ -524,7 +526,8 @@ struct buffer_inserter_ring
RobustPolicy const& robust_policy,
Strategies const& strategies)
{
RingInput simplified;
using simplified_ring_t = typename helper_geometry<RingInput>::type;
simplified_ring_t simplified;
detail::buffer::simplify_input(ring, distance, simplified, strategies);
geometry::strategy::buffer::result_code code = geometry::strategy::buffer::result_no_output;
@ -532,12 +535,12 @@ struct buffer_inserter_ring
std::size_t n = boost::size(simplified);
std::size_t const min_points = core_detail::closure::minimum_ring_size
<
geometry::closure<RingInput>::value
geometry::closure<simplified_ring_t>::value
>::value;
if (n >= min_points)
{
detail::closed_clockwise_view<RingInput const> view(simplified);
detail::closed_clockwise_view<simplified_ring_t const> view(simplified);
if (distance.negative())
{
// Walk backwards (rings will be reversed afterwards)
@ -708,7 +711,7 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
RobustPolicy const& robust_policy,
Strategies const& strategies)
{
Linestring simplified;
typename helper_geometry<Linestring>::type simplified;
detail::buffer::simplify_input(linestring, distance, simplified, strategies);
geometry::strategy::buffer::result_code code = geometry::strategy::buffer::result_no_output;

5
include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
View File

@ -694,7 +694,7 @@ struct buffered_piece_collection
return;
}
if (! input_ring.empty())
if (! boost::empty(input_ring))
{
// Assign the ring to the original_ring collection
// For rescaling, it is recalculated. Without rescaling, it
@ -705,8 +705,7 @@ struct buffered_piece_collection
using view_type = detail::closed_clockwise_view<InputRing const>;
view_type const view(input_ring);
for (typename boost::range_iterator<view_type const>::type it =
boost::begin(view); it != boost::end(view); ++it)
for (auto it = boost::begin(view); it != boost::end(view); ++it)
{
clockwise_ring.push_back(*it);
}