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

Drop dependencies, replace boost with std, remove includes

Browse Source 
Drop Boost.SmartPtr dependency
Drop Boost.Utility (Call Traits) dependency
Replace boost::array with std::array
Replace boost::minmax_element with std::minmax_element
Remove unneeded headers of Boost.Tuple and Boost.Algorithm
Include specific headers from Boost.StringAlgo and Boost.Thread
Use auto for iterator types
This commit is contained in:
Adam Wulkiewicz 2023-04-24 09:52:25 +02:00
parent b1bebca453
commit 092ab9da34
26 changed files with 95 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/geometry/algorithms/detail/buffer/piece_border.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2020-2021 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2020-2021 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2020-2022. // This file was modified by Oracle on 2020-2022.
// Modifications copyright (c) 2020-2022, Oracle and/or its affiliates. // Modifications copyright (c) 2020-2022, Oracle and/or its affiliates.
@ -14,7 +15,8 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_PIECE_BORDER_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_PIECE_BORDER_HPP
#include <boost/array.hpp> #include <array>
#include <boost/core/addressof.hpp> #include <boost/core/addressof.hpp>
#include <boost/geometry/core/assert.hpp> #include <boost/geometry/core/assert.hpp>
@ -115,7 +117,7 @@ struct piece_border
// Points from the original (one or two, depending on piece shape) // Points from the original (one or two, depending on piece shape)
// Note, if there are 2 points, they are REVERSED w.r.t. the original // Note, if there are 2 points, they are REVERSED w.r.t. the original
// Therefore here we can walk in its order. // Therefore here we can walk in its order.
boost::array<Point, 2> m_originals; std::array<Point, 2> m_originals;
std::size_t m_original_size; std::size_t m_original_size;
geometry::model::box<Point> m_envelope; geometry::model::box<Point> m_envelope;

6
include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2020-2021. // This file was modified by Oracle on 2020-2021.
// Modifications copyright (c) 2020-2021, Oracle and/or its affiliates. // Modifications copyright (c) 2020-2021, Oracle and/or its affiliates.
@ -14,7 +15,8 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENT_POINT_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENT_POINT_HPP
#include <boost/array.hpp> #include <array>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/size.hpp> #include <boost/range/size.hpp>
@ -113,7 +115,7 @@ struct copy_segment_point_box
SegmentIdentifier const& seg_id, signed_size_type offset, SegmentIdentifier const& seg_id, signed_size_type offset,
PointOut& point) PointOut& point)
{ {
boost::array<typename point_type<Box>::type, 4> bp; std::array<typename point_type<Box>::type, 4> bp;
assign_box_corners_oriented<Reverse>(box, bp); assign_box_corners_oriented<Reverse>(box, bp);
signed_size_type const target = circular_offset(4, seg_id.segment_index, offset); signed_size_type const target = circular_offset(4, seg_id.segment_index, offset);

5
include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2014-2021. // This file was modified by Oracle on 2014-2021.
// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates. // Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
@ -15,10 +16,10 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP
#include <array>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <boost/array.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/size.hpp> #include <boost/range/size.hpp>
@ -238,7 +239,7 @@ struct copy_segments_box
: 5 - index + to_index + 1; : 5 - index + to_index + 1;
// Create array of points, the fifth one closes it // Create array of points, the fifth one closes it
boost::array<typename point_type<Box>::type, 5> bp; std::array<typename point_type<Box>::type, 5> bp;
assign_box_corners_oriented<Reverse>(box, bp); assign_box_corners_oriented<Reverse>(box, bp);
bp[4] = bp[0]; bp[4] = bp[0];

7
include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
View File

@ -1,11 +1,10 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2014-2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2014-2021. // This file was modified by Oracle on 2014-2021.
// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates. // Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // 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,
@ -16,10 +15,10 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
#include <array>
#include <cstddef> #include <cstddef>
#include <map> #include <map>
#include <boost/array.hpp>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>
#include <boost/core/ignore_unused.hpp> #include <boost/core/ignore_unused.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
@ -570,7 +569,7 @@ struct get_turns_cs
{ {
typedef typename geometry::point_type<Range>::type range_point_type; typedef typename geometry::point_type<Range>::type range_point_type;
typedef typename geometry::point_type<Box>::type box_point_type; typedef typename geometry::point_type<Box>::type box_point_type;
typedef boost::array<box_point_type, 4> box_array; typedef std::array<box_point_type, 4> box_array;
using view_type = detail::closed_clockwise_view using view_type = detail::closed_clockwise_view
< <

5
include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// 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
@ -10,7 +11,7 @@
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_TURN_INFO_HPP
#include <boost/array.hpp> #include <array>
#include <boost/geometry/core/coordinate_type.hpp> #include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/algorithms/detail/signed_size_type.hpp> #include <boost/geometry/algorithms/detail/signed_size_type.hpp>
@ -80,7 +81,7 @@ template
typename Point, typename Point,
typename SegmentRatio = geometry::segment_ratio<typename coordinate_type<Point>::type>, typename SegmentRatio = geometry::segment_ratio<typename coordinate_type<Point>::type>,
typename Operation = turn_operation<Point, SegmentRatio>, typename Operation = turn_operation<Point, SegmentRatio>,
typename Container = boost::array<Operation, 2> typename Container = std::array<Operation, 2>
> >
struct turn_info struct turn_info
{ {

5
include/boost/geometry/algorithms/detail/relate/result.hpp
View File

@ -1,11 +1,10 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2013-2022. // This file was modified by Oracle on 2013-2022.
// Modifications copyright (c) 2013-2022 Oracle and/or its affiliates. // Modifications copyright (c) 2013-2022 Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // 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,
@ -19,10 +18,10 @@
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include <string> #include <string>
#include <tuple>
#include <type_traits> #include <type_traits>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/geometry/core/assert.hpp> #include <boost/geometry/core/assert.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp> #include <boost/geometry/core/coordinate_dimension.hpp>

30
include/boost/geometry/arithmetic/arithmetic.hpp
View File

@ -3,6 +3,7 @@
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2021. // This file was modified by Oracle on 2021.
// Modifications copyright (c) 2021 Oracle and/or its affiliates. // Modifications copyright (c) 2021 Oracle and/or its affiliates.
@ -20,7 +21,6 @@
#include <functional> #include <functional>
#include <boost/call_traits.hpp>
#include <boost/concept/requires.hpp> #include <boost/concept/requires.hpp>
#include <boost/geometry/core/coordinate_type.hpp> #include <boost/geometry/core/coordinate_type.hpp>
@ -32,24 +32,6 @@
namespace boost { namespace geometry namespace boost { namespace geometry
{ {
#ifndef DOXYGEN_NO_DETAIL
namespace detail
{
template <typename Point>
struct param
{
typedef typename boost::call_traits
<
typename coordinate_type<Point>::type
>::param_type type;
};
} // namespace detail
#endif // DOXYGEN_NO_DETAIL
/*! /*!
\brief Adds the same value to each coordinate of a point \brief Adds the same value to each coordinate of a point
\ingroup arithmetic \ingroup arithmetic
@ -59,7 +41,7 @@ struct param
\param value value to add \param value value to add
*/ */
template <typename Point> template <typename Point>
inline void add_value(Point& p, typename detail::param<Point>::type value) inline void add_value(Point& p, typename coordinate_type<Point>::type const& value)
{ {
BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) ); BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) );
@ -101,7 +83,7 @@ inline void add_point(Point1& p1, Point2 const& p2)
\param value value to subtract \param value value to subtract
*/ */
template <typename Point> template <typename Point>
inline void subtract_value(Point& p, typename detail::param<Point>::type value) inline void subtract_value(Point& p, typename coordinate_type<Point>::type const& value)
{ {
BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) ); BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) );
@ -143,7 +125,7 @@ inline void subtract_point(Point1& p1, Point2 const& p2)
\param value value to multiply by \param value value to multiply by
*/ */
template <typename Point> template <typename Point>
inline void multiply_value(Point& p, typename detail::param<Point>::type value) inline void multiply_value(Point& p, typename coordinate_type<Point>::type const& value)
{ {
BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) ); BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) );
@ -186,7 +168,7 @@ inline void multiply_point(Point1& p1, Point2 const& p2)
\param value value to divide by \param value value to divide by
*/ */
template <typename Point> template <typename Point>
inline void divide_value(Point& p, typename detail::param<Point>::type value) inline void divide_value(Point& p, typename coordinate_type<Point>::type const& value)
{ {
BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) ); BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) );
@ -228,7 +210,7 @@ inline void divide_point(Point1& p1, Point2 const& p2)
\param value value to assign \param value value to assign
*/ */
template <typename Point> template <typename Point>
inline void assign_value(Point& p, typename detail::param<Point>::type value) inline void assign_value(Point& p, typename coordinate_type<Point>::type const& value)
{ {
BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) ); BOOST_CONCEPT_ASSERT( (concepts::Point<Point>) );

3
include/boost/geometry/formulas/karney_direct.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry // Boost.Geometry
// Copyright (c) 2018 Adeel Ahmad, Islamabad, Pakistan. // Copyright (c) 2018 Adeel Ahmad, Islamabad, Pakistan.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Contributed and/or modified by Adeel Ahmad, // Contributed and/or modified by Adeel Ahmad,
// as part of Google Summer of Code 2018 program. // as part of Google Summer of Code 2018 program.
@ -31,8 +32,6 @@
#define BOOST_GEOMETRY_FORMULAS_KARNEY_DIRECT_HPP #define BOOST_GEOMETRY_FORMULAS_KARNEY_DIRECT_HPP
#include <boost/array.hpp>
#include <boost/math/constants/constants.hpp> #include <boost/math/constants/constants.hpp>
#include <boost/math/special_functions/hypot.hpp> #include <boost/math/special_functions/hypot.hpp>

6
include/boost/geometry/index/detail/rtree/query_iterators.hpp
View File

@ -2,7 +2,7 @@
// //
// R-tree query iterators // R-tree query iterators
// //
// Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland.
// //
// This file was modified by Oracle on 2019-2021. // This file was modified by Oracle on 2019-2021.
// Modifications copyright (c) 2019-2021 Oracle and/or its affiliates. // Modifications copyright (c) 2019-2021 Oracle and/or its affiliates.
@ -15,7 +15,7 @@
#ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP
#define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_QUERY_ITERATORS_HPP
#include <boost/scoped_ptr.hpp> #include <memory>
#include <boost/geometry/index/detail/rtree/node/node_elements.hpp> #include <boost/geometry/index/detail/rtree/node/node_elements.hpp>
#include <boost/geometry/index/detail/rtree/visitors/distance_query.hpp> #include <boost/geometry/index/detail/rtree/visitors/distance_query.hpp>
@ -261,7 +261,7 @@ template <typename Value, typename Allocators>
class query_iterator class query_iterator
{ {
typedef query_iterator_base<Value, Allocators> iterator_base; typedef query_iterator_base<Value, Allocators> iterator_base;
typedef boost::scoped_ptr<iterator_base> iterator_ptr; typedef std::unique_ptr<iterator_base> iterator_ptr;
public: public:
typedef std::forward_iterator_tag iterator_category; typedef std::forward_iterator_tag iterator_category;

5
include/boost/geometry/io/svg/svg_mapper.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2009-2015 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2009-2015 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2015-2021. // This file was modified by Oracle on 2015-2021.
// Modifications copyright (c) 2015-2020, Oracle and/or its affiliates. // Modifications copyright (c) 2015-2020, Oracle and/or its affiliates.
@ -18,6 +19,7 @@
#define BOOST_GEOMETRY_IO_SVG_MAPPER_HPP #define BOOST_GEOMETRY_IO_SVG_MAPPER_HPP
#include <cstdio> #include <cstdio>
#include <memory>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
@ -25,7 +27,6 @@
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/geometry/core/static_assert.hpp> #include <boost/geometry/core/static_assert.hpp>
#include <boost/geometry/core/tags.hpp> #include <boost/geometry/core/tags.hpp>
@ -290,7 +291,7 @@ class svg_mapper : boost::noncopyable
> transformer_type; > transformer_type;
model::box<Point> m_bounding_box; model::box<Point> m_bounding_box;
boost::scoped_ptr<transformer_type> m_matrix; std::unique_ptr<transformer_type> m_matrix;
std::ostream& m_stream; std::ostream& m_stream;
SvgCoordinateType const m_width; SvgCoordinateType const m_width;

8
include/boost/geometry/io/wkt/read.hpp
View File

@ -3,12 +3,11 @@
// Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2020 Baidyanath Kundu, Haldia, India // Copyright (c) 2020 Baidyanath Kundu, Haldia, India
// This file was modified by Oracle on 2014-2021. // This file was modified by Oracle on 2014-2021.
// Modifications copyright (c) 2014-2021 Oracle and/or its affiliates. // Modifications copyright (c) 2014-2021 Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@ -24,14 +23,13 @@
#include <cstddef> #include <cstddef>
#include <string> #include <string>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/size.hpp> #include <boost/range/size.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>
#include <boost/tokenizer.hpp>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
#include <boost/geometry/algorithms/assign.hpp> #include <boost/geometry/algorithms/assign.hpp>

7
include/boost/geometry/io/wkt/write.hpp
View File

@ -3,12 +3,11 @@
// Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2022 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2017 Bruno Lalande, Paris, France. // Copyright (c) 2008-2017 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2017 Mateusz Loskot, London, UK. // Copyright (c) 2009-2017 Mateusz Loskot, London, UK.
// Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2014-2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2020 Baidyanath Kundu, Haldia, India. // Copyright (c) 2020 Baidyanath Kundu, Haldia, India.
// This file was modified by Oracle on 2015-2021. // This file was modified by Oracle on 2015-2021.
// Modifications copyright (c) 2015-2021, Oracle and/or its affiliates. // Modifications copyright (c) 2015-2021, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -22,10 +21,10 @@
#ifndef BOOST_GEOMETRY_IO_WKT_WRITE_HPP #ifndef BOOST_GEOMETRY_IO_WKT_WRITE_HPP
#define BOOST_GEOMETRY_IO_WKT_WRITE_HPP #define BOOST_GEOMETRY_IO_WKT_WRITE_HPP
#include <array>
#include <ostream> #include <ostream>
#include <string> #include <string>
#include <boost/array.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/size.hpp> #include <boost/range/size.hpp>
@ -305,7 +304,7 @@ struct wkt_segment
Segment const& segment, bool) Segment const& segment, bool)
{ {
// Convert to two points, then stream // Convert to two points, then stream
using sequence = boost::array<point_type, 2>; using sequence = std::array<point_type, 2>;
sequence points; sequence points;
geometry::detail::assign_point_from_index<0>(segment, points[0]); geometry::detail::assign_point_from_index<0>(segment, points[0]);

5
include/boost/geometry/srs/projection.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2020. // This file was modified by Oracle on 2017-2020.
// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
@ -14,10 +15,10 @@
#define BOOST_GEOMETRY_SRS_PROJECTION_HPP #define BOOST_GEOMETRY_SRS_PROJECTION_HPP
#include <memory>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/throw_exception.hpp> #include <boost/throw_exception.hpp>
#include <boost/geometry/algorithms/convert.hpp> #include <boost/geometry/algorithms/convert.hpp>
@ -378,7 +379,7 @@ private:
return result; return result;
} }
boost::shared_ptr<vprj_t> m_ptr; std::shared_ptr<vprj_t> m_ptr;
}; };
template <typename StaticParameters, typename CT> template <typename StaticParameters, typename CT>

3
include/boost/geometry/srs/projections/dpar.hpp
View File

@ -1,5 +1,7 @@
// Boost.Geometry // Boost.Geometry
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2017-2022, Oracle and/or its affiliates. // Copyright (c) 2017-2022, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -31,7 +33,6 @@
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/size.hpp> #include <boost/range/size.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/variant/variant.hpp> #include <boost/variant/variant.hpp>

6
include/boost/geometry/srs/projections/factory.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2022. // This file was modified by Oracle on 2017-2022.
// Modifications copyright (c) 2017-2022, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2022, Oracle and/or its affiliates.
@ -15,10 +16,9 @@
#define BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP #define BOOST_GEOMETRY_PROJECTIONS_FACTORY_HPP
#include <map> #include <map>
#include <memory>
#include <string> #include <string>
#include <boost/shared_ptr.hpp>
#include <boost/geometry/core/static_assert.hpp> #include <boost/geometry/core/static_assert.hpp>
#include <boost/geometry/srs/projections/dpar.hpp> #include <boost/geometry/srs/projections/dpar.hpp>
@ -182,7 +182,7 @@ private:
typedef factory_key<Params> key; typedef factory_key<Params> key;
typedef typename key::type key_type; typedef typename key::type key_type;
typedef boost::shared_ptr<entry_base> entry_ptr; typedef std::shared_ptr<entry_base> entry_ptr;
typedef std::map<key_type, entry_ptr> entries_map; typedef std::map<key_type, entry_ptr> entries_map;

4
include/boost/geometry/srs/projections/impl/dms_parser.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017, 2018. // This file was modified by Oracle on 2017, 2018.
// Modifications copyright (c) 2017-2018, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2018, Oracle and/or its affiliates.
@ -39,9 +40,10 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
#include <algorithm>
#include <string> #include <string>
#include <ostream>
#include <boost/algorithm/string.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <boost/geometry/core/config.hpp> #include <boost/geometry/core/config.hpp>

4
include/boost/geometry/srs/projections/impl/pj_datum_set.hpp
View File

@ -2,6 +2,7 @@
// This file is manually converted from PROJ4 // This file is manually converted from PROJ4
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2020. // This file was modified by Oracle on 2017-2020.
// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
@ -43,7 +44,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/geometry/srs/projections/dpar.hpp> #include <boost/geometry/srs/projections/dpar.hpp>
#include <boost/geometry/srs/projections/exception.hpp> #include <boost/geometry/srs/projections/exception.hpp>

6
include/boost/geometry/srs/projections/impl/pj_gridinfo.hpp
View File

@ -1,6 +1,8 @@
// Boost.Geometry // Boost.Geometry
// This file is manually converted from PROJ4 // This file is manually converted from PROJ4
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2018, 2019. // This file was modified by Oracle on 2018, 2019.
// Modifications copyright (c) 2018-2019, Oracle and/or its affiliates. // Modifications copyright (c) 2018-2019, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -41,11 +43,11 @@
#define BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_PJ_GRIDINFO_HPP #define BOOST_GEOMETRY_SRS_PROJECTIONS_IMPL_PJ_GRIDINFO_HPP
#include <boost/algorithm/string.hpp>
#include <boost/geometry/core/assert.hpp> #include <boost/geometry/core/assert.hpp>
#include <boost/geometry/util/math.hpp> #include <boost/geometry/util/math.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
#include <algorithm> #include <algorithm>

4
include/boost/geometry/srs/projections/impl/pj_init.hpp
View File

@ -2,6 +2,7 @@
// This file is manually converted from PROJ4 // This file is manually converted from PROJ4
// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2020. // This file was modified by Oracle on 2017-2020.
// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
@ -44,9 +45,6 @@
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <boost/algorithm/string.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/geometry/core/static_assert.hpp> #include <boost/geometry/core/static_assert.hpp>
#include <boost/geometry/srs/projections/dpar.hpp> #include <boost/geometry/srs/projections/dpar.hpp>

3
include/boost/geometry/srs/projections/proj/igh.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry - gis-projections (based on PROJ4) // Boost.Geometry - gis-projections (based on PROJ4)
// Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2021. // This file was modified by Oracle on 2017-2021.
// Modifications copyright (c) 2017-2021, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2021, Oracle and/or its affiliates.
@ -49,8 +50,6 @@
#include <boost/geometry/util/math.hpp> #include <boost/geometry/util/math.hpp>
#include <boost/shared_ptr.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry
{ {

9
include/boost/geometry/srs/projections/proj/ob_tran.hpp
View File

@ -1,6 +1,7 @@
// Boost.Geometry - gis-projections (based on PROJ4) // Boost.Geometry - gis-projections (based on PROJ4)
// Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2020. // This file was modified by Oracle on 2017-2020.
// Modifications copyright (c) 2017-2020, Oracle and/or its affiliates. // Modifications copyright (c) 2017-2020, Oracle and/or its affiliates.
@ -40,19 +41,17 @@
#ifndef BOOST_GEOMETRY_PROJECTIONS_OB_TRAN_HPP #ifndef BOOST_GEOMETRY_PROJECTIONS_OB_TRAN_HPP
#define BOOST_GEOMETRY_PROJECTIONS_OB_TRAN_HPP #define BOOST_GEOMETRY_PROJECTIONS_OB_TRAN_HPP
#include <memory>
#include <type_traits> #include <type_traits>
#include <boost/geometry/util/math.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/geometry/core/static_assert.hpp> #include <boost/geometry/core/static_assert.hpp>
#include <boost/geometry/srs/projections/impl/aasincos.hpp> #include <boost/geometry/srs/projections/impl/aasincos.hpp>
#include <boost/geometry/srs/projections/impl/base_static.hpp> #include <boost/geometry/srs/projections/impl/base_static.hpp>
#include <boost/geometry/srs/projections/impl/base_dynamic.hpp> #include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
#include <boost/geometry/srs/projections/impl/factory_entry.hpp> #include <boost/geometry/srs/projections/impl/factory_entry.hpp>
#include <boost/geometry/srs/projections/impl/pj_ell_set.hpp> #include <boost/geometry/srs/projections/impl/pj_ell_set.hpp>
#include <boost/geometry/srs/projections/impl/projects.hpp> #include <boost/geometry/srs/projections/impl/projects.hpp>
#include <boost/geometry/util/math.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry
{ {
@ -199,7 +198,7 @@ namespace projections
link->inv(link->params(), xy_x, xy_y, lp_lon, lp_lat); link->inv(link->params(), xy_x, xy_y, lp_lon, lp_lat);
} }
boost::shared_ptr<dynamic_wrapper_b<T, Parameters> > link; std::shared_ptr<dynamic_wrapper_b<T, Parameters> > link;
T lamp; T lamp;
T cphip, sphip; T cphip, sphip;
}; };

3
include/boost/geometry/srs/shared_grids_boost.hpp
View File

@ -14,7 +14,8 @@
#include <boost/geometry/srs/projections/grids.hpp> #include <boost/geometry/srs/projections/grids.hpp>
#include <boost/thread.hpp> #include <boost/thread/lock_types.hpp>
#include <boost/thread/shared_mutex.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry

15
include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
View File

@ -3,6 +3,7 @@
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2018-2020. // This file was modified by Oracle on 2018-2020.
// Modifications copyright (c) 2018-2020 Oracle and/or its affiliates. // Modifications copyright (c) 2018-2020 Oracle and/or its affiliates.
@ -18,20 +19,18 @@
#ifndef BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_POINT_IN_BOX_BY_SIDE_HPP #ifndef BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_POINT_IN_BOX_BY_SIDE_HPP
#define BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_POINT_IN_BOX_BY_SIDE_HPP #define BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_POINT_IN_BOX_BY_SIDE_HPP
#include <boost/array.hpp> #include <array>
#include <boost/core/ignore_unused.hpp> #include <boost/core/ignore_unused.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/core/access.hpp> #include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp> #include <boost/geometry/core/coordinate_dimension.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/strategies/side.hpp>
#include <boost/geometry/strategies/covered_by.hpp> #include <boost/geometry/strategies/covered_by.hpp>
#include <boost/geometry/strategies/within.hpp>
#include <boost/geometry/strategies/geographic/side.hpp> #include <boost/geometry/strategies/geographic/side.hpp>
#include <boost/geometry/strategies/side.hpp>
#include <boost/geometry/strategies/spherical/ssf.hpp> #include <boost/geometry/strategies/spherical/ssf.hpp>
#include <boost/geometry/strategies/within.hpp>
namespace boost { namespace geometry { namespace strategy namespace boost { namespace geometry { namespace strategy
@ -86,7 +85,7 @@ inline bool point_in_box_by_side(Point const& point, Box const& box,
// Create (counterclockwise) array of points, the fifth one closes it // Create (counterclockwise) array of points, the fifth one closes it
// Every point should be on the LEFT side (=1), or ON the border (=0), // Every point should be on the LEFT side (=1), or ON the border (=0),
// So >= 1 or >= 0 // So >= 1 or >= 0
boost::array<typename point_type<Box>::type, 5> bp; std::array<typename point_type<Box>::type, 5> bp;
geometry::detail::assign_box_corners_oriented<true>(box, bp); geometry::detail::assign_box_corners_oriented<true>(box, bp);
bp[4] = bp[0]; bp[4] = bp[0];

46
include/boost/geometry/strategies/geographic/closest_points_pt_seg.hpp
View File

@ -1,5 +1,7 @@
// Boost.Geometry // Boost.Geometry
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2021, Oracle and/or its affiliates. // Copyright (c) 2021, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
@ -10,50 +12,14 @@
#ifndef BOOST_GEOMETRY_STRATEGIES_GEOGRAPHIC_CLOSEST_POINTS_CROSS_TRACK_HPP #ifndef BOOST_GEOMETRY_STRATEGIES_GEOGRAPHIC_CLOSEST_POINTS_CROSS_TRACK_HPP
#define BOOST_GEOMETRY_STRATEGIES_GEOGRAPHIC_CLOSEST_POINTS_CROSS_TRACK_HPP #define BOOST_GEOMETRY_STRATEGIES_GEOGRAPHIC_CLOSEST_POINTS_CROSS_TRACK_HPP
#include <algorithm> #include <boost/geometry/core/coordinate_dimension.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/algorithm/minmax.hpp>
#include <boost/config.hpp>
#include <boost/concept_check.hpp>
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_promotion.hpp> #include <boost/geometry/core/coordinate_promotion.hpp>
#include <boost/geometry/core/coordinate_system.hpp>
#include <boost/geometry/core/radian_access.hpp> #include <boost/geometry/core/radian_access.hpp>
#include <boost/geometry/core/tags.hpp> #include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/srs/spheroid.hpp>
#include <boost/geometry/strategies/distance.hpp>
#include <boost/geometry/strategies/concepts/distance_concept.hpp>
#include <boost/geometry/strategies/spherical/distance_cross_track.hpp>
#include <boost/geometry/strategies/spherical/distance_haversine.hpp>
#include <boost/geometry/strategies/spherical/point_in_point.hpp>
#include <boost/geometry/strategies/geographic/azimuth.hpp>
#include <boost/geometry/strategies/geographic/distance.hpp>
#include <boost/geometry/strategies/geographic/distance_cross_track.hpp> #include <boost/geometry/strategies/geographic/distance_cross_track.hpp>
#include <boost/geometry/strategies/geographic/parameters.hpp>
#include <boost/geometry/strategies/geographic/intersection.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/util/select_calculation_type.hpp> #include <boost/geometry/util/select_calculation_type.hpp>
#include <boost/geometry/util/normalize_spheroidal_coordinates.hpp>
#include <boost/geometry/formulas/mean_radius.hpp>
#include <boost/geometry/formulas/result_direct.hpp>
#include <boost/geometry/formulas/spherical.hpp>
#include <boost/geometry/formulas/vincenty_direct.hpp>
#ifdef BOOST_GEOMETRY_DEBUG_GEOGRAPHIC_CROSS_TRACK
#include <boost/geometry/io/dsv/write.hpp>
#endif
#ifndef BOOST_GEOMETRY_DETAIL_POINT_SEGMENT_DISTANCE_MAX_STEPS
#define BOOST_GEOMETRY_DETAIL_POINT_SEGMENT_DISTANCE_MAX_STEPS 100
#endif
#ifdef BOOST_GEOMETRY_DEBUG_GEOGRAPHIC_CROSS_TRACK
#include <iostream>
#endif
namespace boost { namespace geometry namespace boost { namespace geometry
{ {

5
include/boost/geometry/strategies/geographic/distance_cross_track.hpp
View File

@ -1,7 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2016-2022, Oracle and/or its affiliates. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2016-2022, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -14,8 +15,6 @@
#include <algorithm> #include <algorithm>
#include <boost/tuple/tuple.hpp>
#include <boost/algorithm/minmax.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>

63
include/boost/geometry/strategy/spherical/envelope_multipoint.hpp
View File

@ -1,7 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2015-2020, Oracle and/or its affiliates. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2015-2020, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -13,12 +14,11 @@
#ifndef BOOST_GEOMETRY_STRATEGY_SPHERICAL_ENVELOPE_MULTIPOINT_HPP #ifndef BOOST_GEOMETRY_STRATEGY_SPHERICAL_ENVELOPE_MULTIPOINT_HPP
#define BOOST_GEOMETRY_STRATEGY_SPHERICAL_ENVELOPE_MULTIPOINT_HPP #define BOOST_GEOMETRY_STRATEGY_SPHERICAL_ENVELOPE_MULTIPOINT_HPP
#include <cstddef>
#include <algorithm> #include <algorithm>
#include <cstddef>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <boost/algorithm/minmax_element.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/empty.hpp> #include <boost/range/empty.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
@ -62,8 +62,7 @@ private:
template <typename Point> template <typename Point>
inline bool operator()(Point const& point1, Point const& point2) const inline bool operator()(Point const& point1, Point const& point2) const
{ {
return math::smaller(geometry::get<Dim>(point1), return math::smaller(geometry::get<Dim>(point1), geometry::get<Dim>(point2));
geometry::get<Dim>(point2));
} }
}; };
@ -73,12 +72,6 @@ private:
bool& has_north_pole, bool& has_north_pole,
OutputIterator oit) OutputIterator oit)
{ {
typedef typename boost::range_value<MultiPoint>::type point_type;
typedef typename boost::range_iterator
<
MultiPoint const
>::type iterator_type;
// analyze point coordinates: // analyze point coordinates:
// (1) normalize point coordinates // (1) normalize point coordinates
// (2) check if any point is the north or the south pole // (2) check if any point is the north or the south pole
@ -89,20 +82,16 @@ private:
has_south_pole = false; has_south_pole = false;
has_north_pole = false; has_north_pole = false;
for (iterator_type it = boost::begin(multipoint); for (auto it = boost::begin(multipoint); it != boost::end(multipoint); ++it)
it != boost::end(multipoint);
++it)
{ {
point_type point; typename boost::range_value<MultiPoint>::type point;
normalize::spherical_point::apply(*it, point); normalize::spherical_point::apply(*it, point);
if (math::equals(geometry::get<1>(point), if (math::equals(geometry::get<1>(point), Constants::min_latitude()))
Constants::min_latitude()))
{ {
has_south_pole = true; has_south_pole = true;
} }
else if (math::equals(geometry::get<1>(point), else if (math::equals(geometry::get<1>(point), Constants::max_latitude()))
Constants::max_latitude()))
{ {
has_north_pole = true; has_north_pole = true;
} }
@ -118,12 +107,8 @@ private:
Value& max_gap_left, Value& max_gap_left,
Value& max_gap_right) Value& max_gap_right)
{ {
typedef typename boost::range_iterator auto it1 = boost::begin(sorted_range);
< auto it2 = it1;
SortedRange const
>::type iterator_type;
iterator_type it1 = boost::begin(sorted_range), it2 = it1;
++it2; ++it2;
max_gap_left = geometry::get<0>(*it1); max_gap_left = geometry::get<0>(*it1);
max_gap_right = geometry::get<0>(*it2); max_gap_right = geometry::get<0>(*it2);
@ -155,16 +140,9 @@ private:
CoordinateType& lon_min, CoordinateType& lon_min,
CoordinateType& lon_max) CoordinateType& lon_max)
{ {
typedef typename boost::range_iterator
<
PointRange const
>::type iterator_type;
// compute min and max longitude values // compute min and max longitude values
std::pair<iterator_type, iterator_type> min_max_longitudes auto const min_max_longitudes
= boost::minmax_element(boost::begin(range), = std::minmax_element(boost::begin(range), boost::end(range), lon_less);
boost::end(range),
lon_less);
lon_min = geometry::get<0>(*min_max_longitudes.first); lon_min = geometry::get<0>(*min_max_longitudes.first);
lon_max = geometry::get<0>(*min_max_longitudes.second); lon_max = geometry::get<0>(*min_max_longitudes.second);
@ -212,20 +190,16 @@ private:
else if (has_south_pole) else if (has_south_pole)
{ {
lat_min = Constants::min_latitude(); lat_min = Constants::min_latitude();
lat_max lat_max = geometry::get<1>(*std::max_element(first, last, lat_less));
= geometry::get<1>(*std::max_element(first, last, lat_less));
} }
else if (has_north_pole) else if (has_north_pole)
{ {
lat_min lat_min = geometry::get<1>(*std::min_element(first, last, lat_less));
= geometry::get<1>(*std::min_element(first, last, lat_less));
lat_max = Constants::max_latitude(); lat_max = Constants::max_latitude();
} }
else else
{ {
std::pair<Iterator, Iterator> min_max_latitudes auto const min_max_latitudes = std::minmax_element(first, last, lat_less);
= boost::minmax_element(first, last, lat_less);
lat_min = geometry::get<1>(*min_max_latitudes.first); lat_min = geometry::get<1>(*min_max_latitudes.first);
lat_max = geometry::get<1>(*min_max_latitudes.second); lat_max = geometry::get<1>(*min_max_latitudes.second);
} }
@ -237,11 +211,6 @@ public:
{ {
typedef typename point_type<MultiPoint>::type point_type; typedef typename point_type<MultiPoint>::type point_type;
typedef typename coordinate_type<MultiPoint>::type coordinate_type; typedef typename coordinate_type<MultiPoint>::type coordinate_type;
typedef typename boost::range_iterator
<
MultiPoint const
>::type iterator_type;
typedef math::detail::constants_on_spheroid typedef math::detail::constants_on_spheroid
< <
coordinate_type, coordinate_type,
@ -332,7 +301,7 @@ public:
geometry::detail::envelope::envelope_indexed_box_on_spheroid<max_corner, 2>::apply(helper_mbr, mbr); geometry::detail::envelope::envelope_indexed_box_on_spheroid<max_corner, 2>::apply(helper_mbr, mbr);
// compute envelope for higher coordinates // compute envelope for higher coordinates
iterator_type it = boost::begin(multipoint); auto it = boost::begin(multipoint);
geometry::detail::envelope::envelope_one_point<2, dimension<Box>::value>::apply(*it, mbr); geometry::detail::envelope::envelope_one_point<2, dimension<Box>::value>::apply(*it, mbr);
for (++it; it != boost::end(multipoint); ++it) for (++it; it != boost::end(multipoint); ++it)