Multiplayer client/server system -- MessageBuf class and test harness complete

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

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index 92f872d23ed810c0382c00bb1b3592b9a7e114e5..3919b23c57b9e03de7f5cfbeff35eef227788558 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -1,4 +1,3 @@
-//
 // simple.hxx -- a really simplistic class to manage airport ID,
 //                 lat, lon of the center of one of it's runways, and 
 //                 elevation in feet.
@@ -24,8 +23,8 @@
 // $Id$
 
 
-#ifndef _AIRPORTS_HXX
-#define _AIRPORTS_HXX
+#ifndef _FG_SIMPLE_HXX
+#define _FG_SIMPLE_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -33,87 +32,57 @@
 #endif                                   
 
 
-#include <simgear/compiler.h>
-
-#ifdef FG_HAVE_STD_INCLUDES
-#  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
-#  include <iostream>
-#else
-#  include <istream.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
 #endif
 
-#include STL_STRING
-#include <set>
-
-FG_USING_STD(string);
-FG_USING_STD(set);
+#include <simgear/compiler.h>
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
-#endif
+#include STL_STRING
+#include <map>
 
+SG_USING_STD(string);
+SG_USING_STD(map);
 
-class fgAIRPORT {
-public:
-    fgAIRPORT( const string& name = "",
-              double lon = 0.0,
-              double lat = 0.0,
-              double ele = 0.0 )
-       : id(name), longitude(lon), latitude(lat), elevation(ele) {}
 
-    bool operator < ( const fgAIRPORT& a ) const {
-       return id < a.id;
-    }
+struct FGAirport {
 
-public:
     string id;
     double longitude;
     double latitude;
     double elevation;
+    string code;
+    string name;
+
 };
 
-inline istream&
-operator >> ( istream& in, fgAIRPORT& a )
-{
-    return in >> a.id >> a.longitude >> a.latitude >> a.elevation;
-}
+typedef map < string, FGAirport > airport_map;
+typedef airport_map::iterator airport_map_iterator;
+typedef airport_map::const_iterator const_airport_map_iterator;
 
-class fgAIRPORTS {
-public:
-#ifdef FG_NO_DEFAULT_TEMPLATE_ARGS
-    typedef set< fgAIRPORT, less< fgAIRPORT > > container;
-#else
-    typedef set< fgAIRPORT > container;
-#endif
-    typedef container::iterator iterator;
-    typedef container::const_iterator const_iterator;
+
+class FGAirportList {
 
 private:
-    container airports;
+
+    airport_map airports;
 
 public:
 
     // Constructor
-    fgAIRPORTS();
+    FGAirportList( const string& file );
 
     // Destructor
-    ~fgAIRPORTS();
-
-    // load the data
-    int load( const string& file );
+    ~FGAirportList();
 
     // search for the specified id.
     // Returns true if successful, otherwise returns false.
     // On success, airport data is returned thru "airport" pointer.
-    // "airport" is not changed if "id" is not found.
-    bool search( const string& id, fgAIRPORT* airport ) const;
-    fgAIRPORT search( const string& id ) const;
+    // "airport" is not changed if "apt" is not found.
+    FGAirport search( const string& id );
 };
 
 
-#endif /* _AIRPORTS_HXX */
+#endif // _FG_SIMPLE_HXX