Another clean-up iteration: FGAirportList::search is gone, replaced by two

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

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index a375243188b1ee4b75b4d7c1fad5e66ab650aae7..6d95bcf87626a1fadbca11c60873fc3145580e00 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -30,11 +30,8 @@
 #include <simgear/compiler.h>
 
 #include <string>
-#include <map>
-#include <set>
 #include <vector>
 
-#include <simgear/math/point3d.hxx>
 #include "Navaids/positioned.hxx"
 
 // forward decls
@@ -71,6 +68,9 @@ public:
     bool   isSeaport()    const;
     bool   isHeliport()   const;
 
+    virtual const std::string& name() const
+    { return _name; }
+
     const SGGeod& getTowerLocation() const { return _tower_location; }
 
     void setMetar(bool value) { _has_metar = value; }
@@ -89,8 +89,6 @@ public:
      /**
      * Useful predicate for FMS/GPS/NAV displays and similar - check if this
      * aiport has a hard-surfaced runway of at least the specified length.
-     * For the moment, hard means asphalt or concrete, not gravel or a
-     * lake bed.
      */
     bool hasHardRunwayOfLengthFt(double aLengthFt) const;
     
@@ -124,6 +122,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;
     /**
@@ -138,27 +156,6 @@ private:
     std::vector<FGRunwayPtr> mTaxiways;
 };
 
-
-class FGAirportSearchFilter {
-public:
-    virtual ~FGAirportSearchFilter() {}
-    // all airports pass the filter by default
-    virtual bool pass(FGAirport*) { return true; }
-};
-
-class FGIdentOrdering {
-public:
-  virtual ~FGIdentOrdering()
-  { ; }
-  
-  virtual bool compare(const std::string& aA, const std::string& aB) const
-  { return aA < aB; }
-};
-
-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;
@@ -168,7 +165,6 @@ typedef airport_list::const_iterator const_airport_list_iterator;
 class FGAirportList {
 private:
 
-    airport_map airports_by_id;
     airport_list airports_array;
 
 public:
@@ -182,26 +178,6 @@ public:
     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 );
-
-    // Search for the next airport in ASCII sequence to the supplied id.
-    // eg. id = "KDC" or "KDCA" would both return "KDCA".
-    // NOTE: Numbers come prior to A-Z in ASCII sequence so id = "LD" would return "LD57", not "LDDP"
-    // optional ordering can make letters come before numbers
-    // Implementation assumes airport codes are unique.
-    // Returns NULL if unsucessfull.
-    const FGAirport* findFirstById(const std::string& aIdent, FGIdentOrdering* aOrder = NULL);
-
-    // search for the airport closest to the specified position
-    // (currently a linear inefficient search so it's probably not
-    // best to use this at runtime.)  An FGAirportSearchFilter class
-    // can be used to restrict the possible choices to a subtype.
-    // max_range limits search - specified as an arc distance, in degrees
-    FGAirport* search( double lon_deg, double lat_deg, double max_range );
-    FGAirport* search( double lon_deg, double lat_deg, double max_range, FGAirportSearchFilter& );
-
     /**
      * Return the number of airports in the list.
      */
@@ -212,21 +188,6 @@ public:
      */
     const FGAirport *getAirport( unsigned int index ) const;
 
-    /**
-     * Return a pointer to the raw airport list
-     */
-    inline const airport_list* getAirportList() { return (&airports_array); }
-
-    /**
-     * Mark the specified airport record as not having metar
-     */
-    void no_metar( const std::string &id );
-
-    /**
-     * Mark the specified airport record as (yes) having metar
-     */
-    void has_metar( const std::string &id );
-
 };
 
 // find basic airport location info from airport database
@@ -235,9 +196,6 @@ const FGAirport *fgFindAirportID( const std::string& id);
 // get airport elevation
 double fgGetAirportElev( const std::string& id );
 
-// get airport position
-Point3D fgGetAirportPos( const std::string& id );
-
 #endif // _FG_SIMPLE_HXX