Ready for 0.3.8 release.

[simgear.git] / simgear / route / waypoint.hxx

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index a02b6e31fe35fcaf28d23c9ecd42618f93246840..a95b030f3576bdf8cefdfeb0c4e5898360590dca 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING
@@ -80,12 +76,10 @@ private:
     double distance;
 
     string id;
+    string name;
 
 public:
 
-    /** Default constructor */
-    SGWayPoint();
-
     /**
      * Construct a waypoint
      * @param lon destination longitude
@@ -93,9 +87,11 @@ public:
      * @param alt target altitude
      * @param mode type of coordinates/math to use
      * @param s waypoint identifier
+     * @param n waypoint name
      */
-    SGWayPoint( const double lon, const double lat, const double alt,
-               const modetype m = WGS84, const string s = "" );
+    SGWayPoint( const double lon = 0.0, const double lat = 0.0,
+               const double alt = 0.0, const modetype m = WGS84,
+               const string s = "", const string n = "" );
 
     /** Destructor */
     ~SGWayPoint();
@@ -110,21 +106,21 @@ public:
      * @param cur_lat (in) current latitude
      * @param cur_alt (in) current altitude
      * @param course (out) heading from current location to this waypoint
-     * @param distance (out) distance from current location to this waypoint
+     * @param dist (out) distance from current location to this waypoint
      */
     void CourseAndDistance( const double cur_lon, const double cur_lat,
                            const double cur_alt,
-                           double *course, double *distance ) const;
+                           double *course, double *dist ) const;
 
     /**
      * Calculate course and distances between a specified starting waypoint
      * and this waypoint.
      * @param wp (in) original waypoint
      * @param course (out) heading from current location to this waypoint
-     * @param distance (out) distance from current location to this waypoint
+     * @param dist (out) distance from current location to this waypoint
      */
     void CourseAndDistance( const SGWayPoint &wp,
-                           double *course, double *distance ) const;
+                           double *course, double *dist ) const;
 
     /** @return waypoint mode */
     inline modetype get_mode() const { return mode; }
@@ -159,6 +155,9 @@ public:
     /** @return waypoint id */
     inline string get_id() const { return id; }
 
+    /** @return waypoint name */
+    inline string get_name() const { return name; }
+
 };