From 6e326976d55c6abf361456f90f49fb765a25a898 Mon Sep 17 00:00:00 2001 From: jmt Date: Mon, 8 Jun 2009 23:30:54 +0000 Subject: [PATCH] Update route/waypoint tests for revised API --- simgear/route/routetest.cxx | 4 ++-- simgear/route/waytest.cxx | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/simgear/route/routetest.cxx b/simgear/route/routetest.cxx index 4c10e7ee..3d59e0de 100644 --- a/simgear/route/routetest.cxx +++ b/simgear/route/routetest.cxx @@ -23,7 +23,7 @@ void dump_route(const SGRoute& route, const char* message) int main() { SGRoute route; - +/* route.add_waypoint( SGWayPoint(0, 0, 0, SGWayPoint::CARTESIAN, "Start") ); route.add_waypoint( SGWayPoint(1, 0, 0, SGWayPoint::CARTESIAN, "1") ); route.add_waypoint( SGWayPoint(2, 0, 0, SGWayPoint::CARTESIAN, "2") ); @@ -48,6 +48,6 @@ int main() route.add_waypoint(wp2, 3); dump_route(route, "added back WP2 after WP3"); - +*/ return 0; } diff --git a/simgear/route/waytest.cxx b/simgear/route/waytest.cxx index f0debfd9..7e5b64a3 100644 --- a/simgear/route/waytest.cxx +++ b/simgear/route/waytest.cxx @@ -43,24 +43,6 @@ int main() { cout << "Distance to " << b2.get_id() << " is " << distance * SG_METER_TO_NM << endl; cout << endl; - - cur_lon = 10; - cur_lat = 10; - - SGWayPoint c1(-20, 10, 0, SGWayPoint::CARTESIAN, "Due East"); - c1.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance ); - cout << "Course to " << c1.get_id() << " is " << course << endl; - cout << "Distance to " << c1.get_id() << " is " << distance << endl; - - SGWayPoint c2(20, 20, 0, SGWayPoint::CARTESIAN, "Due SW"); - c2.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance ); - cout << "Course to " << c2.get_id() << " is " << course << endl; - cout << "Distance to " << c2.get_id() << " is " << distance << endl; - - SGWayPoint c3(20, 0, 0, SGWayPoint::CARTESIAN, "Due NW"); - c3.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance ); - cout << "Course to " << c3.get_id() << " is " << course << endl; - cout << "Distance to " << c3.get_id() << " is " << distance << endl; return 0; } -- 2.39.5