X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Fnavrecord.hxx;h=7ee00ed43b13447c8288f422d5cfa9ce26aa99e6;hb=d8f5529d217c3710bcece9244f1f41cfb8550669;hp=dcf605ceeeca3aed8be6c8173cdc47829055ad6d;hpb=270444a6753307a4b5b2889d95ff2bea02199961;p=flightgear.git diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx index dcf605cee..7ee00ed43 100644 --- a/src/Navaids/navrecord.hxx +++ b/src/Navaids/navrecord.hxx @@ -24,28 +24,11 @@ #ifndef _FG_NAVRECORD_HXX #define _FG_NAVRECORD_HXX -#include +#include -#include -#include -#include -#include -#include - -#include +#include #include -#ifdef SG_HAVE_STD_INCLUDES -# include -#elif defined( __BORLANDC__ ) || (__APPLE__) -# include -#else -# include -#endif - -SG_USING_STD(istream); - - #define FG_NAV_DEFAULT_RANGE 50 // nm #define FG_LOC_DEFAULT_RANGE 18 // nm #define FG_DME_DEFAULT_RANGE 50 // nm @@ -72,21 +55,25 @@ class FGNavRecord : public SGReferenced { // (degrees) or localizer heading // (degrees) or dme bias (nm) - string ident; // navaid ident - string name; // verbose name in nav database - string apt_id; // corresponding airport id + std::string ident; // navaid ident + std::string name; // verbose name in nav database + std::string apt_id; // corresponding airport id bool serviceable; // for failure modeling - string trans_ident; // for failure modeling + std::string trans_ident; // for failure modeling public: - - inline FGNavRecord(void); + FGNavRecord(void); inline ~FGNavRecord(void) {} + FGNavRecord(int type, const std::string& ident, const std::string& name, const std::string& airport, + double lat, double lon, int freq, int range, double multiuse); + inline int get_type() const { return type; } - inline fg_nav_types get_fg_type() const; + + fg_nav_types get_fg_type() const; + inline double get_lon() const { return pos.getLongitudeDeg(); } // degrees inline void set_lon( double l ) { pos.setLongitudeDeg(l); } // degrees inline double get_lat() const { return pos.getLatitudeDeg(); } // degrees @@ -100,133 +87,27 @@ public: inline double get_multiuse() const { return multiuse; } inline void set_multiuse( double m ) { multiuse = m; } 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 const std::string& get_name() const { return name; } + inline const std::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& ); + friend std::istream& operator>> ( std::istream&, FGNavRecord& ); }; - -inline -FGNavRecord::FGNavRecord(void) : - type(0), - pos(SGGeod::fromDeg(0, 0)), - cart(0, 0, 0), - freq(0), - range(0), - multiuse(0.0), - ident(""), - name(""), - apt_id(""), - serviceable(true), - trans_ident("") -{ -} - - -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 ) -{ - in >> n.type; - - if ( n.type == 99 ) { - return in >> skipeol; - } - - double lat, lon, elev_ft; - in >> lat >> lon >> elev_ft >> n.freq >> n.range >> n.multiuse - >> n.ident; - n.pos.setLatitudeDeg(lat); - n.pos.setLongitudeDeg(lon); - n.pos.setElevationFt(elev_ft); - getline( in, n.name ); - - // silently multiply adf frequencies by 100 so that adf - // vs. nav/loc frequency lookups can use the same code. - if ( n.type == 2 ) { - n.freq *= 100; - } - - // Remove any leading spaces before the name - while ( n.name.substr(0,1) == " " ) { - n.name = n.name.erase(0,1); - } - - if ( n.type >= 4 && n.type <= 9 ) { - // these types are always associated with an airport id - string::size_type pos = n.name.find(" "); - n.apt_id = n.name.substr(0, pos); - } - - // Ranges are included with the latest data format, no need to - // assign our own defaults, unless the range is not set for some - // reason. - - if ( n.range < 0.1 ) { - // assign default ranges - - if ( n.type == 2 || n.type == 3 ) { - n.range = FG_NAV_DEFAULT_RANGE; - } else if ( n.type == 4 || n.type == 5 || n.type == 6 ) { - n.range = FG_LOC_DEFAULT_RANGE; - } else if ( n.type == 12 ) { - n.range = FG_DME_DEFAULT_RANGE; - } else { - n.range = FG_LOC_DEFAULT_RANGE; - } - } - - // transmitted ident (same as ident unless modeling a fault) - n.trans_ident = n.ident; - - // generate cartesian coordinates - n.cart = SGVec3d::fromGeod(n.pos); - - return in; -} - class FGTACANRecord : public SGReferenced { - string channel; + std::string channel; int freq; public: - inline FGTACANRecord(void); + FGTACANRecord(void); inline ~FGTACANRecord(void) {} - inline const string& get_channel() const { return channel; } + inline const std::string& get_channel() const { return channel; } inline int get_freq() const { return freq; } - friend istream& operator>> ( istream&, FGTACANRecord& ); + friend std::istream& operator>> ( std::istream&, FGTACANRecord& ); }; - -inline -FGTACANRecord::FGTACANRecord(void) : - channel(""), - freq(0) - -{ -} - -inline istream& -operator >> ( istream& in, FGTACANRecord& n ) -{ - in >> n.channel >> n.freq ; - //getline( in, n.name ); - - return in; -} #endif // _FG_NAVRECORD_HXX