]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/bfi.cxx
Minor tweaks.
[flightgear.git] / src / Main / bfi.cxx
index 85a4e2dfa200d3f6062452fe011206fa07b277cc..6e7761d638f8a3157af03dd4aa44cf61598b67d6 100644 (file)
 //
 // $Id$
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#if defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#else
-#  include <iostream>
-#endif
+#include "fgfs.hxx"
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
@@ -56,9 +47,8 @@
 #endif
 
 #include "globals.hxx"
-#include "save.hxx"
 #include "fg_init.hxx"
-#include <simgear/misc/props.hxx>
+#include "fg_props.hxx"
 
 FG_USING_NAMESPACE(std);
 
@@ -91,7 +81,7 @@ reinit ()
                                // that's going to get clobbered
                                // when we reinit the subsystems.
 
-  cout << "BFI: start reinit\n";
+  FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI reinit");
 
                                // TODO: add more AP stuff
   double elevator = FGBFI::getElevator();
@@ -111,7 +101,6 @@ reinit ()
   // double gpsLongitude = FGBFI::getGPSTargetLongitude();
 
   FGBFI::setTargetAirport("");
-  cout << "Target airport is " << globals->get_options()->get_airport_id() << endl;
 
   fgReInitSubsystems();
 
@@ -143,16 +132,86 @@ reinit ()
 
   _needReinit = false;
 
-  cout << "BFI: end reinit\n";
+  FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI reinit");
+}
+
+// BEGIN: kludge 2000-12-07
+// This is a kludge around a LaRCsim problem; see setAltitude()
+// for details.
+static int _altitude_countdown = 0;
+static double _requested_altitude = -9999;
+static bool _saved_freeze = false;
+static inline void _check_altitude ()
+{
+  if (_altitude_countdown > 0) {
+    _altitude_countdown--;
+    if (_altitude_countdown == 0) {
+      current_aircraft.fdm_state->set_Altitude(_requested_altitude);
+      globals->set_freeze(_saved_freeze);
+    }
+  }
+}
+
+static int _lighting_countdown = 0;
+static inline void _check_lighting ()
+{
+  if (_lighting_countdown > 0) {
+    _lighting_countdown--;
+    if (_lighting_countdown == 0)
+      fgUpdateSkyAndLightingParams();
+  }
+}
+// END: kludge
+
+
+// BEGIN: kludge
+// Allow the view to be set from two axes (i.e. a joystick hat)
+// This needs to be in FGViewer itself, somehow.
+static double axisLong = 0.0;
+static double axisLat = 0.0;
+
+static inline void
+_set_view_from_axes ()
+{
+                               // Take no action when hat is centered
+  if (axisLong == 0 && axisLat == 0)
+    return;
+
+  double viewDir = 0;
+
+  if (axisLong < 0) {          // Longitudinal axis forward
+    if (axisLat < 0)
+      viewDir = 45;
+    else if (axisLat > 0)
+      viewDir = 315;
+    else
+      viewDir = 0;
+  } else if (axisLong > 0) {   // Longitudinal axis backward
+    if (axisLat < 0)
+      viewDir = 135;
+    else if (axisLat > 0)
+      viewDir = 225;
+    else
+      viewDir = 180;
+  } else {                     // Longitudinal axis neutral
+    if (axisLat < 0)
+      viewDir = 90;
+    else
+      viewDir = 270;
+  }
+
+  globals->get_current_view()->set_goal_view_offset(viewDir*DEG_TO_RAD);
+//   globals->get_current_view()->set_view_offset(viewDir*DEG_TO_RAD);
 }
 
+// END: kludge
+
 
 \f
 ////////////////////////////////////////////////////////////////////////
 // Local functions
 ////////////////////////////////////////////////////////////////////////
 
-
 /**
  * Initialize the BFI by binding its functions to properties.
  *
@@ -164,160 +223,107 @@ FGBFI::init ()
 {
   FG_LOG(FG_GENERAL, FG_INFO, "Starting BFI init");
                                // Simulation
-  current_properties.tieInt("/sim/flight-model",
-                           getFlightModel, setFlightModel);
-  current_properties.tieString("/sim/aircraft",
-                              getAircraft, setAircraft);
-  current_properties.tieString("/sim/aircraft-dir",
-                              getAircraftDir, setAircraftDir);
-  // TODO: timeGMT
-  current_properties.tieString("/sim/time/gmt-string",
-                              getGMTString, 0);
-  current_properties.tieBool("/sim/hud/visibility",
-                            getHUDVisible, setHUDVisible);
-  current_properties.tieBool("/sim/panel/visibility",
-                            getPanelVisible, setPanelVisible);
-  current_properties.tieInt("/sim/panel/x-offset",
-                           getPanelXOffset, setPanelXOffset);
-  current_properties.tieInt("/sim/panel/y-offset",
-                           getPanelYOffset, setPanelYOffset);
+  fgTie("/sim/flight-model", getFlightModel, setFlightModel);
+  fgTie("/sim/aircraft", getAircraft, setAircraft);
+  fgTie("/sim/aircraft-dir", getAircraftDir, setAircraftDir);
+  fgTie("/sim/time/gmt", getDateString, setDateString);
+  fgTie("/sim/time/gmt-string", getGMTString);
+  fgTie("/sim/hud/visibility", getHUDVisible, setHUDVisible);
+  fgTie("/sim/panel/visibility", getPanelVisible, setPanelVisible);
+  fgTie("/sim/panel/x-offset", getPanelXOffset, setPanelXOffset);
+  fgTie("/sim/panel/y-offset", getPanelYOffset, setPanelYOffset);
 
                                // Position
-  current_properties.tieString("/position/airport-id",
-                               getTargetAirport, setTargetAirport);
-  current_properties.tieDouble("/position/latitude",
-                               getLatitude, setLatitude);
-  current_properties.tieDouble("/position/longitude",
-                              getLongitude, setLongitude);
-  current_properties.tieDouble("/position/altitude",
-                              // getAltitude, setAltitude);
-                              getAltitude, setAltitude, false);
-  current_properties.tieDouble("/position/altitude-agl",
-                              getAGL, 0);
+  fgTie("/position/airport-id", getTargetAirport, setTargetAirport);
+  fgTie("/position/latitude", getLatitude, setLatitude);
+  fgTie("/position/longitude", getLongitude, setLongitude);
+  fgTie("/position/altitude", getAltitude, setAltitude);
+  fgTie("/position/altitude-agl", getAGL);
 
                                // Orientation
-  current_properties.tieDouble("/orientation/heading",
-                              getHeading, setHeading);
-  current_properties.tieDouble("/orientation/heading-magnetic",
-                              getHeadingMag, 0);
-  current_properties.tieDouble("/orientation/pitch",
-                              getPitch, setPitch);
-  current_properties.tieDouble("/orientation/roll",
-                              getRoll, setRoll);
+  fgTie("/orientation/heading", getHeading, setHeading);
+  fgTie("/orientation/heading-magnetic", getHeadingMag);
+  fgTie("/orientation/pitch", getPitch, setPitch);
+  fgTie("/orientation/roll", getRoll, setRoll);
 
                                // Engine
-  current_properties.tieDouble("/engines/engine0/rpm",
-                              getRPM, 0);
-  current_properties.tieDouble("/engines/engine0/egt",
-                              getEGT, 0);
-  current_properties.tieDouble("/engines/engine0/cht",
-                              getCHT, 0);
-  current_properties.tieDouble("/engines/engine0/mp",
-                              getMP, 0);
+  fgTie("/engines/engine0/rpm", getRPM);
+  fgTie("/engines/engine0/egt", getEGT);
+  fgTie("/engines/engine0/cht", getCHT);
+  fgTie("/engines/engine0/mp", getMP);
 
                                // Velocities
-  current_properties.tieDouble("/velocities/airspeed",
-                              getAirspeed, setAirspeed);
-  current_properties.tieDouble("/velocities/side-slip",
-                              getSideSlip, 0);
-  current_properties.tieDouble("/velocities/vertical-speed",
-                              getVerticalSpeed, 0);
-  current_properties.tieDouble("/velocities/speed-north",
-                              getSpeedNorth, 0);
-  current_properties.tieDouble("/velocities/speed-east",
-                              getSpeedEast, 0);
-  current_properties.tieDouble("/velocities/speed-down",
-                              getSpeedDown, 0);
+  fgTie("/velocities/airspeed", getAirspeed, setAirspeed);
+  fgTie("/velocities/side-slip", getSideSlip);
+  fgTie("/velocities/vertical-speed", getVerticalSpeed);
+  fgTie("/velocities/speed-north", getSpeedNorth);
+  fgTie("/velocities/speed-east", getSpeedEast);
+  fgTie("/velocities/speed-down", getSpeedDown);
 
                                // Controls
-  current_properties.tieDouble("/controls/throttle",
-                              getThrottle, setThrottle);
-  current_properties.tieDouble("/controls/mixture",
-                              getMixture, setMixture);
-  current_properties.tieDouble("/controls/propellor-pitch",
-                              getPropAdvance, setPropAdvance);
-  current_properties.tieDouble("/controls/flaps",
-                              getFlaps, setFlaps);
-  current_properties.tieDouble("/controls/aileron",
-                              getAileron, setAileron);
-  current_properties.tieDouble("/controls/rudder",
-                              getRudder, setRudder);
-  current_properties.tieDouble("/controls/elevator",
-                              getElevator, setElevator);
-  current_properties.tieDouble("/controls/elevator-trim",
-                              getElevatorTrim, setElevatorTrim);
-  current_properties.tieDouble("/controls/brakes/all",
-                              getBrakes, setBrakes);
-  current_properties.tieDouble("/controls/brakes/left",
-                              getLeftBrake, setLeftBrake);
-  current_properties.tieDouble("/controls/brakes/right",
-                              getRightBrake, setRightBrake);
-  current_properties.tieDouble("/controls/brakes/center",
-                              getRightBrake, setCenterBrake);
+#if 0
+  fgTie("/controls/throttle", getThrottle, setThrottle);
+  fgTie("/controls/mixture", getMixture, setMixture);
+  fgTie("/controls/propellor-pitch", getPropAdvance, setPropAdvance);
+  fgTie("/controls/flaps", getFlaps, setFlaps);
+  fgTie("/controls/aileron", getAileron, setAileron);
+  fgTie("/controls/rudder", getRudder, setRudder);
+  fgTie("/controls/elevator", getElevator, setElevator);
+  fgTie("/controls/elevator-trim", getElevatorTrim, setElevatorTrim);
+  fgTie("/controls/brakes/all", getBrakes, setBrakes);
+  fgTie("/controls/brakes/left", getLeftBrake, setLeftBrake);
+  fgTie("/controls/brakes/right", getRightBrake, setRightBrake);
+  fgTie("/controls/brakes/center", getRightBrake, setCenterBrake);
+#endif
 
                                // Autopilot
-  current_properties.tieBool("/autopilot/locks/altitude",
-                            getAPAltitudeLock, setAPAltitudeLock);
-  current_properties.tieDouble("/autopilot/settings/altitude",
-                              getAPAltitude, setAPAltitude);
-  current_properties.tieBool("/autopilot/locks/heading",
-                            getAPHeadingLock, setAPHeadingLock);
-  current_properties.tieDouble("/autopilot/settings/heading",
-                              getAPHeading, setAPHeading);
-  current_properties.tieDouble("/autopilot/settings/heading-magnetic",
-                              getAPHeadingMag, setAPHeadingMag);
-  current_properties.tieBool("/autopilot/locks/nav1",
-                            getAPNAV1Lock, setAPNAV1Lock);
+  fgTie("/autopilot/locks/altitude", getAPAltitudeLock, setAPAltitudeLock);
+  fgTie("/autopilot/settings/altitude", getAPAltitude, setAPAltitude);
+  fgTie("/autopilot/locks/heading", getAPHeadingLock, setAPHeadingLock);
+  fgTie("/autopilot/settings/heading", getAPHeading, setAPHeading);
+  fgTie("/autopilot/settings/heading-magnetic",
+             getAPHeadingMag, setAPHeadingMag);
+  fgTie("/autopilot/locks/nav1", getAPNAV1Lock, setAPNAV1Lock);
 
                                // Radio navigation
-  current_properties.tieDouble("/radios/nav1/frequencies/selected",
-                              getNAV1Freq, setNAV1Freq);
-  current_properties.tieDouble("/radios/nav1/frequencies/standby",
-                              getNAV1AltFreq, setNAV1AltFreq);
-  current_properties.tieDouble("/radios/nav1/radials/actual",
-                              getNAV1Radial, 0);
-  current_properties.tieDouble("/radios/nav1/radials/selected",
-                              getNAV1SelRadial, setNAV1SelRadial);
-  current_properties.tieDouble("/radios/nav1/dme/distance",
-                              getNAV1DistDME, 0);
-  current_properties.tieBool("/radios/nav1/to-flag",
-                            getNAV1TO, 0);
-  current_properties.tieBool("/radios/nav1/from-flag",
-                            getNAV1FROM, 0);
-  current_properties.tieBool("/radios/nav1/in-range",
-                            getNAV1InRange, 0);
-  current_properties.tieBool("/radios/nav1/dme/in-range",
-                            getNAV1DMEInRange, 0);
+  fgTie("/radios/nav1/frequencies/selected", getNAV1Freq, setNAV1Freq);
+  fgTie("/radios/nav1/frequencies/standby", getNAV1AltFreq, setNAV1AltFreq);
+  fgTie("/radios/nav1/radials/actual", getNAV1Radial);
+  fgTie("/radios/nav1/radials/selected",
+             getNAV1SelRadial, setNAV1SelRadial);
+  fgTie("/radios/nav1/dme/distance", getNAV1DistDME);
+  fgTie("/radios/nav1/to-flag", getNAV1TO);
+  fgTie("/radios/nav1/from-flag", getNAV1FROM);
+  fgTie("/radios/nav1/in-range", getNAV1InRange);
+  fgTie("/radios/nav1/dme/in-range", getNAV1DMEInRange);
                               
-  current_properties.tieDouble("/radios/nav2/frequencies/selected",
-                              getNAV2Freq, setNAV2Freq);
-  current_properties.tieDouble("/radios/nav2/frequencies/standby",
-                              getNAV2AltFreq, setNAV2AltFreq);
-  current_properties.tieDouble("/radios/nav2/radials/actual",
-                              getNAV2Radial, 0);
-  current_properties.tieDouble("/radios/nav2/radials/selected",
-                              getNAV2SelRadial, setNAV2SelRadial);
-  current_properties.tieDouble("/radios/nav2/dme/distance",
-                              getNAV2DistDME, 0);
-  current_properties.tieBool("/radios/nav2/to-flag",
-                            getNAV2TO, 0);
-  current_properties.tieBool("/radios/nav2/from-flag",
-                            getNAV2FROM, 0);
-  current_properties.tieBool("/radios/nav2/in-range",
-                            getNAV2InRange, 0);
-  current_properties.tieBool("/radios/nav2/dme/in-range",
-                            getNAV2DMEInRange, 0);
-
-  current_properties.tieDouble("/radios/adf/frequencies/selected",
-                              getADFFreq, setADFFreq);
-  current_properties.tieDouble("/radios/adf/frequencies/standby",
-                              getADFAltFreq, setADFAltFreq);
-  current_properties.tieDouble("/radios/adf/rotation",
-                              getADFRotation, setADFRotation);
-
-  current_properties.tieDouble("/environment/visibility",
-                              getVisibility, setVisibility);
-
+  fgTie("/radios/nav2/frequencies/selected", getNAV2Freq, setNAV2Freq);
+  fgTie("/radios/nav2/frequencies/standby",
+             getNAV2AltFreq, setNAV2AltFreq);
+  fgTie("/radios/nav2/radials/actual", getNAV2Radial);
+  fgTie("/radios/nav2/radials/selected",
+             getNAV2SelRadial, setNAV2SelRadial);
+  fgTie("/radios/nav2/dme/distance", getNAV2DistDME);
+  fgTie("/radios/nav2/to-flag", getNAV2TO);
+  fgTie("/radios/nav2/from-flag", getNAV2FROM);
+  fgTie("/radios/nav2/in-range", getNAV2InRange);
+  fgTie("/radios/nav2/dme/in-range", getNAV2DMEInRange);
+
+  fgTie("/radios/adf/frequencies/selected", getADFFreq, setADFFreq);
+  fgTie("/radios/adf/frequencies/standby", getADFAltFreq, setADFAltFreq);
+  fgTie("/radios/adf/rotation", getADFRotation, setADFRotation);
+
+                               // Weather
+  fgTie("/environment/visibility", getVisibility, setVisibility);
+  fgTie("/environment/wind-north", getWindNorth, setWindNorth);
+  fgTie("/environment/wind-east", getWindEast, setWindEast);
+  fgTie("/environment/wind-down", getWindDown, setWindDown);
+
+                               // View
+  fgTie("/sim/view/axes/long", (double(*)())0, setViewAxisLong);
+  fgTie("/sim/view/axes/lat", (double(*)())0, setViewAxisLat);
+
+  _altitude_countdown = 0;
   _needReinit = false;
 
   FG_LOG(FG_GENERAL, FG_INFO, "Ending BFI init");
@@ -335,6 +341,9 @@ FGBFI::init ()
 void
 FGBFI::update ()
 {
+  _check_altitude();
+  _check_lighting();
+  _set_view_from_axes();
   if (_needReinit) {
     reinit();
   }
@@ -362,7 +371,7 @@ FGBFI::getFlightModel ()
 /**
  * Return the current aircraft as a string.
  */
-const string &
+string
 FGBFI::getAircraft ()
 {
   _temp = globals->get_options()->get_aircraft();
@@ -373,7 +382,7 @@ FGBFI::getAircraft ()
 /**
  * Return the current aircraft directory (UIUC) as a string.
  */
-const string &
+string 
 FGBFI::getAircraftDir ()
 {
   _temp = aircraft_dir;
@@ -400,7 +409,7 @@ FGBFI::setFlightModel (int model)
  * Set the current aircraft.
  */
 void
-FGBFI::setAircraft (const string &aircraft)
+FGBFI::setAircraft (string aircraft)
 {
   if (getAircraft() != aircraft) {
     globals->get_options()->set_aircraft(aircraft);
@@ -413,7 +422,7 @@ FGBFI::setAircraft (const string &aircraft)
  * Set the current aircraft directory (UIUC).
  */
 void
-FGBFI::setAircraftDir (const string &dir)
+FGBFI::setAircraftDir (string dir)
 {
   if (getAircraftDir() != dir) {
     aircraft_dir = dir;
@@ -425,10 +434,17 @@ FGBFI::setAircraftDir (const string &dir)
 /**
  * Return the current Zulu time.
  */
-time_t
-FGBFI::getTimeGMT ()
+string 
+FGBFI::getDateString ()
 {
-  return globals->get_time_params()->get_cur_time();
+  string out;
+  char buf[64];
+  struct tm * t = globals->get_time_params()->getGmt();
+  sprintf(buf, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d",
+         t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+         t->tm_hour, t->tm_min, t->tm_sec);
+  out = buf;
+  return out;
 }
 
 
@@ -436,28 +452,56 @@ FGBFI::getTimeGMT ()
  * Set the current Zulu time.
  */
 void
-FGBFI::setTimeGMT (time_t time)
-{
-  if (getTimeGMT() != time) {
-                               // FIXME: need to update lighting
-                               // and solar system
-    globals->get_options()->set_time_offset(time);
-    globals->get_options()->set_time_offset_type(FGOptions::FG_TIME_GMT_ABSOLUTE);
-    globals->get_time_params()->update( cur_fdm_state->get_Longitude(),
-                                       cur_fdm_state->get_Latitude(),
-                                       globals->get_warp() );
-    needReinit();
+FGBFI::setDateString (string date_string)
+// FGBFI::setTimeGMT (time_t time)
+{
+  SGTime * st = globals->get_time_params();
+  struct tm * current_time = st->getGmt();
+  struct tm new_time;
+
+                               // Scan for basic ISO format
+                               // YYYY-MM-DDTHH:MM:SS
+  int ret = sscanf(date_string.c_str(), "%d-%d-%dT%d:%d:%d",
+                  &(new_time.tm_year), &(new_time.tm_mon),
+                  &(new_time.tm_mday), &(new_time.tm_hour),
+                  &(new_time.tm_min), &(new_time.tm_sec));
+
+                               // Be pretty picky about this, so
+                               // that strange things don't happen
+                               // if the save file has been edited
+                               // by hand.
+  if (ret != 6) {
+    FG_LOG(FG_INPUT, FG_ALERT, "Date/time string " << date_string
+          << " not in YYYY-MM-DDTHH:MM:SS format; skipped");
+    return;
   }
+
+                               // OK, it looks like we got six
+                               // values, one way or another.
+  new_time.tm_year -= 1900;
+  new_time.tm_mon -= 1;
+
+                               // Now, tell flight gear to use
+                               // the new time.  This was far
+                               // too difficult, by the way.
+  long int warp =
+    mktime(&new_time) - mktime(current_time) + globals->get_warp();
+  double lon = current_aircraft.fdm_state->get_Longitude();
+  double lat = current_aircraft.fdm_state->get_Latitude();
+  double alt = current_aircraft.fdm_state->get_Altitude() * FEET_TO_METER;
+  globals->set_warp(warp);
+  st->update(lon, lat, warp);
+  fgUpdateSkyAndLightingParams();
 }
 
 
 /**
  * Return the GMT as a string.
  */
-const string &
+string 
 FGBFI::getGMTString ()
 {
-  static string out;           // FIXME: not thread-safe
+  string out;
   char buf[16];
   struct tm * t = globals->get_time_params()->getGmt();
   sprintf(buf, " %.2d:%.2d:%.2d",
@@ -582,6 +626,9 @@ void
 FGBFI::setLatitude (double latitude)
 {
   current_aircraft.fdm_state->set_Latitude(latitude * DEG_TO_RAD);
+  fgUpdateSkyAndLightingParams();
+  if (_lighting_countdown <= 0)
+    _lighting_countdown = 5;
 }
 
 
@@ -602,6 +649,9 @@ void
 FGBFI::setLongitude (double longitude)
 {
   current_aircraft.fdm_state->set_Longitude(longitude * DEG_TO_RAD);
+  fgUpdateSkyAndLightingParams();
+  if (_lighting_countdown <= 0)
+    _lighting_countdown = 5;
 }
 
 
@@ -634,6 +684,22 @@ void
 FGBFI::setAltitude (double altitude)
 {
   current_aircraft.fdm_state->set_Altitude(altitude);
+
+                               // 2000-12-07
+                               // This is an ugly kludge around a
+                               // LaRCsim problem; if the
+                               // requested altitude cannot be
+                               // set right away (because it's
+                               // below the last-calculated ground
+                               // level), pause FGFS, wait for
+                               // five frames, and then try again.
+  if (_altitude_countdown <= 0 &&
+      fabs(getAltitude() - altitude) > 5.0) {
+    _altitude_countdown = 5;
+    _requested_altitude = altitude;
+    _saved_freeze = globals->get_freeze();
+    globals->set_freeze(true);
+  }
 }
 
 
@@ -1352,13 +1418,14 @@ FGBFI::getNAV1TO ()
   if (current_radiostack->get_nav1_inrange()) {
     double heading = current_radiostack->get_nav1_heading();
     double radial = current_radiostack->get_nav1_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav1_loc()) {
       double offset = fabs(heading - radial);
       return (offset<= 8.0 || offset >= 352.0);
     } else {
-      double offset =
-       fabs(heading - var - radial);
+//       double offset =
+//     fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset <= 20.0 || offset >= 340.0);
     }
   } else {
@@ -1372,13 +1439,14 @@ FGBFI::getNAV1FROM ()
   if (current_radiostack->get_nav1_inrange()) {
     double heading = current_radiostack->get_nav1_heading();
     double radial = current_radiostack->get_nav1_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav1_loc()) {
       double offset = fabs(heading - radial);
       return (offset >= 172.0 && offset<= 188.0);
     } else {
-      double offset =
-       fabs(heading - var - radial);
+//       double offset =
+//     fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset >= 160.0 && offset <= 200.0);
     }
   } else {
@@ -1435,13 +1503,14 @@ FGBFI::getNAV2TO ()
   if (current_radiostack->get_nav2_inrange()) {
     double heading = current_radiostack->get_nav2_heading();
     double radial = current_radiostack->get_nav2_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav2_loc()) {
       double offset = fabs(heading - radial);
       return (offset<= 8.0 || offset >= 352.0);
     } else {
-      double offset =
-       fabs(heading - var - radial);
+//       double offset =
+//     fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset <= 20.0 || offset >= 340.0);
     }
   } else {
@@ -1455,13 +1524,14 @@ FGBFI::getNAV2FROM ()
   if (current_radiostack->get_nav2_inrange()) {
     double heading = current_radiostack->get_nav2_heading();
     double radial = current_radiostack->get_nav2_radial();
-    double var = FGBFI::getMagVar();
+//     double var = FGBFI::getMagVar();
     if (current_radiostack->get_nav2_loc()) {
       double offset = fabs(heading - radial);
       return (offset >= 172.0 && offset<= 188.0);
     } else {
-      double offset =
-       fabs(heading - var - radial);
+//       double offset =
+//     fabs(heading - var - radial);
+      double offset = fabs(heading - radial);
       return (offset >= 160.0 && offset <= 200.0);
     }
   } else {
@@ -1593,7 +1663,7 @@ FGBFI::setGPSLock (bool lock)
 /**
  * Get the GPS target airport code.
  */
-const string &
+string 
 FGBFI::getTargetAirport ()
 {
   // FIXME: not thread-safe
@@ -1608,9 +1678,8 @@ FGBFI::getTargetAirport ()
  * Set the GPS target airport code.
  */
 void
-FGBFI::setTargetAirport (const string &airportId)
+FGBFI::setTargetAirport (string airportId)
 {
-  // cout << "setting target airport id = " << airportId << endl;
   globals->get_options()->set_airport_id(airportId);
 }
 
@@ -1653,7 +1722,7 @@ FGBFI::setGPSTargetLongitude (double longitude)
 
 
 /**
- * Get the current visible (units??).
+ * Get the current visibility (meters).
  */
 double
 FGBFI::getVisibility ()
@@ -1667,7 +1736,7 @@ FGBFI::getVisibility ()
 
 
 /**
- * Set the current visibility (units??).
+ * Set the current visibility (meters).
  */
 void
 FGBFI::setVisibility (double visibility)
@@ -1680,6 +1749,90 @@ FGBFI::setVisibility (double visibility)
 }
 
 
+/**
+ * Get the current wind north velocity (feet/second).
+ */
+double
+FGBFI::getWindNorth ()
+{
+  return current_aircraft.fdm_state->get_V_north_airmass();
+}
+
+
+/**
+ * Set the current wind north velocity (feet/second).
+ */
+void
+FGBFI::setWindNorth (double speed)
+{
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(speed,
+                                                          getWindEast(),
+                                                          getWindDown());
+}
+
+
+/**
+ * Get the current wind east velocity (feet/second).
+ */
+double
+FGBFI::getWindEast ()
+{
+  return current_aircraft.fdm_state->get_V_east_airmass();
+}
+
+
+/**
+ * Set the current wind east velocity (feet/second).
+ */
+void
+FGBFI::setWindEast (double speed)
+{
+  cout << "Set wind-east to " << speed << endl;
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+                                                          speed,
+                                                          getWindDown());
+}
+
+
+/**
+ * Get the current wind down velocity (feet/second).
+ */
+double
+FGBFI::getWindDown ()
+{
+  return current_aircraft.fdm_state->get_V_down_airmass();
+}
+
+
+/**
+ * Set the current wind down velocity (feet/second).
+ */
+void
+FGBFI::setWindDown (double speed)
+{
+  current_aircraft.fdm_state->set_Velocities_Local_Airmass(getWindNorth(),
+                                                          getWindEast(),
+                                                          speed);
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// View.
+////////////////////////////////////////////////////////////////////////
+
+void
+FGBFI::setViewAxisLong (double axis)
+{
+  axisLong = axis;
+}
+
+void
+FGBFI::setViewAxisLat (double axis)
+{
+  axisLat = axis;
+}
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // Time