X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAirports%2Fgroundnetwork.hxx;h=06ed98b12710f1f92aa1137a2a60cb78ca129d2f;hb=52b0baace1d3ef636b4e1c8f8f1bd047f8d0b023;hp=ae9aa4d207a79aa3de3065cc359b1b167e427f66;hpb=d9bfd5a425df1bad7e3c53a64adce871e299a6b9;p=flightgear.git

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index ae9aa4d20..06ed98b12 100644
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include "gnnode.hxx"
 #include "parking.hxx"
@@ -162,7 +162,7 @@ private:
   intVec nodes;
   intVec routes;
   double distance;
-  int depth;
+//  int depth;
   intVecIterator currNode;
   intVecIterator currRoute;
 
@@ -173,14 +173,14 @@ public:
     routes = rts;
     distance = dist; 
     currNode = nodes.begin();
-    depth = dpth;
+//    depth = dpth;
   };
 
   FGTaxiRoute& operator= (const FGTaxiRoute &other) {
     nodes = other.nodes;
     routes = other.routes;
     distance = other.distance;
-    depth = other.depth;
+//    depth = other.depth;
     currNode = nodes.begin();
     currRoute = routes.begin();
     return *this;
@@ -190,7 +190,7 @@ public:
     nodes(copy.nodes),
     routes(copy.routes),
     distance(copy.distance),
-    depth(copy.depth),
+//    depth(copy.depth),
     currNode(nodes.begin()),
     currRoute(routes.begin())
   {};
@@ -203,7 +203,7 @@ public:
   
   void first() { currNode = nodes.begin(); currRoute = routes.begin(); };
   int size() { return nodes.size(); };
-  int getDepth() { return depth; };
+//  int getDepth() { return depth; };
 };
 
 typedef vector<FGTaxiRoute> TaxiRouteVector;
@@ -227,7 +227,6 @@ private:
   TaxiRouteVector routes;
   TrafficVector activeTraffic;
   TrafficVectorIterator currTraffic;
-  SGWayPoint destination;
 
   bool foundRoute;
   double totalDistance, maxDistance;
@@ -253,9 +252,12 @@ public:
   void init();
   bool exists() { return hasNetwork; };
   void setTowerController(FGTowerController *twrCtrlr) { towerController = twrCtrlr; };
+
   int findNearestNode(double lat, double lon);
-  FGTaxiNode *findNode(int idx);
-  FGTaxiSegment *findSegment(int idx);
+  int findNearestNode(const SGGeod& aGeod);
+
+  FGTaxiNode *findNode(unsigned idx);
+  FGTaxiSegment *findSegment(unsigned idx);
   FGTaxiRoute findShortestRoute(int start, int end, bool fullSearch=true);
   //void trace(FGTaxiNode *, int, int, double dist);
 
@@ -267,7 +269,7 @@ public:
 				double lat, double lon, double hdg, double spd, double alt, 
 				double radius, int leg, FGAIAircraft *aircraft);
   virtual void signOff(int id);
-  virtual void update(int id, double lat, double lon, double heading, double speed, double alt, double dt);
+  virtual void updateAircraftInformation(int id, double lat, double lon, double heading, double speed, double alt, double dt);
   virtual bool hasInstruction(int id);
   virtual FGATCInstruction getInstruction(int id);