initialize release_keys array

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

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index 39521fc1530fff8b290e58d069421abb80cdd576..6d9aceefe2254720da4e79b73410f50abbe0112f 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -50,6 +50,7 @@
 #include "groundnetwork.hxx"
 #include "dynamics.hxx"
 
+
 SG_USING_STD(string);
 SG_USING_STD(map);
 SG_USING_STD(set);
@@ -64,27 +65,35 @@ SG_USING_STD(vector);
 class FGAirport {
 private:
     string _id;
-    double _longitude;    // degrees
-    double _latitude;     // degrees
-    double _elevation;    // ft
+    SGGeod _location;
+    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, double lon, double lat, double elev, 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();
 
-    string getId() const { return _id; }
-    const string &getName() const { return _name; }
-    double getLongitude() const { return _longitude; }
+    const string& getId() const { return _id; }
+    const string& getName() const { return _name; }
+    double getLongitude() const { return _location.getLongitudeDeg(); }
     // Returns degrees
-    double getLatitude()  const { return _latitude; }
+    double getLatitude()  const { return _location.getLatitudeDeg(); }
     // Returns ft
-    double getElevation() const { return _elevation; }
+    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; }
 
     void setId(const string& id) { _id = id; }
     void setMetar(bool value) { _has_metar = value; }
@@ -97,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;
@@ -113,7 +129,6 @@ private:
 
     airport_map airports_by_id;
     airport_list airports_array;
-    //set < string > ai_dirs;
 
 public:
     // Constructor (new)
@@ -123,8 +138,9 @@ public:
     ~FGAirportList();
 
     // add an entry to the list
-    void add( const string& id, const double longitude, const double latitude,
-              const double elevation, const string& name, const bool has_metar );
+    void add( const string& id, const SGGeod& location, const SGGeod& tower,
+              const string& name, bool has_metar, bool is_airport,
+              bool is_seaport, bool is_heliport );
 
     // search for the specified id.
     // Returns NULL if unsucessfull.
@@ -140,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.