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

[algorithms] [util] Rename is_inverse utility and update copyright notes

Browse Source
This commit is contained in:
Vissarion Fysikopoulos 2018-07-09 12:58:34 +03:00
parent 65084bb854
commit f04c25f43d
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/geometry/algorithms/detail/assign_values.hpp
View File

@ -7,6 +7,11 @@
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2018.
// Modifications copyright (c) 2018, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, 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
// http://www.boost.org/LICENSE_1_0.txt)
@ -34,7 +39,7 @@
#include <boost/geometry/geometries/concepts/check.hpp>
#include <boost/geometry/util/is_inverse.hpp>
#include <boost/geometry/util/is_inverse_spheroidal_coordinates.hpp>
#include <boost/geometry/util/for_each_coordinate.hpp>

6
include/boost/geometry/algorithms/detail/envelope/box.hpp
View File

@ -4,8 +4,8 @@
// Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
// This file was modified by Oracle on 2015, 2016, 2017.
// Modifications copyright (c) 2015-2017, Oracle and/or its affiliates.
// This file was modified by Oracle on 2015-2018.
// Modifications copyright (c) 2015-2018, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@ -126,7 +126,7 @@ struct envelope_box_on_spheroid
{
BoxIn box_in_normalized = box_in;
if (!is_inverse(box_in))
if (!is_inverse_spheroidal_coordinates(box_in))
{
box_in_normalized = detail::return_normalized<BoxIn>(box_in);
}

4
include/boost/geometry/algorithms/detail/envelope/range_of_boxes.hpp
View File

@ -1,6 +1,6 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2015-2017, Oracle and/or its affiliates.
// Copyright (c) 2015-2018, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@ -272,7 +272,7 @@ struct envelope_range_of_boxes
it != boost::end(range_of_boxes);
++it)
{
if (is_inverse(*it))
if (is_inverse_spheroidal_coordinates(*it))
{
continue;
}

8
include/boost/geometry/algorithms/detail/expand/point.hpp
View File

@ -5,8 +5,8 @@
// Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
// Copyright (c) 2014-2015 Samuel Debionne, Grenoble, France.
// This file was modified by Oracle on 2015, 2016, 2017.
// Modifications copyright (c) 2015-2017, Oracle and/or its affiliates.
// This file was modified by Oracle on 2015-2018.
// Modifications copyright (c) 2015-2018, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@ -35,7 +35,7 @@
#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/core/tags.hpp>
#include <boost/geometry/util/is_inverse.hpp>
#include <boost/geometry/util/is_inverse_spheroidal_coordinates.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/util/select_coordinate_type.hpp>
@ -117,7 +117,7 @@ struct point_loop_on_spheroid
box_point_type box_point;
detail::envelope::transform_units(p_normalized, box_point);
if (is_inverse(box))
if (is_inverse_spheroidal_coordinates(box))
{
geometry::set_from_radian<min_corner, 0>(box, geometry::get_as_radian<0>(p_normalized));
geometry::set_from_radian<min_corner, 1>(box, geometry::get_as_radian<1>(p_normalized));

8
include/boost/geometry/util/is_inverse.hpp → include/boost/geometry/util/is_inverse_spheroidal_coordinates.hpp
View File

@ -8,8 +8,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_UTIL_IS_INVERSE_HPP
#define BOOST_GEOMETRY_UTIL_IS_INVERSE_HPP
#ifndef BOOST_GEOMETRY_UTIL_IS_INVERSE_SPHEROIDAL_COORDINATES_HPP
#define BOOST_GEOMETRY_UTIL_IS_INVERSE_SPHEROIDAL_COORDINATES_HPP
#include <boost/geometry/util/math.hpp>
@ -24,7 +24,7 @@ struct bounds
};
template <typename Box>
bool is_inverse(Box const& box)
bool is_inverse_spheroidal_coordinates(Box const& box)
{
typedef typename point_type<Box>::type point_type;
typedef typename coordinate_type<point_type>::type bound_type;
@ -40,4 +40,4 @@ bool is_inverse(Box const& box)
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_UTIL_IS_INVERSE_HPP
#endif // BOOST_GEOMETRY_UTIL_IS_INVERSE_SPHEROIDAL_COORDINATES_HPP

4
test/algorithms/envelope_expand/expand_on_spheroid.cpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test
// Copyright (c) 2015-2017, Oracle and/or its affiliates.
// Copyright (c) 2015-2018, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@ -245,7 +245,7 @@ private:
//if the input box is the special one made from make_inverse
//do not convert coordinates
if (!is_inverse(box))
if (!is_inverse_spheroidal_coordinates(box))
{
bg::detail::indexed_point_view<Box const, 0> p_min(box);
bg::detail::indexed_point_view<Box const, 1> p_max(box);