Minor compiler version detection issue.

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

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index dbd831d3648e41be117159603615a1b4d285b6a3..275d648e6811b822ed4941dd92d74eb1e3ebbe32 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -27,12 +27,6 @@
 #ifndef _WAYPOINT_HXX
 #define _WAYPOINT_HXX
 
-
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-
 #include <simgear/compiler.h>
 
 #include <simgear/math/SGMath.hxx>
@@ -61,19 +55,18 @@ public:
      */
     enum modetype { 
        WGS84 = 0,
-       SPHERICAL = 1,
     };
 
 private:
-
-    modetype mode;
-
     SGGeod pos;
-    double distance;
-
     std::string id;
     std::string name;
-
+    
+  // route data associated with the waypoint
+    double _distance;
+    double _track;
+    double _speed;
+    
 public:
 
     /**
@@ -137,6 +130,12 @@ public:
 
     inline const SGGeod& get_target() const { return pos; }
 
+    /**
+     *
+     */
+    inline void setTargetAltFt(double elev)
+    { pos.setElevationFt(elev); }
+
     /**
      * This value is not calculated by this class.  It is simply a
      * placeholder for the user to stash a distance value.  This is useful
@@ -147,14 +146,20 @@ public:
      * is for your convenience only.
      * @return waypoint distance holder (what ever the user has stashed here)
      */
-    inline double get_distance() const { return distance; }
+    inline double get_distance() const { return _distance; }
 
     /**
      * Set the waypoint distance value to a value of our choice.
      * @param d distance 
      */
-    inline void set_distance( double d ) { distance = d; }
+    inline void set_distance( double d ) { _distance = d; }
+
+    inline double get_track() const { return _track; }
+    inline void set_track(double t) { _track = t; }
 
+    inline double get_speed() const { return _speed; }
+    inline void set_speed(double v) { _speed = v; }
+    
     /** @return waypoint id */
     inline const std::string& get_id() const { return id; }