Stefan C. Müller :

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

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 9c47124d26668d22e5dc5f48ad3b15b036dd4fff..996f38045372a5dc3d7c4ae9cd59c9c8486c836c 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started August 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -24,92 +24,54 @@
 #ifndef _FG_RUNWAYS_HXX
 #define _FG_RUNWAYS_HXX
 
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include STL_STRING
-#include <map>
-
-SG_USING_STD(string);
-SG_USING_STD(multimap);
-
-
-struct ltstr {
-    bool operator()(const string s1, const string s2) const {
-        return s1 < s2;
-    }
-};
-
-
-struct FGRunway {
-
-    string type;
-    string id;
-    string rwy_no;
-
-    double lon;
-    double lat;
-    double heading;
-    double length;
-    double width;
-    
-    string surface_flags;
-    string end1_flags;
-    string end2_flags;
-
-    double end1_displaced_threshold;
-    double end2_displaced_threshold;
-
-    double end1_stopway;
-    double end2_stopway;
-
-};
-
-typedef multimap < string, FGRunway, ltstr > runway_map;
-typedef runway_map::iterator runway_map_iterator;
-typedef runway_map::const_iterator const_runway_map_iterator;
-
-class FGRunwayList {
-
-private:
-
-    runway_map runways;
-    runway_map_iterator current;
+#include <string>
+#include <vector>
 
+class FGRunway
+{
 public:
-
-    // Constructor
-    FGRunwayList( const string& file );
-
-    // Destructor
-    ~FGRunwayList();
-
-    // search for the specified apt id.
-    // Returns true if successful, otherwise returns false.
-    // On success, runway data is returned thru "runway" pointer.
-    // "runway" is not changed if "apt" is not found.
-    bool search( const string& aptid, FGRunway* runway );
-    bool search( const string& aptid, const string& rwyno, FGRunway* runway );
-
-    // DCL - search for runway closest to desired heading in degrees
-    bool search( const string& aptid, const int hdg, FGRunway* runway );
-
-    // Return the runway number of the runway closest to a given heading
-    string search( const string& aptid, const int tgt_hdg );
-
-    FGRunway search( const string& aptid );
-    bool next( FGRunway* runway );
-    FGRunway next();
+  FGRunway();
+  
+  FGRunway(const std::string& rwy_no,
+            const double longitude, const double latitude,
+            const double heading, const double length,
+            const double width,
+            const double displ_thresh1, const double displ_thresh2,
+            const double stopway1, const double stopway2,
+            const int surface_code);
+  
+  /**
+   * given a runway identifier (06, 18L, 31R) compute the identifier for the
+   * opposite heading runway (24, 36R, 13L) string.
+   */
+  static std::string reverseIdent(const std::string& aRunayIdent);
+  
+  /**
+   * score this runway according to the specified weights. Used by
+   * FGAirport::findBestRunwayForHeading
+   */
+  double score(double aLengthWt, double aWidthWt, double aSurfaceWt) const;
+
+  bool isTaxiway() const;
+  
+    std::string _rwy_no;
+    std::string _type;                // runway / taxiway
+
+    double _lon;
+    double _lat;
+    double _heading;
+    double _length;
+    double _width;
+    double _displ_thresh1;
+    double _displ_thresh2;
+    double _stopway1;
+    double _stopway2;
+
+    int _surface_code;
 };
 
+typedef std::vector<FGRunway> FGRunwayVector;
 
 #endif // _FG_RUNWAYS_HXX