initialize release_keys array

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

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index cb003e3d991b243cf1c3b79038701aa10e2fdb19..6d9aceefe2254720da4e79b73410f50abbe0112f 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -69,12 +69,16 @@ private:
     SGGeod _tower_location;
     string _name;
     bool _has_metar;
-    FGAirportDynamics *dynamics;
+    bool _is_airport;
+    bool _is_seaport;
+    bool _is_heliport;
+    FGAirportDynamics *_dynamics;
 
 public:
     FGAirport();
     // FGAirport(const FGAirport &other);
-    FGAirport(const string& id, const SGGeod& location, const SGGeod& tower, const string& name, bool has_metar);
+    FGAirport(const string& id, const SGGeod& location, const SGGeod& tower, const string& name,
+            bool has_metar, bool is_airport, bool is_seaport, bool is_heliport);
     ~FGAirport();
 
     const string& getId() const { return _id; }
@@ -85,6 +89,9 @@ public:
     // Returns ft
     double getElevation() const { return _location.getElevationFt(); }
     bool   getMetar()     const { return _has_metar; }
+    bool   isAirport()    const { return _is_airport; }
+    bool   isSeaport()    const { return _is_seaport; }
+    bool   isHeliport()   const { return _is_heliport; }
 
     const SGGeod& getTowerLocation() const { return _tower_location; }
 
@@ -99,6 +106,13 @@ private:
 };
 
 
+class FGAirportSearchFilter {
+public:
+    virtual ~FGAirportSearchFilter() {}
+    // all airports pass the filter by default
+    virtual bool pass(FGAirport*) { return true; }
+};
+
 
 typedef map < string, FGAirport* > airport_map;
 typedef airport_map::iterator airport_map_iterator;
@@ -115,7 +129,6 @@ private:
 
     airport_map airports_by_id;
     airport_list airports_array;
-    //set < string > ai_dirs;
 
 public:
     // Constructor (new)
@@ -126,7 +139,8 @@ public:
 
     // add an entry to the list
     void add( const string& id, const SGGeod& location, const SGGeod& tower,
-              const string& name, const bool has_metar );
+              const string& name, bool has_metar, bool is_airport,
+              bool is_seaport, bool is_heliport );
 
     // search for the specified id.
     // Returns NULL if unsucessfull.
@@ -142,10 +156,10 @@ public:
 
     // 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.)  If with_metar is true, then only
-    // return station id's marked as having metar data.
-    // Returns NULL if fails (unlikely unless none have metar and with_metar spec'd!)
-    FGAirport* search( double lon_deg, double lat_deg, bool with_metar );
+    // best to use this at runtime.)  An FGAirportSearchFilter class
+    // can be used to restrict the possible choices to a subtype.
+    FGAirport* search( double lon_deg, double lat_deg );
+    FGAirport* search( double lon_deg, double lat_deg, FGAirportSearchFilter& );
 
     /**
      * Return the number of airports in the list.