Update route/waypoint tests for revised API

diff --git a/simgear/route/routetest.cxx b/simgear/route/routetest.cxx
index 4c10e7eebd1674085546b91e82c7ffdf7fa70652..3d59e0de6668faa06fa03dadccfd6e4d6b72906a 100644 (file)
--- 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 f0debfd93a1a12259a3d126c3720750f9316ea66..7e5b64a3aefe0ffb426f94a196041b6bc7af9e08 100644 (file)
--- 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;
 }