X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Ffixlist.hxx;h=dbf0ef2c579f9b0e1ef6c60dedc0ef246d0792b8;hb=4a79d82ba62fa4e5be759fa0fc4b20220e8da303;hp=c23d4b75942440ae70270dd86c63054ddaaaddcc;hpb=be703a92b400344740b909e5c667a8dadd2067d6;p=flightgear.git diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx index c23d4b759..dbf0ef2c5 100644 --- a/src/Navaids/fixlist.hxx +++ b/src/Navaids/fixlist.hxx @@ -2,7 +2,7 @@ // // Written by Curtis Olson, started April 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$ @@ -38,14 +38,13 @@ SG_USING_STD(map); SG_USING_STD(vector); SG_USING_STD(string); +// TODO - fix names may be globally non-unique. Allow for this. +typedef map < string, FGFix > fix_map_type; +typedef fix_map_type::iterator fix_map_iterator; +typedef fix_map_type::const_iterator fix_map_const_iterator; class FGFixList { - // typedef map < string, FGFix, less > fix_map_type; - typedef map < string, FGFix > fix_map_type; - typedef fix_map_type::iterator fix_map_iterator; - typedef fix_map_type::const_iterator fix_map_const_iterator; - fix_map_type fixlist; public: @@ -58,16 +57,22 @@ public: // query the database for the specified fix bool query( const string& ident, FGFix *f ); + + // Find fix of requested type with closest exact or following ident + // (by ACSII values) to that supplied (ie. a lower-bound lookup). + // Supplying true for exact forces only exact matches to be returned (similar to above function) + // Returns NULL if no match found. + const FGFix* findFirstByIdent( const string& ident, bool exact = false ); // query the database for the specified fix, lon and lat are // in degrees, elev is in meters bool query_and_offset( const string& ident, double lon, double lat, double elev, FGFix *f, double *heading, double *dist ); + + // Return a pointer to the master fixlist + inline const fix_map_type* getFixList() { return(&fixlist); } }; -extern FGFixList *current_fixlist; - - #endif // _FG_FIXLIST_HXX