//
// 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$
# include <config.h>
#endif
+#include <algorithm>
+
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include "fixlist.hxx"
+#include <Navaids/fix.hxx>
+#include <Airports/simple.hxx>
-
-FGFixList *current_fixlist;
-
+FGFix::FGFix(const std::string& aIdent, const SGGeod& aPos) :
+ FGPositioned(FIX, aIdent, aPos)
+{
+ init(true); // init FGPositioned
+}
// Constructor
FGFixList::FGFixList( void ) {
// load the navaids and build the map
-bool FGFixList::init( SGPath path ) {
-
- fixlist.erase( fixlist.begin(), fixlist.end() );
-
+bool FGFixList::init(const SGPath& path ) {
sg_gzifstream in( path.str() );
if ( !in.is_open() ) {
SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
in >> skipeol;
// read in each remaining line of the file
-
-#ifdef __MWERKS__
- char c = 0;
- while ( in.get(c) && c != '\0' ) {
- in.putback(c);
-#else
while ( ! in.eof() ) {
-#endif
-
- FGFix fix;
- in >> fix;
- if ( fix.get_lat() > 95.0 ) {
- break;
- }
-
- /* cout << "ident=" << fix.get_ident()
- << ", lat=" << fix.get_lat()
- << ", lon=" << fix.get_lon() << endl; */
-
- fixlist[fix.get_ident()] = fix;
- in >> skipcomment;
- }
-
- return true;
-}
-
-
-// query the database for the specified fix, lon and lat are in
-// degrees, elev is in meters
-bool FGFixList::query( const string& ident, FGFix *fix ) {
- *fix = fixlist[ident];
- if ( ! fix->get_ident().empty() ) {
- return true;
- } else {
- return false;
- }
-}
-
-
-// query the database for the specified fix, lon and lat are in
-// degrees, elev is in meters
-bool FGFixList::query_and_offset( const string& ident, double lon, double lat,
- double elev, FGFix *fix, double *heading,
- double *dist )
-{
- *fix = fixlist[ident];
- if ( fix->get_ident().empty() ) {
- return false;
+ double lat, lon;
+ std::string ident;
+ in >> lat >> lon >> ident;
+ if (lat > 95) break;
+
+ // fix gets added to the FGPositioned spatial indices, so we don't need
+ // to hold onto it here.
+ new FGFix(ident, SGGeod::fromDeg(lon, lat));
+ in >> skipcomment;
}
-
- double az1, az2, s;
- geo_inverse_wgs_84( elev, lat, lon,
- fix->get_lat(), fix->get_lon(),
- &az1, &az2, &s );
- // cout << " dist = " << s << endl;
- *heading = az2;
- *dist = s;
return true;
}
-
-const FGFix* FGFixList::findFirstByIdent( const string& ident, bool exact)
-{
- fix_map_iterator itr;
- if(exact) {
- itr = fixlist.find(ident);
- } else {
- itr = fixlist.lower_bound(ident);
- }
- if(itr == fixlist.end()) {
- return(NULL);
- } else {
- return(&(itr->second));
- }
-}