Patch from Melchior Franz:

[flightgear.git] / src / ATC / atislist.cxx

diff --git a/src/ATC/atislist.cxx b/src/ATC/atislist.cxx
index 54f5ae0eea655f050120fccec7761683339cec17..08e440fec85fa851b3191aa795f11a738637cde2 100644 (file)
--- a/src/ATC/atislist.cxx
+++ b/src/ATC/atislist.cxx
@@ -1,6 +1,7 @@
-// atislist.cxx -- navaids management class
+// atislist.cxx -- ATIS data management class
 //
-// Written by Curtis Olson, started April 2000.
+// Written by David Luff, started October 2001.
+// Based on navlist.cxx by Curtis Olson, started April 2000.
 //
 // Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
 //
@@ -26,6 +27,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
+#include <simgear/math/sg_random.h>
 
 #include "atislist.hxx"
 
@@ -45,7 +47,6 @@ FGATISList::~FGATISList( void ) {
 
 // load the navaids and build the map
 bool FGATISList::init( SGPath path ) {
-    FGATIS a;
 
     atislist.erase( atislist.begin(), atislist.end() );
 
@@ -57,55 +58,35 @@ bool FGATISList::init( SGPath path ) {
 
     // read in each line of the file
 
-    in >> skipeol;
     in >> skipcomment;
 
 #ifdef __MWERKS__
-
     char c = 0;
-    while ( in.get(c) && c != '\0' && a.get_type() != '[' ) {
+    while ( in.get(c) && c != '\0' ) {
         in.putback(c);
-        in >> a;
-       if ( a.get_type() != '[' ) {
-           atislist[a.get_freq()].push_back(a);
-       }
-        in >> skipcomment;
-    }
-
 #else
-
-    double min = 100000;
-    double max = 0;
-
-    while ( ! in.eof() && a.get_type() != '[' ) {
+    while ( !in.eof() ) {
+#endif
+    
+        FGATIS a;
         in >> a;
-       //cout << "id = " << a.get_ident() << endl;
-       //cout << " type = " << a.get_type() << endl;
-       //cout << " lon = " << a.get_lon() << endl;
-       //cout << " lat = " << a.get_lat() << endl;
-       //cout << " elev = " << a.get_elev() << endl;
-       //cout << " freq = " << a.get_freq() << endl;
-       //cout << " range = " << a.get_range() << endl;
-       if ( a.get_type() != '[' ) {
-           atislist[a.get_freq()].push_back(a);
-       }
+       if ( a.get_type() == '[' ) {
+            break;
+        }
+       
+       /* cout << "id = " << a.GetIdent() << endl;
+       cout << " type = " << a.get_type() << endl;
+       cout << " lon = " << a.get_lon() << endl;
+       cout << " lat = " << a.get_lat() << endl;
+       cout << " elev = " << a.get_elev() << endl;
+       cout << " freq = " << a.get_freq() << endl;
+       cout << " range = " << a.get_range() << endl << endl; */
+
+        atislist[a.get_freq()].push_back(a);
         in >> skipcomment;
 
-       if ( a.get_type() != 'N' ) {
-           if ( a.get_freq() < min ) {
-               min = a.get_freq();
-           }
-           if ( a.get_freq() > max ) {
-               max = a.get_freq();
-           }
-       }
     }
 
-    // cout << "min freq = " << min << endl;
-    // cout << "max freq = " << max << endl;
-
-#endif
-
     return true;
 }
 
@@ -115,6 +96,9 @@ bool FGATISList::init( SGPath path ) {
 bool FGATISList::query( double lon, double lat, double elev, double freq,
                       FGATIS *a )
 {
+    lon *= SGD_DEGREES_TO_RADIANS;
+    lat *= SGD_DEGREES_TO_RADIANS;
+
     atis_list_type stations = atislist[(int)(freq*100.0 + 0.5)];
 
     atis_list_iterator current = stations.begin();
@@ -147,3 +131,53 @@ bool FGATISList::query( double lon, double lat, double elev, double freq,
 
     return false;
 }
+
+
+int FGATISList::GetCallSign( string apt_id, int hours, int mins )
+{
+    atis_transmission_type tran;
+
+    if(atislog.find(apt_id) == atislog.end()) {
+       // This station has not transmitted yet - return a random identifier
+       // and add the transmission to the log
+       tran.hours = hours;
+       tran.mins = mins;
+       sg_srandom_time();
+       tran.callsign = int(sg_random() * 25) + 1;      // This *should* give a random int between 1 and 26
+       //atislog[apt_id].push_back(tran);
+       atislog[apt_id] = tran;
+    } else {
+       // This station has transmitted - calculate the appropriate identifier
+       // and add the transmission to the log if it has changed
+       tran = atislog[apt_id];
+       // This next bit assumes that no-one comes back to the same ATIS station
+       // after running FlightGear for more than 24 hours !!
+       if((tran.hours == hours) && (tran.mins == mins)) {
+           return(tran.callsign);
+       } else {
+           if(tran.hours == hours) {
+               // The minutes must have changed
+               tran.mins = mins;
+               tran.callsign++;
+           } else {
+               if(hours < tran.hours) {
+                   hours += 24;
+               }
+               tran.callsign += (hours - tran.hours);
+               if(mins != 0) {
+                   // Assume transmissions were made on every hour
+                   tran.callsign++;
+               }
+               tran.hours = hours;
+               tran.mins = mins;
+           }
+           // Wrap if we've exceeded Zulu
+           if(tran.callsign > 26) {
+               tran.callsign -= 26;
+           }
+           // And write the new transmission to the log
+           atislog[apt_id] = tran;
+       }
+    }
+    return(tran.callsign);
+}