Interim windows build fix

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

diff --git a/src/Airports/gnnode.cxx b/src/Airports/gnnode.cxx
index c9883d812edda287d5fa6dd8b27f7b2fbe20f943..84f3aac541ed6564644dad374182390e657e0b1e 100644 (file)
--- a/src/Airports/gnnode.cxx
+++ b/src/Airports/gnnode.cxx
@@ -1,73 +1,70 @@
 #include "gnnode.hxx"
-#include "groundnetwork.hxx"
 
-#include <algorithm>
-using std::sort;
+#include <boost/foreach.hpp>
 
-/*****************************************************************************
- * Helper function for parsing position string
- ****************************************************************************/
-double processPosition(const string &pos)
-{
-  string prefix;
-  string subs;
-  string degree;
-  string decimal;
-  int sign = 1;
-  double value;
-  subs = pos;
-  prefix= subs.substr(0,1);
-  if (prefix == string("S") || (prefix == string("W")))
-    sign = -1;
-  subs    = subs.substr(1, subs.length());
-  degree  = subs.substr(0, subs.find(" ",0));
-  decimal = subs.substr(subs.find(" ",0), subs.length());
-  
-             
-  //cerr << sign << " "<< degree << " " << decimal << endl;
-  value = sign * (atof(degree.c_str()) + atof(decimal.c_str())/60.0);
-  //cerr << value <<endl;
-  //exit(1);
-  return value;
-}
+#include "groundnetwork.hxx"
 
-bool sortByHeadingDiff(FGTaxiSegment *a, FGTaxiSegment *b) {
-  return a->hasSmallerHeadingDiff(*b);
-}
+#include <Navaids/NavDataCache.hxx>
+#include <Main/globals.hxx>
+#include <Scenery/scenery.hxx>
 
-bool sortByLength(FGTaxiSegment *a, FGTaxiSegment *b) {
-  return a->getLength() > b->getLength();
-}
+using namespace flightgear;
 
 /**************************************************************************
  * FGTaxiNode
  *************************************************************************/
 
+FGTaxiNode::FGTaxiNode(int index, const SGGeod& pos, bool aOnRunway, int aHoldType) :
+  FGPositioned(TRANSIENT_ID, FGPositioned::PARKING, "", pos),
+  m_index(index),
+  isOnRunway(aOnRunway),
+  holdType(aHoldType),
+  m_isPushback(false)
+{
+  
+}
+
+FGTaxiNode::~FGTaxiNode()
+{
+}
 
-void FGTaxiNode::setLatitude (double val)
+void FGTaxiNode::setElevation(double val)
 {
-  geod.setLatitudeDeg(val);
+  // ignored for the moment
 }
 
-void FGTaxiNode::setLongitude(double val)
+double FGTaxiNode::getElevationFt()
 {
-  geod.setLongitudeDeg(val);
+  const SGGeod& pos = geod();
+  if( pos.getElevationFt() == 0.0)
+  {
+    SGGeod center2 = pos;
+    FGScenery* local_scenery = globals->get_scenery();
+    center2.setElevationM(SG_MAX_ELEVATION_M);
+    double elevationEnd = -100;
+    if (local_scenery->get_elevation_m( center2, elevationEnd, NULL ))
+    {
+      SGGeod newPos = pos;
+      newPos.setElevationM(elevationEnd);
+      // this will call modifyPosition to update mPosition
+      modifyPosition(newPos);
+    }
+  }
+  
+  return pos.getElevationFt();
 }
 
-void FGTaxiNode::setLatitude (const string& val)
+int FGTaxiNode::getIndex() const
 {
-  geod.setLatitudeDeg(processPosition(val));
+    return m_index;
 }
 
-void FGTaxiNode::setLongitude(const string& val)
+void FGTaxiNode::setIsPushback()
 {
-  geod.setLongitudeDeg(processPosition(val));
+    m_isPushback = true;
 }
-  
-void FGTaxiNode::sortEndSegments(bool byLength)
+
+double FGTaxiNode::getElevationM()
 {
-  if (byLength)
-    sort(next.begin(), next.end(), sortByLength);
-  else
-    sort(next.begin(), next.end(), sortByHeadingDiff);
+  return getElevationFt() * SG_FEET_TO_METER;
 }