Clean up naming of the 'point on runway' helpers, to get rid of the confusing

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

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index 8b2aaf10f30ab9c7ade17ed962c4da22f7e05250..0a25f8d46249acf29132f1c3462d558719da9a0b 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -30,7 +30,6 @@
 #include <simgear/compiler.h>
 
 #include <string>
-#include <map>
 #include <vector>
 
 #include "Navaids/positioned.hxx"
@@ -38,8 +37,10 @@
 // forward decls
 class FGAirportDynamics;
 class FGRunway;
+class FGTaxiway;
 
 typedef SGSharedPtr<FGRunway> FGRunwayPtr;
+typedef SGSharedPtr<FGTaxiway> FGTaxiwayPtr;
 
 /***************************************************************************************
  *
@@ -94,9 +95,10 @@ public:
     bool hasHardRunwayOfLengthFt(double aLengthFt) const;
     
     unsigned int numTaxiways() const;
-    FGRunway* getTaxiwayByIndex(unsigned int aIndex) const;
+    FGTaxiway* getTaxiwayByIndex(unsigned int aIndex) const;
     
-    void addRunway(FGRunway* aRunway);
+    void setRunwaysAndTaxiways(std::vector<FGRunwayPtr>& rwys,
+      std::vector<FGTaxiwayPtr>& txwys);
     
     class AirportFilter : public Filter
      {
@@ -123,6 +125,26 @@ public:
       * passes all airports, including seaports and heliports.
       */
      static FGAirport* findClosest(const SGGeod& aPos, double aCuttofNm, Filter* filter = NULL);
+     
+     /**
+      * Helper to look up an FGAirport instance by unique ident. Throws an 
+      * exception if the airport could not be found - so callers can assume
+      * the result is non-NULL.
+      */
+     static FGAirport* getByIdent(const std::string& aIdent);
+     
+     /**
+      * Helper to look up an FGAirport instance by unique ident. Returns NULL
+      * if the airport could not be found.
+      */
+     static FGAirport* findByIdent(const std::string& aIdent);
+     
+     /**
+      * Specialised helper to implement the AirportList dialog. Performs a
+      * case-insensitive search on airport names and ICAO codes, and returns
+      * matches in a format suitable for use by a puaList. 
+      */
+     static char** searchNamesAndIdents(const std::string& aFilter);
 private:
     typedef std::vector<FGRunwayPtr>::const_iterator Runway_iterator;
     /**
@@ -134,50 +156,7 @@ private:
     FGAirport(const FGAirport&);
     
     std::vector<FGRunwayPtr> mRunways;
-    std::vector<FGRunwayPtr> mTaxiways;
-};
-
-typedef std::map < std::string, FGAirport* > airport_map;
-typedef airport_map::iterator airport_map_iterator;
-typedef airport_map::const_iterator const_airport_map_iterator;
-
-typedef std::vector < FGAirport * > airport_list;
-typedef airport_list::iterator airport_list_iterator;
-typedef airport_list::const_iterator const_airport_list_iterator;
-
-
-
-class FGAirportList {
-private:
-
-    airport_map airports_by_id;
-    airport_list airports_array;
-
-public:
-    // Constructor (new)
-    FGAirportList();
-
-    // Destructor
-    ~FGAirportList();
-
-    // add an entry to the list
-    FGAirport* add( const std::string& id, const SGGeod& location, const SGGeod& tower,
-              const std::string& name, bool has_metar, FGPositioned::Type aType);
-
-    // search for the specified id.
-    // Returns NULL if unsucessfull.
-    FGAirport* search( const std::string& id );
-
-    /**
-     * Return the number of airports in the list.
-     */
-    int size() const;
-
-    /**
-     * Return a specific airport, by position.
-     */
-    const FGAirport *getAirport( unsigned int index ) const;
-
+    std::vector<FGTaxiwayPtr> mTaxiways;
 };
 
 // find basic airport location info from airport database