Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85065 - trunk/boost/geometry/extensions/gis/geographic/strategies
From: barend.gehrels_at_[hidden]
Date: 2013-07-17 17:24:33


Author: barendgehrels
Date: 2013-07-17 17:24:33 EDT (Wed, 17 Jul 2013)
New Revision: 85065
URL: http://svn.boost.org/trac/boost/changeset/85065

Log:
[geometry][extension] Updated andoyer adaption (comments, removed redundant namespace, fixed default_strategy template parameter)

Text files modified:
   trunk/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp | 7 ++++---
   1 files changed, 4 insertions(+), 3 deletions(-)

Modified: trunk/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp Wed Jul 17 17:16:34 2013 (r85064)
+++ trunk/boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp 2013-07-17 17:24:33 EDT (Wed, 17 Jul 2013) (r85065)
@@ -30,6 +30,7 @@
 /*!
 \brief Point-point distance approximation taking flattening into account
 \ingroup distance
+\tparam RadiusType Type of specified radius of the Earth
 \tparam CalculationType \tparam_calculation
 \author After Andoyer, 19xx, republished 1950, republished by Meeus, 1999
 \note Although not so well-known, the approximation is very good: in all cases the results
@@ -154,14 +155,14 @@
 {
 
 template <typename RadiusType, typename CalculationType>
-struct tag<strategy::distance::andoyer<RadiusType, CalculationType> >
+struct tag<andoyer<RadiusType, CalculationType> >
 {
     typedef strategy_tag_distance_point_point type;
 };
 
 
 template <typename RadiusType, typename CalculationType, typename P1, typename P2>
-struct return_type<strategy::distance::andoyer<RadiusType, CalculationType>, P1, P2>
+struct return_type<andoyer<RadiusType, CalculationType>, P1, P2>
     : andoyer<RadiusType, CalculationType>::template calculation_type<P1, P2>
 {};
 
@@ -197,7 +198,7 @@
 template <typename Point1, typename Point2>
 struct default_strategy<point_tag, Point1, Point2, geographic_tag, geographic_tag>
 {
- typedef strategy::distance::andoyer<double> type;
+ typedef strategy::distance::andoyer<typename select_coordinate_type<Point1, Point2>::type> type;
 };
 
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk