X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Froute%2Fwaytest.cxx;h=e80920a7535c68fbf1ac1b0107d576fc2cc44de9;hb=7bdb530440d1dadc991f305edb1b70ec85f27451;hp=ec748697420196ae36a5dca1fe30469e938e3836;hpb=c481b064518d1b9b4225c8b6b25e45c6a2e229a6;p=simgear.git

diff --git a/simgear/route/waytest.cxx b/simgear/route/waytest.cxx
index ec748697..e80920a7 100644
--- a/simgear/route/waytest.cxx
+++ b/simgear/route/waytest.cxx
@@ -1,9 +1,16 @@
+#include <simgear/compiler.h>
 #include <simgear/constants.h>
+
+#include <iostream>
+
 #include "waypoint.hxx"
 
+using std::cout;
+using std::endl;
+
 int main() {
     SGWayPoint a1(-93.216923, 44.880547, 0.0, SGWayPoint::WGS84, "KMSP");
-    SGWayPoint a2(-93.216923, 44.880547, 0.0, SGWayPoint::SPHERICAL, "KMSP");
+
 
     // KMSN (Madison)
     double cur_lon = -89.336939;
@@ -14,46 +21,18 @@ int main() {
 
     a1.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance );
     cout << "Course to " << a1.get_id() << " is " << course << endl;
-    cout << "Distance to " << a1.get_id() << " is " << distance * METER_TO_NM
+    cout << "Distance to " << a1.get_id() << " is " << distance * SG_METER_TO_NM
 	 << endl;
 
-    a2.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance );
-    cout << "Course to " << a2.get_id() << " is " << course << endl;
-    cout << "Distance to " << a2.get_id() << " is " << distance * METER_TO_NM
-	 << endl;
-    cout << endl;
-
     SGWayPoint b1(-88.237037, 43.041038, 0.0, SGWayPoint::WGS84, "KUES");
-    SGWayPoint b2(-88.237037, 43.041038, 0.0, SGWayPoint::SPHERICAL, "KUES");
+
 
     b1.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance );
     cout << "Course to " << b1.get_id() << " is " << course << endl;
-    cout << "Distance to " << b1.get_id() << " is " << distance * METER_TO_NM
+    cout << "Distance to " << b1.get_id() << " is " << distance * SG_METER_TO_NM
 	 << endl;
 
-    b2.CourseAndDistance( cur_lon, cur_lat, cur_alt, &course, &distance );
-    cout << "Course to " << b2.get_id() << " is " << course << endl;
-    cout << "Distance to " << b2.get_id() << " is " << distance * 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;
 }