std namespace fixes in headers.

[flightgear.git] / src / Airports / gnnode.cxx

diff --git a/src/Airports/gnnode.cxx b/src/Airports/gnnode.cxx
index c9883d812edda287d5fa6dd8b27f7b2fbe20f943..691a420640a19e6078338d50260d2f7afebd38ad 100644 (file)
--- a/src/Airports/gnnode.cxx
+++ b/src/Airports/gnnode.cxx
@@ -1,8 +1,15 @@
 #include "gnnode.hxx"
 #include "groundnetwork.hxx"
 
+#include <iostream>
 #include <algorithm>
+
+#include <osg/Geode>
+#include <Main/globals.hxx>
+#include <Scenery/scenery.hxx>
+
 using std::sort;
+using std::string;
 
 /*****************************************************************************
  * Helper function for parsing position string
@@ -31,9 +38,9 @@ double processPosition(const string &pos)
   return value;
 }
 
-bool sortByHeadingDiff(FGTaxiSegment *a, FGTaxiSegment *b) {
-  return a->hasSmallerHeadingDiff(*b);
-}
+//bool sortByHeadingDiff(FGTaxiSegment *a, FGTaxiSegment *b) {
+//  return a->hasSmallerHeadingDiff(*b);
+//}
 
 bool sortByLength(FGTaxiSegment *a, FGTaxiSegment *b) {
   return a->getLength() > b->getLength();
@@ -42,7 +49,10 @@ bool sortByLength(FGTaxiSegment *a, FGTaxiSegment *b) {
 /**************************************************************************
  * FGTaxiNode
  *************************************************************************/
-
+void FGTaxiNode::setElevation(double val)
+{
+    geod.setElevationM(val);
+}
 
 void FGTaxiNode::setLatitude (double val)
 {
@@ -64,10 +74,26 @@ void FGTaxiNode::setLongitude(const string& val)
   geod.setLongitudeDeg(processPosition(val));
 }
   
-void FGTaxiNode::sortEndSegments(bool byLength)
+double FGTaxiNode::getElevationFt(double refelev)
+{
+    double elevF = geod.getElevationFt();
+    double elevationEnd = 0;
+    if ((elevF == 0) || (elevF == refelev)) {
+        SGGeod center2 = geod;
+        FGScenery * local_scenery = globals->get_scenery();
+        center2.setElevationM(SG_MAX_ELEVATION_M);
+        if (local_scenery->get_elevation_m( center2, elevationEnd, NULL )) {
+            geod.setElevationM(elevationEnd);
+        }
+    }
+    //cerr << "Returning elevation : " << geod.getElevationM() << ". Ref elev (feet) = " << refelev << endl;
+    return geod.getElevationFt();
+}
+
+double FGTaxiNode::getElevationM(double refelev)
 {
-  if (byLength)
-    sort(next.begin(), next.end(), sortByLength);
-  else
-    sort(next.begin(), next.end(), sortByHeadingDiff);
+    //double refelevFt = refelev * SG_METER_TO_FEET;
+    //double retval = getElevationFt(refelevFt);
+    //cerr << "Returning elevation : " << geod.getElevationM() << ". Ref elev (meters) = " << refelev << endl;
+    return geod.getElevationM();
 }