Initial commit of the new sound system, expect more updates to follow

[flightgear.git] / src / Navaids / awynet.hxx

diff --git a/src/Navaids/awynet.hxx b/src/Navaids/awynet.hxx
index 9dd7123067bc8d08a43ed1dcb95d2b7351bd50cb..81bc073a9a9c08c22290f6fcbeb1e05bd5a619f2 100755 (executable)
--- a/src/Navaids/awynet.hxx
+++ b/src/Navaids/awynet.hxx
@@ -24,7 +24,7 @@
 #ifndef _AIRWAYNETWORK_HXX_
 #define _AIRWAYNETWORK_HXX_
 
-#include STL_STRING
+#include <string>
 #include <istream>
 #include <set>
 #include <map>
@@ -50,24 +50,21 @@ class FGNode
 {
 private:
   std::string ident;
-  double lat;
-  double lon;
+  SGGeod geod;
   int index;
   FGAirwayPointerVector next; // a vector to all the segments leaving from this node
 
 public:
   FGNode();
-  FGNode(double lt, double ln, int idx, std::string id) { lat = lt; lon = ln; index = idx; ident = id;};
+  FGNode(double lt, double ln, int idx, std::string id);
 
   void setIndex(int idx)                  { index = idx;};
-  void setLatitude (double val)           { lat = val;};
-  void setLongitude(double val)           { lon = val;};
-  //void setLatitude (const std::string& val)           { lat = processPosition(val);  };
-  //void setLongitude(const std::string& val)           { lon = processPosition(val);  };
   void addAirway(FGAirway *segment) { next.push_back(segment); };
 
-  double getLatitude() { return lat;};
-  double getLongitude(){ return lon;};
+  double getLatitude() { return geod.getLatitudeDeg();};
+  double getLongitude(){ return geod.getLongitudeDeg();};
+
+  const SGGeod& getPosition() {return geod;}
 
   int getIndex() { return index; };
   std::string getIdent() { return ident; };