//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#define _WAYPOINT_HXX
-#ifndef __cplusplus
+#ifndef __cplusplus
# error This library requires C++
-#endif
-
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
#endif
+
#include <simgear/compiler.h>
#include STL_STRING
double distance;
string id;
+ string name;
public:
- /** Default constructor */
- SGWayPoint();
-
/**
* Construct a waypoint
* @param lon destination longitude
* @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();
* @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; }
inline void set_distance( double d ) { distance = d; }
/** @return waypoint id */
- inline string get_id() const { return id; }
+ inline const string& get_id() const { return id; }
+
+ /** @return waypoint name */
+ inline const string& get_name() const { return name; }
};