Interim windows build fix

[flightgear.git] / src / Airports / parking.hxx

diff --git a/src/Airports/parking.hxx b/src/Airports/parking.hxx
index ff466d256f56d1951f27e79b897b50a7ccff211d..9966553651229e2414bc8692dca4db87b0a3b8a4 100644 (file)
--- a/src/Airports/parking.hxx
+++ b/src/Airports/parking.hxx
@@ -33,11 +33,10 @@
 #include <simgear/sg_inlines.h>
 
 #include <string>
-#include <vector>
 #include <memory> // for std::auto_ptr
 
 #include "gnnode.hxx"
-
+#include <Airports/airports_fwd.hxx>
 
 class FGParking : public FGTaxiNode
 {
@@ -47,24 +46,16 @@ private:
   const std::string parkingName;
   const std::string type;
   const std::string airlineCodes;
-  const PositionedID pushBackPoint;
+  FGTaxiNodeRef pushBackPoint;
 
   SG_DISABLE_COPY(FGParking);
 public:
-  FGParking(PositionedID aGuid, const SGGeod& pos,
+  FGParking(int index,
+            const SGGeod& pos,
             double heading, double radius,
             const std::string& name, const std::string& type,
-            const std::string& codes,
-            PositionedID pushBackNode);
+            const std::string& codes);
   virtual ~FGParking();
-#if 0
-  void setHeading  (double hdg)  { heading     = hdg;  };
-  void setRadius   (double rad)  { radius      = rad;  };
-
-  void setName     (const std::string& name) { parkingName = name; };
-  void setType     (const std::string& tpe)  { type        = tpe;  };
-  void setCodes    (const std::string& codes){ airlineCodes= codes;};
-#endif
   
   double getHeading  () const { return heading;     };
   double getRadius   () const { return radius;      };
@@ -73,14 +64,14 @@ public:
   std::string getCodes    () const { return airlineCodes;};
   std::string getName     () const { return parkingName; };
 
-  int getPushBackPoint () { return pushBackPoint; };
+  // TODO do parkings have different name and ident?
+  virtual const std::string& name() const { return parkingName; }
+
+  void setPushBackPoint(const FGTaxiNodeRef& node);
+  FGTaxiNodeRef getPushBackPoint () { return pushBackPoint; };
 
   bool operator< (const FGParking &other) const {
     return radius < other.radius; };
 };
 
-typedef std::vector<FGParking*> FGParkingVec;
-typedef FGParkingVec::iterator FGParkingVecIterator;
-typedef FGParkingVec::const_iterator FGParkingVecConstIterator;
-
 #endif