diff options
Diffstat (limited to 'boost/geometry/strategies/strategies.hpp')
-rw-r--r-- | boost/geometry/strategies/strategies.hpp | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/boost/geometry/strategies/strategies.hpp b/boost/geometry/strategies/strategies.hpp index 342485cc4c..f3c6787a4b 100644 --- a/boost/geometry/strategies/strategies.hpp +++ b/boost/geometry/strategies/strategies.hpp @@ -4,9 +4,10 @@ // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -// This file was modified by Oracle on 2014-2016. -// Modifications copyright (c) 2014-2016 Oracle and/or its affiliates. +// This file was modified by Oracle on 2014-2017. +// Modifications copyright (c) 2014-2017 Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, 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 @@ -23,18 +24,24 @@ #include <boost/geometry/strategies/tags.hpp> #include <boost/geometry/strategies/area.hpp> +#include <boost/geometry/strategies/azimuth.hpp> #include <boost/geometry/strategies/buffer.hpp> #include <boost/geometry/strategies/centroid.hpp> #include <boost/geometry/strategies/compare.hpp> #include <boost/geometry/strategies/convex_hull.hpp> +#include <boost/geometry/strategies/covered_by.hpp> +#include <boost/geometry/strategies/disjoint.hpp> #include <boost/geometry/strategies/distance.hpp> +#include <boost/geometry/strategies/envelope.hpp> #include <boost/geometry/strategies/intersection.hpp> #include <boost/geometry/strategies/intersection_strategies.hpp> // for backward compatibility +#include <boost/geometry/strategies/relate.hpp> #include <boost/geometry/strategies/side.hpp> #include <boost/geometry/strategies/transform.hpp> #include <boost/geometry/strategies/within.hpp> #include <boost/geometry/strategies/cartesian/area_surveyor.hpp> +#include <boost/geometry/strategies/cartesian/azimuth.hpp> #include <boost/geometry/strategies/cartesian/box_in_box.hpp> #include <boost/geometry/strategies/cartesian/buffer_end_flat.hpp> #include <boost/geometry/strategies/cartesian/buffer_end_round.hpp> @@ -47,30 +54,42 @@ #include <boost/geometry/strategies/cartesian/centroid_average.hpp> #include <boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp> #include <boost/geometry/strategies/cartesian/centroid_weighted_length.hpp> +#include <boost/geometry/strategies/cartesian/disjoint_segment_box.hpp> #include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp> #include <boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp> #include <boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp> #include <boost/geometry/strategies/cartesian/distance_projected_point.hpp> #include <boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp> +#include <boost/geometry/strategies/cartesian/envelope_segment.hpp> +#include <boost/geometry/strategies/cartesian/intersection.hpp> #include <boost/geometry/strategies/cartesian/point_in_box.hpp> #include <boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp> #include <boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp> #include <boost/geometry/strategies/cartesian/side_by_triangle.hpp> -#include <boost/geometry/strategies/spherical/area_huiller.hpp> +#include <boost/geometry/strategies/spherical/area.hpp> +#include <boost/geometry/strategies/spherical/azimuth.hpp> #include <boost/geometry/strategies/spherical/distance_haversine.hpp> #include <boost/geometry/strategies/spherical/distance_cross_track.hpp> #include <boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp> #include <boost/geometry/strategies/spherical/compare_circular.hpp> +#include <boost/geometry/strategies/spherical/envelope_segment.hpp> #include <boost/geometry/strategies/spherical/intersection.hpp> #include <boost/geometry/strategies/spherical/ssf.hpp> +#include <boost/geometry/strategies/geographic/area.hpp> +#include <boost/geometry/strategies/geographic/azimuth.hpp> +#include <boost/geometry/strategies/geographic/distance.hpp> #include <boost/geometry/strategies/geographic/distance_andoyer.hpp> #include <boost/geometry/strategies/geographic/distance_thomas.hpp> #include <boost/geometry/strategies/geographic/distance_vincenty.hpp> -//#include <boost/geometry/strategies/geographic/side_andoyer.hpp> -//#include <boost/geometry/strategies/geographic/side_thomas.hpp> -//#include <boost/geometry/strategies/geographic/side_vincenty.hpp> +#include <boost/geometry/strategies/geographic/envelope_segment.hpp> +#include <boost/geometry/strategies/geographic/intersection.hpp> +//#include <boost/geometry/strategies/geographic/intersection_elliptic.hpp> +#include <boost/geometry/strategies/geographic/side.hpp> +#include <boost/geometry/strategies/geographic/side_andoyer.hpp> +#include <boost/geometry/strategies/geographic/side_thomas.hpp> +#include <boost/geometry/strategies/geographic/side_vincenty.hpp> #include <boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp> #include <boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp> @@ -80,8 +99,6 @@ #include <boost/geometry/strategies/agnostic/point_in_poly_winding.hpp> #include <boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp> -#include <boost/geometry/strategies/agnostic/relate.hpp> - #include <boost/geometry/strategies/strategy_transform.hpp> #include <boost/geometry/strategies/transform/matrix_transformers.hpp> |