diff options
Diffstat (limited to 'boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp')
| -rw-r--r-- | boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp b/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp index c55be03435..04032c6237 100644 --- a/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp +++ b/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp @@ -59,7 +59,7 @@ public: longitude_interval(T const& left, T const& right) { m_end[0] = left; - m_end[1] = right; + m_end[1] = right; } template <std::size_t Index> @@ -162,11 +162,6 @@ struct envelope_range_of_boxes_by_expansion { typedef typename boost::range_value<RangeOfBoxes>::type box_type; - typedef typename boost::range_iterator - < - RangeOfBoxes const - >::type iterator_type; - // first initialize MBR detail::indexed_point_view<Box, min_corner> mbr_min(mbr); detail::indexed_point_view<Box, max_corner> mbr_max(mbr); @@ -194,7 +189,7 @@ struct envelope_range_of_boxes_by_expansion >::apply(first_box_max, mbr_max); // now expand using the remaining boxes - iterator_type it = boost::begin(range_of_boxes); + auto it = boost::begin(range_of_boxes); for (++it; it != boost::end(range_of_boxes); ++it) { detail::expand::indexed_loop @@ -237,10 +232,6 @@ struct envelope_range_of_boxes typedef typename boost::range_value<RangeOfBoxes>::type box_type; typedef typename coordinate_type<box_type>::type coordinate_type; typedef typename detail::cs_angular_units<box_type>::type units_type; - typedef typename boost::range_iterator - < - RangeOfBoxes const - >::type iterator_type; static const bool is_equatorial = ! std::is_same < @@ -258,39 +249,40 @@ struct envelope_range_of_boxes BOOST_GEOMETRY_ASSERT(! boost::empty(range_of_boxes)); - iterator_type it_min = std::min_element(boost::begin(range_of_boxes), - boost::end(range_of_boxes), - latitude_less<min_corner>()); - iterator_type it_max = std::max_element(boost::begin(range_of_boxes), - boost::end(range_of_boxes), - latitude_less<max_corner>()); + auto const it_min = std::min_element(boost::begin(range_of_boxes), + boost::end(range_of_boxes), + latitude_less<min_corner>()); + auto const it_max = std::max_element(boost::begin(range_of_boxes), + boost::end(range_of_boxes), + latitude_less<max_corner>()); coordinate_type const min_longitude = constants::min_longitude(); coordinate_type const max_longitude = constants::max_longitude(); coordinate_type const period = constants::period(); interval_range_type intervals; - for (iterator_type it = boost::begin(range_of_boxes); + for (auto it = boost::begin(range_of_boxes); it != boost::end(range_of_boxes); ++it) { - if (is_inverse_spheroidal_coordinates(*it)) + auto const& box = *it; + if (is_inverse_spheroidal_coordinates(box)) { continue; } - coordinate_type lat_min = geometry::get<min_corner, 1>(*it); - coordinate_type lat_max = geometry::get<max_corner, 1>(*it); + coordinate_type lat_min = geometry::get<min_corner, 1>(box); + coordinate_type lat_max = geometry::get<max_corner, 1>(box); if (math::equals(lat_min, constants::max_latitude()) || math::equals(lat_max, constants::min_latitude())) { // if the box degenerates to the south or north pole // just ignore it continue; - } + } - coordinate_type lon_left = geometry::get<min_corner, 0>(*it); - coordinate_type lon_right = geometry::get<max_corner, 0>(*it); + coordinate_type lon_left = geometry::get<min_corner, 0>(box); + coordinate_type lon_right = geometry::get<max_corner, 0>(box); if (math::larger(lon_right, max_longitude)) { |