diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-04-08 03:09:47 +0000 |
|---|---|---|
| committer | <> | 2015-05-05 14:37:32 +0000 |
| commit | f2541bb90af059680aa7036f315f052175999355 (patch) | |
| tree | a5b214744b256f07e1dc2bd7273035a7808c659f /libs/geometry/example/c10_custom_cs_example.cpp | |
| parent | ed232fdd34968697a68783b3195b1da4226915b5 (diff) | |
| download | boost-tarball-master.tar.gz | |
Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master
Diffstat (limited to 'libs/geometry/example/c10_custom_cs_example.cpp')
| -rw-r--r-- | libs/geometry/example/c10_custom_cs_example.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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 |