diff options
Diffstat (limited to 'libs/geometry/example')
4 files changed, 3 insertions, 10 deletions
diff --git a/libs/geometry/example/06_b_transformation_example.cpp b/libs/geometry/example/06_b_transformation_example.cpp index db125ff53..c15365f6e 100644 --- a/libs/geometry/example/06_b_transformation_example.cpp +++ b/libs/geometry/example/06_b_transformation_example.cpp @@ -27,7 +27,6 @@ # include <boost/geometry/io/svg/write_svg.hpp> #endif -#include <boost/bind.hpp> #include <boost/random.hpp> #include <boost/range.hpp> #include <boost/shared_ptr.hpp> diff --git a/libs/geometry/example/c03_custom_linestring_example.cpp b/libs/geometry/example/c03_custom_linestring_example.cpp index 8c6fd3697..587695749 100644 --- a/libs/geometry/example/c03_custom_linestring_example.cpp +++ b/libs/geometry/example/c03_custom_linestring_example.cpp @@ -18,8 +18,6 @@ #include <boost/geometry/geometries/register/point.hpp> #include <boost/geometry/geometries/register/linestring.hpp> -// To register the 'geographic' distance function to calculate distance over the earth: -#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp> #include <boost/geometry/extensions/algorithms/parse.hpp> // Define a GPS point with coordinates in latitude/longitude and some additional values diff --git a/libs/geometry/example/c10_custom_cs_example.cpp b/libs/geometry/example/c10_custom_cs_example.cpp index 098916cd6..3a802cc79 100644 --- a/libs/geometry/example/c10_custom_cs_example.cpp +++ b/libs/geometry/example/c10_custom_cs_example.cpp @@ -14,10 +14,6 @@ #include <boost/geometry/geometry.hpp> -#ifdef OPTIONALLY_ELLIPSOIDAL // see below -#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp> -#endif - // 1: declare a coordinate system. For example for Mars // Like for the Earth, we let the use choose between degrees or radians // (Unfortunately, in real life Mars has two coordinate systems: @@ -54,7 +50,7 @@ namespace boost { namespace geometry { namespace strategy { namespace distance { { template <typename Point1, typename Point2> -struct default_strategy<point_tag, Point1, Point2, martian_tag, martian_tag> +struct default_strategy<point_tag, point_tag, Point1, Point2, martian_tag, martian_tag> { typedef haversine<double> type; }; @@ -98,7 +94,7 @@ int main() // giving 834.444 km d = boost::geometry::distance(viking1, pathfinder, boost::geometry::strategy::distance::andoyer<mars_point> - (boost::geometry::detail::ellipsoid<double>(3396.2, 3376.2))); + (boost::geometry::srs::spheroid<double>(3396.2, 3376.2))); std::cout << "Ellipsoidal distance: " << d << " km" << std::endl; #endif diff --git a/libs/geometry/example/c11_custom_cs_transform_example.cpp b/libs/geometry/example/c11_custom_cs_transform_example.cpp index 84c94eb06..b6878b6e7 100644 --- a/libs/geometry/example/c11_custom_cs_transform_example.cpp +++ b/libs/geometry/example/c11_custom_cs_transform_example.cpp @@ -90,7 +90,7 @@ namespace boost { namespace geometry { namespace strategy { namespace distance { }; template <> - struct default_strategy<point_tag, point1, point2, cartesian_tag, cartesian_tag> + struct default_strategy<point_tag, point_tag, point1, point2, cartesian_tag, cartesian_tag> { typedef shift_and_calc_distance type; }; |