Add a lower-bound type navaid lookup, and the ability to specify navaid type in the...

[flightgear.git] / src / Navaids / navrecord.hxx

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index 34d3a579ba80b12022a4902848e572fe3263c4e3..89d227428ac49a2b9277856106c510d58c9d8916 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -48,11 +48,20 @@ SG_USING_STD(istream);
 #define FG_DME_DEFAULT_RANGE 50 // nm
 #define FG_NAV_MAX_RANGE 300    // nm
 
+// Shield the rest of FG from possibly changing details of Robins navaid type numbering system.
+// Currently only the GPS code uses this - extra types (LOC, GS etc) may need to be added
+// should other FG code choose to use this. 
+enum fg_nav_types {
+    FG_NAV_VOR,
+    FG_NAV_NDB,
+    FG_NAV_ILS,
+    FG_NAV_ANY
+};
 
 class FGNavRecord {
 
     int type;
-    double lon, lat;            // location in geodetic coords
+    double lon, lat;            // location in geodetic coords (degrees)
     double elev_ft;
     double x, y, z;             // location in cartesian coords (earth centered)
     int freq;
@@ -75,10 +84,11 @@ public:
     inline ~FGNavRecord(void) {}
 
     inline int get_type() const { return type; }
-    inline double get_lon() const { return lon; }
-    inline void set_lon( double l ) { lon = l; }
-    inline double get_lat() const { return lat; }
-    inline void set_lat( double l ) { lat = l; }
+    inline fg_nav_types get_fg_type() const;
+    inline double get_lon() const { return lon; }      // degrees
+    inline void set_lon( double l ) { lon = l; }       // degrees
+    inline double get_lat() const { return lat; }      // degrees
+    inline void set_lat( double l ) { lat = l; }       // degrees
     inline double get_elev_ft() const { return elev_ft; }
     inline void set_elev_ft( double e ) { elev_ft = e; }
     inline double get_x() const { return x; }
@@ -88,11 +98,11 @@ public:
     inline int get_range() const { return range; }
     inline double get_multiuse() const { return multiuse; }
     inline void set_multiuse( double m ) { multiuse = m; }
-    inline const char *get_ident() { return ident.c_str(); }
-    inline string get_name() { return name; }
-    inline string get_apt_id() { return apt_id; }
-    inline bool get_serviceable() { return serviceable; }
-    inline const char *get_trans_ident() { return trans_ident.c_str(); }
+    inline const char *get_ident() const { return ident.c_str(); }
+    inline const string& get_name() const { return name; }
+    inline const string& get_apt_id() const { return apt_id; }
+    inline bool get_serviceable() const { return serviceable; }
+    inline const char *get_trans_ident() const { return trans_ident.c_str(); }
 
     friend istream& operator>> ( istream&, FGNavRecord& );
 };
@@ -116,6 +126,16 @@ FGNavRecord::FGNavRecord(void) :
 }
 
 
+inline fg_nav_types FGNavRecord::get_fg_type() const {
+    switch(type) {
+    case 2: return(FG_NAV_NDB);
+    case 3: return(FG_NAV_VOR);
+    case 4: return(FG_NAV_ILS);
+    default: return(FG_NAV_ANY);
+    }
+}
+
+
 inline istream&
 operator >> ( istream& in, FGNavRecord& n )
 {
@@ -182,7 +202,7 @@ public:
     inline FGTACANRecord(void);
     inline ~FGTACANRecord(void) {}
 
-    inline string get_channel() { return channel; }
+    inline const string& get_channel() const { return channel; }
     inline int get_freq() const { return freq; }
     friend istream& operator>> ( istream&, FGTACANRecord& );
     };