]> git.mxchange.org Git - flightgear.git/blobdiff - src/Main/fg_init.cxx
Merge branch 'maint' (early part) into next
[flightgear.git] / src / Main / fg_init.cxx
index e5da97091158a404f5887c51175b1c3b00669d4a..fd245f754e788245edc7aa53a1bde06c3d821c65 100644 (file)
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started August 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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,8 +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$
 
 #  include <config.h>
 #endif
 
-// For BC 5.01 this must be included before OpenGL includes.
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>             // strcmp()
 
-
 #if defined( unix ) || defined( __CYGWIN__ )
 #  include <unistd.h>           // for gethostname()
 #endif
+#if defined( _MSC_VER) || defined(__MINGW32__)
+#  include <direct.h>           // for getcwd()
+#  define getcwd _getcwd
+#  include <io.h>               // isatty()
+#  define isatty _isatty
+#endif
 
 // work around a stdc++ lib bug in some versions of linux, but doesn't
 // seem to hurt to have this here for all versions of Linux.
 #endif
 
 #include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/point3d.hxx>
+#include <simgear/structure/exception.hxx>
+#include <simgear/structure/event_mgr.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/misc/interpolator.hxx>
 #include <simgear/scene/material/matlib.hxx>
-#ifdef FG_USE_CLOUDS_3D
-#  include <simgear/scene/sky/clouds3d/SkySceneLoader.hpp>
-#  include <simgear/scene/sky/clouds3d/SkyUtil.hpp>
-#  include <simgear/screen/texture.hxx>
-#endif
+#include <simgear/scene/model/particles.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
-#include <FDM/UIUCModel/uiuc_aircraftdir.h>
+#include <Aircraft/controls.hxx>
+#include <Aircraft/replay.hxx>
+#include <Airports/apt_loader.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
-#include <ATC/ATCdisplay.hxx>
-#include <ATC/ATCmgr.hxx>
-#include <ATC/AIMgr.hxx>
-#include <Autopilot/auto_gui.hxx>
-#include <Autopilot/newauto.hxx>
+#include <Airports/dynamics.hxx>
+
+#include <AIModel/AIManager.hxx>
+#include <ATCDCL/ATCmgr.hxx>
+#include <ATCDCL/AIMgr.hxx>
+#include <Autopilot/route_mgr.hxx>
+#include <Autopilot/xmlauto.hxx>
 #include <Cockpit/cockpit.hxx>
-#include <Cockpit/radiostack.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
-#include <FDM/ADA.hxx>
-#include <FDM/Balloon.h>
+#ifdef ENABLE_SP_FDM
+#include <FDM/SP/ADA.hxx>
+#include <FDM/SP/ACMS.hxx>
+#include <FDM/SP/MagicCarpet.hxx>
+#include <FDM/SP/Balloon.h>
+#endif
 #include <FDM/ExternalNet/ExternalNet.hxx>
 #include <FDM/ExternalPipe/ExternalPipe.hxx>
 #include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim/LaRCsim.hxx>
-#include <FDM/MagicCarpet.hxx>
 #include <FDM/UFO.hxx>
 #include <FDM/NullFDM.hxx>
 #include <FDM/YASim/YASim.hxx>
 #include <Input/input.hxx>
 #include <Instrumentation/instrument_mgr.hxx>
 #include <Model/acmodel.hxx>
-#include <Navaids/fixlist.hxx>
-#include <Navaids/ilslist.hxx>
-#include <Navaids/mkrbeacons.hxx>
+#include <AIModel/submodel.hxx>
+#include <AIModel/AIManager.hxx>
+#include <Navaids/navdb.hxx>
 #include <Navaids/navlist.hxx>
-#include <Replay/replay.hxx>
+#include <Navaids/fix.hxx>
+#include <Navaids/fixlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
-#if defined(HAVE_PLIB_PSL)
-#include <Scripting/scriptmgr.hxx>
-#endif
+#include <Scripting/NasalSys.hxx>
 #include <Sound/fg_fx.hxx>
+#include <Sound/beacon.hxx>
+#include <Sound/morse.hxx>
+#include <Sound/voice.hxx>
 #include <Systems/system_mgr.hxx>
-#include <Time/FGEventMgr.hxx>
 #include <Time/light.hxx>
-#include <Time/sunpos.hxx>
-#include <Time/moonpos.hxx>
+#include <Time/sunsolver.hxx>
 #include <Time/tmp.hxx>
+#include <Traffic/TrafficMgr.hxx>
+#include <MultiPlayer/multiplaymgr.hxx>
 
-#ifdef FG_MPLAYER_AS
-#include <MultiPlayer/multiplaytxmgr.hxx>
-#include <MultiPlayer/multiplayrxmgr.hxx>
-#endif
-
-#ifdef FG_WEATHERCM
-#  include <WeatherCM/FGLocalWeatherDatabase.h>
-#else
-#  include <Environment/environment_mgr.hxx>
-#endif
+#include <Environment/environment_mgr.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
 #include "options.hxx"
 #include "globals.hxx"
 #include "logger.hxx"
+#include "renderer.hxx"
 #include "viewmgr.hxx"
+#include "main.hxx"
 
-#if defined(FX) && defined(XMESA)
-#include <GL/xmesa.h>
+#ifdef __APPLE__
+#  include <CoreFoundation/CoreFoundation.h>
 #endif
 
-SG_USING_STD(string);
-
+using std::string;
 
 class Sound;
-
 extern const char *default_root;
-
-#ifdef FG_USE_CLOUDS_3D
-  SkySceneLoader *sgCloud3d;
-#endif
+float init_volume;
 
 
 // Scan the command line options for the specified option and return
@@ -153,6 +145,14 @@ extern const char *default_root;
 static string fgScanForOption( const string& option, int argc, char **argv ) {
     int i = 1;
 
+    if (hostname == NULL)
+    {
+        char _hostname[256];
+        gethostname(_hostname, 256);
+        hostname = strdup(_hostname);
+        free_hostname = true;
+    }
+
     SG_LOG(SG_GENERAL, SG_INFO, "Scanning command line for: " << option );
 
     int len = option.length();
@@ -185,20 +185,9 @@ static string fgScanForOption( const string& option, const string& path ) {
     int len = option.length();
 
     in >> skipcomment;
-#ifndef __MWERKS__
     while ( ! in.eof() ) {
-#else
-    char c = '\0';
-    while ( in.get(c) && c != '\0' ) {
-       in.putback(c);
-#endif
        string line;
-
-#if defined( macintosh )
-        getline( in, line, '\r' );
-#else
        getline( in, line, '\n' );
-#endif
 
         // catch extraneous (DOS) line ending character
         if ( line[line.length() - 1] < 32 ) {
@@ -215,46 +204,60 @@ static string fgScanForOption( const string& option, const string& path ) {
     return "";
 }
 
-
-// Read in configuration (files and command line options) but only set
-// fg_root
-bool fgInitFGRoot ( int argc, char **argv ) {
-    string root;
-    char* envp;
-
-    // First parse command line options looking for --fg-root=, this
-    // will override anything specified in a config file
-    root = fgScanForOption( "--fg-root=", argc, argv);
+// Scan the user config files for the specified option and return
+// the value.
+static string fgScanForOption( const string& option ) {
+    string arg("");
 
 #if defined( unix ) || defined( __CYGWIN__ )
     // Next check home directory for .fgfsrc.hostname file
-    if ( root.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
+    if ( arg.empty() ) {
+        if ( homedir != NULL ) {
+            SGPath config( homedir );
             config.append( ".fgfsrc" );
-            char name[256];
-            gethostname( name, 256 );
             config.concat( "." );
-            config.concat( name );
-            root = fgScanForOption( "--fg-root=", config.str() );
+            config.concat( hostname );
+            arg = fgScanForOption( option, config.str() );
         }
     }
 #endif
 
     // Next check home directory for .fgfsrc file
-    if ( root.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
+    if ( arg.empty() ) {
+        if ( homedir != NULL ) {
+            SGPath config( homedir );
             config.append( ".fgfsrc" );
-            root = fgScanForOption( "--fg-root=", config.str() );
+            arg = fgScanForOption( option, config.str() );
         }
     }
+
+    if ( arg.empty() ) {
+        // Check for $fg_root/system.fgfsrc
+        SGPath config( globals->get_fg_root() );
+        config.append( "system.fgfsrc" );
+        arg = fgScanForOption( option, config.str() );
+    }
+
+    return arg;
+}
+
+
+// Read in configuration (files and command line options) but only set
+// fg_root
+bool fgInitFGRoot ( int argc, char **argv ) {
+    string root;
+
+    // First parse command line options looking for --fg-root=, this
+    // will override anything specified in a config file
+    root = fgScanForOption( "--fg-root=", argc, argv);
+
+    // Check in one of the user configuration files.
+    if (root.empty() )
+        root = fgScanForOption( "--fg-root=" );
     
     // Next check if fg-root is set as an env variable
     if ( root.empty() ) {
-        envp = ::getenv( "FG_ROOT" );
+        char *envp = ::getenv( "FG_ROOT" );
         if ( envp != NULL ) {
             root = envp;
         }
@@ -267,8 +270,23 @@ bool fgInitFGRoot ( int argc, char **argv ) {
         root = "/FlightGear";
 #elif defined( WIN32 )
         root = "\\FlightGear";
-#elif defined( macintosh )
-        root = "";
+#elif defined(__APPLE__) 
+        /*
+        The following code looks for the base package inside the application 
+        bundle, in the standard Contents/Resources location. 
+        */
+        CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
+
+        // look for a 'data' subdir
+        CFURLRef dataDir = CFURLCreateCopyAppendingPathComponent(NULL, resourcesUrl, CFSTR("data"), true);
+
+        // now convert down to a path, and the a c-string
+        CFStringRef path = CFURLCopyFileSystemPath(dataDir, kCFURLPOSIXPathStyle);
+        root = CFStringGetCStringPtr(path, CFStringGetSystemEncoding());
+
+        CFRelease(resourcesUrl);
+        CFRelease(dataDir);
+        CFRelease(path);
 #else
         root = PKGLIBDIR;
 #endif
@@ -285,36 +303,21 @@ bool fgInitFGRoot ( int argc, char **argv ) {
 // aircraft
 bool fgInitFGAircraft ( int argc, char **argv ) {
     string aircraft;
-    char* envp;
 
     // First parse command line options looking for --aircraft=, this
     // will override anything specified in a config file
     aircraft = fgScanForOption( "--aircraft=", argc, argv );
-
-#if defined( unix ) || defined( __CYGWIN__ )
-    // Next check home directory for .fgfsrc.hostname file
     if ( aircraft.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
-            config.append( ".fgfsrc" );
-            char name[256];
-            gethostname( name, 256 );
-            config.concat( "." );
-            config.concat( name );
-            aircraft = fgScanForOption( "--aircraft=", config.str() );
-        }
+        // check synonym option
+        aircraft = fgScanForOption( "--vehicle=", argc, argv );
     }
-#endif
 
-    // Next check home directory for .fgfsrc file
+    // Check in one of the user configuration files.
     if ( aircraft.empty() ) {
-        envp = ::getenv( "HOME" );
-        if ( envp != NULL ) {
-            SGPath config( envp );
-            config.append( ".fgfsrc" );
-            aircraft = fgScanForOption( "--aircraft=", config.str() );
-        }
+        aircraft = fgScanForOption( "--aircraft=" );
+    }
+    if ( aircraft.empty() ) {
+        aircraft = fgScanForOption( "--vehicle=" );
     }
 
     // if an aircraft was specified, set the property name
@@ -399,18 +402,17 @@ SGPropertyNode *fgInitLocale(const char *language) {
 
    const char *d_path_str = d_node->getStringValue("strings");
    if (!d_path_str) {
-      SG_LOG(SG_GENERAL, SG_ALERT, "Incorrect path in configuration file.");
+      SG_LOG(SG_GENERAL, SG_ALERT, "No path in " << d_node->getPath() << "/strings.");
       return NULL;
    }
 
    d_path.append(d_path_str);
-   SG_LOG(SG_GENERAL, SG_INFO, "Reading localized strings from "
-                                  << d_path.str());
+   SG_LOG(SG_GENERAL, SG_INFO, "Reading localized strings from " << d_path.str());
 
    SGPropertyNode *strings = c_node->getNode("strings");
    try {
       readProperties(d_path.str(), strings);
-   } catch (const sg_exception &e) {
+   } catch (const sg_exception &) {
       SG_LOG(SG_GENERAL, SG_ALERT, "Unable to read the localized strings");
       return NULL;
    }
@@ -423,18 +425,18 @@ SGPropertyNode *fgInitLocale(const char *language) {
 
       const char *c_path_str = c_node->getStringValue("strings");
       if (!c_path_str) {
-         SG_LOG(SG_GENERAL, SG_ALERT, "Incorrect path in configuration file.");
+         SG_LOG(SG_GENERAL, SG_ALERT, "No path in " << c_node->getPath() << "/strings");
          return NULL;
       }
 
       c_path.append(c_path_str);
-      SG_LOG(SG_GENERAL, SG_INFO, "Reading localized strings from "
-                                     << c_path.str());
+      SG_LOG(SG_GENERAL, SG_INFO, "Reading localized strings from " << c_path.str());
 
       try {
          readProperties(c_path.str(), strings);
-      } catch (const sg_exception &e) {
-         SG_LOG(SG_GENERAL, SG_ALERT, "Unable to read the localized strings");
+      } catch (const sg_exception &) {
+         SG_LOG(SG_GENERAL, SG_ALERT,
+                 "Unable to read the localized strings from " << c_path.str());
          return NULL;
       }
    }
@@ -446,7 +448,7 @@ SGPropertyNode *fgInitLocale(const char *language) {
 
 // Initialize the localization routines
 bool fgDetectLanguage() {
-    char *language = ::getenv("LANG");
+    const char *language = ::getenv("LANG");
 
     if (language == NULL) {
         SG_LOG(SG_GENERAL, SG_INFO, "Unable to detect the language" );
@@ -477,27 +479,22 @@ do_options (int argc, char ** argv)
     fgParseOptions(config.str());
 
 #if defined( unix ) || defined( __CYGWIN__ )
-    char name[256];
-    // Check for $fg_root/system.fgfsrc.hostname
-    gethostname( name, 256 );
     config.concat( "." );
-    config.concat( name );
+    config.concat( hostname );
     fgParseOptions(config.str());
 #endif
 
     // Check for ~/.fgfsrc
-    char* envp = ::getenv( "HOME" );
-    if ( envp != NULL ) {
-        config.set( envp );
+    if ( homedir != NULL ) {
+        config.set( homedir );
         config.append( ".fgfsrc" );
         fgParseOptions(config.str());
     }
 
 #if defined( unix ) || defined( __CYGWIN__ )
     // Check for ~/.fgfsrc.hostname
-    gethostname( name, 256 );
     config.concat( "." );
-    config.concat( name );
+    config.concat( hostname );
     fgParseOptions(config.str());
 #endif
 
@@ -507,6 +504,68 @@ do_options (int argc, char ** argv)
 }
 
 
+static string fgFindAircraftPath( const SGPath &path, const string &aircraft,
+                                  SGPropertyNode *cache, int depth = 0 )
+{
+    const int MAXDEPTH = 1;
+
+    ulDirEnt* dire;
+    ulDir *dirp = ulOpenDir(path.str().c_str());
+    if (dirp == NULL) {
+        cerr << "Unable to open aircraft directory '" << path.str() << '\'' << endl;
+        exit(-1);
+    }
+
+    string result;
+    while ((dire = ulReadDir(dirp)) != NULL) {
+        if (dire->d_isdir) {
+            if (depth > MAXDEPTH)
+                continue;
+
+            if (!strcmp("CVS", dire->d_name) || !strcmp(".", dire->d_name)
+                    || !strcmp("..", dire->d_name) || !strcmp("AI", dire->d_name))
+                continue;
+
+            SGPath next = path;
+            next.append(dire->d_name);
+
+            result = fgFindAircraftPath( next, aircraft, cache, depth + 1 );
+            if ( ! result.empty() )
+                break;
+
+        } else {
+            int len = strlen(dire->d_name);
+            if (len < 9 || strcmp(dire->d_name + len - 8, "-set.xml"))
+                continue;
+
+            // create cache node
+            int i = 0;
+            while (1)
+                if (!cache->getChild("aircraft", i++, false))
+                    break;
+
+            SGPropertyNode *n, *entry = cache->getChild("aircraft", --i, true);
+
+            n = entry->getNode("file", true);
+            n->setStringValue(dire->d_name);
+            n->setAttribute(SGPropertyNode::USERARCHIVE, true);
+
+            n = entry->getNode("path", true);
+            n->setStringValue(path.str().c_str());
+            n->setAttribute(SGPropertyNode::USERARCHIVE, true);
+
+            if ( !strcmp(dire->d_name, aircraft.c_str()) ) {
+                result = path.str();
+                break;
+            }
+        }
+    }
+
+    ulCloseDir(dirp);
+    return result;
+}
+
+
 // Read in configuration (file and command line)
 bool fgInitConfig ( int argc, char **argv ) {
 
@@ -523,37 +582,109 @@ bool fgInitConfig ( int argc, char **argv ) {
         return false;
     }
 
+    SGPropertyNode autosave;
+#if defined( _MSC_VER ) || defined( __MINGW32__ )
+    char *envp = ::getenv( "APPDATA" );
+    if (envp != NULL ) {
+        SGPath config( envp );
+        config.append( "flightgear.org" );
+#else
+    if ( homedir != NULL ) {
+        SGPath config( homedir );
+        config.append( ".fgfs" );
+#endif
+        const char *fg_home = getenv("FG_HOME");
+        if (fg_home)
+            config = fg_home;
+
+        SGPath home_export(config.str());
+        home_export.append("Export/dummy");
+        home_export.create_dir(0777);
+
+        // Set /sim/fg-home and don't allow malign code to override it until
+        // Nasal security is set up.  Use FG_HOME if necessary.
+        SGPropertyNode *home = fgGetNode("/sim", true);
+        home->removeChild("fg-home", 0, false);
+        home = home->getChild("fg-home", 0, true);
+        home->setStringValue(config.c_str());
+        home->setAttribute(SGPropertyNode::WRITE, false);
+
+        config.append( "autosave.xml" );
+        SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << config.str());
+        try {
+            readProperties(config.str(), &autosave, SGPropertyNode::USERARCHIVE);
+        } catch (...) {
+            SG_LOG(SG_INPUT, SG_DEBUG, "First time reading user settings");
+        }
+        SG_LOG(SG_INPUT, SG_DEBUG, "Finished Reading user settings");
+    }
+    SGPropertyNode *cache_root = autosave.getNode("sim/startup/path-cache", true);
+
+
     // Scan user config files and command line for a specified aircraft.
     fgInitFGAircraft(argc, argv);
 
-    string aircraft = fgGetString("/sim/aircraft", "");
+    string aircraft = fgGetString( "/sim/aircraft", "" );
     if ( aircraft.size() > 0 ) {
-        SGPath aircraft_path(globals->get_fg_root());
-        aircraft_path.append("Aircraft");
-        aircraft_path.append(aircraft);
-        aircraft_path.concat("-set.xml");
-
-        if ( !ulFileExists(aircraft_path.c_str()) ) {
-            aircraft_path = globals->get_fg_root();
-            aircraft_path.append("Aircraft");
-            aircraft_path.append(aircraft);
-            aircraft_path.append(aircraft);
-            aircraft_path.concat("-set.xml");
+        SGPath aircraft_search( globals->get_fg_root() );
+        aircraft_search.append( "Aircraft" );
+
+        string aircraft_set = aircraft + "-set.xml";
+        string result;
+
+        // check if the *-set.xml file is already in the cache
+        if (globals->get_fg_root() == cache_root->getStringValue("fg-root", "")) {
+            vector<SGPropertyNode_ptr> cache = cache_root->getChildren("aircraft");
+            for (unsigned int i = 0; i < cache.size(); i++) {
+                const char *name = cache[i]->getStringValue("file", "");
+                if (aircraft_set == name) {
+                    const char *path = cache[i]->getStringValue("path", "");
+                    SGPath xml(path);
+                    xml.append(name);
+                    if (xml.exists())
+                        result = path;
+                    break;
+                }
+            }
         }
-        SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
-               << " from " << aircraft_path.str());
-        try {
-            readProperties(aircraft_path.str(), globals->get_props());
-        } catch (const sg_exception &e) {
-            string message = "Error reading default aircraft: ";
-            message += e.getFormattedMessage();
-            SG_LOG(SG_INPUT, SG_ALERT, message);
-            exit(2);
+
+        if (result.empty()) {
+            // prepare cache for rescan
+            SGPropertyNode *n = cache_root->getNode("fg-root", true);
+            n->setStringValue(globals->get_fg_root().c_str());
+            n->setAttribute(SGPropertyNode::USERARCHIVE, true);
+            cache_root->removeChildren("aircraft");
+
+            result = fgFindAircraftPath( aircraft_search, aircraft_set, cache_root );
+        }
+
+        if ( !result.empty() ) {
+            fgSetString( "/sim/aircraft-dir", result.c_str() );
+            SGPath full_name( result );
+            full_name.append( aircraft_set );
+
+            SG_LOG(SG_INPUT, SG_INFO, "Reading default aircraft: " << aircraft
+                   << " from " << full_name.str());
+            try {
+                readProperties( full_name.str(), globals->get_props() );
+            } catch ( const sg_exception &e ) {
+                string message = "Error reading default aircraft: ";
+                message += e.getFormattedMessage();
+                SG_LOG(SG_INPUT, SG_ALERT, message);
+                exit(2);
+            }
+        } else {
+            SG_LOG( SG_INPUT, SG_ALERT, "Cannot find specified aircraft: "
+                    << aircraft );
+            return false;
         }
+
     } else {
-        SG_LOG(SG_INPUT, SG_ALERT, "No default aircraft specified");
+        SG_LOG( SG_INPUT, SG_ALERT, "No default aircraft specified" );
     }
 
+    copyProperties(&autosave, globals->get_props());
+
     // parse options after loading aircraft to ensure any user
     // overrides of defaults are honored.
     do_options(argc, argv);
@@ -561,249 +692,158 @@ bool fgInitConfig ( int argc, char **argv ) {
     return true;
 }
 
-
-// find basic airport location info from airport database
-bool fgFindAirportID( const string& id, FGAirport *a ) {
-    FGAirport result;
-    if ( id.length() ) {
-        SG_LOG( SG_GENERAL, SG_INFO, "Searching for airport code = " << id );
-
-        result = globals->get_airports()->search( id );
-
-        if ( result.id.empty() ) {
-            SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find " << id << " in basic.dat.gz" );
-            return false;
-        }
+// Set current tower position lon/lat given an airport id
+static bool fgSetTowerPosFromAirportID( const string& id) {
+    const FGAirport *a = fgFindAirportID( id);
+    if (a) {
+        SGGeod tower = a->getTowerLocation();
+        fgSetDouble("/sim/tower/longitude-deg",  tower.getLongitudeDeg());
+        fgSetDouble("/sim/tower/latitude-deg",  tower.getLatitudeDeg());
+        fgSetDouble("/sim/tower/altitude-ft", tower.getElevationFt());
+        return true;
     } else {
         return false;
     }
 
-    *a = result;
-
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Position for " << id << " is ("
-            << a->longitude << ", "
-            << a->latitude << ")" );
-
-    return true;
 }
 
+struct FGTowerLocationListener : SGPropertyChangeListener {
+    void valueChanged(SGPropertyNode* node) {
+        const string id(node->getStringValue());
+        fgSetTowerPosFromAirportID(id);
+    }
+};
 
-// get airport elevation
-static double fgGetAirportElev( const string& id ) {
-    FGAirport a;
-    // double lon, lat;
-
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Finding elevation for airport: " << id );
+void fgInitTowerLocationListener() {
+    fgGetNode("/sim/tower/airport-id",  true)
+        ->addChangeListener( new FGTowerLocationListener(), true );
+}
 
-    if ( fgFindAirportID( id, &a ) ) {
-        return a.elevation;
-    } else {
-        return -9999.0;
+static void fgApplyStartOffset(const SGGeod& aStartPos, double aHeading, double aTargetHeading = HUGE_VAL)
+{
+  SGGeod startPos(aStartPos);
+  if (aTargetHeading == HUGE_VAL) {
+    aTargetHeading = aHeading;
+  }
+  
+  if ( fabs( fgGetDouble("/sim/presets/offset-distance-nm") ) > SG_EPSILON ) {
+    double offsetDistance = fgGetDouble("/sim/presets/offset-distance-nm");
+    offsetDistance *= SG_NM_TO_METER;
+    double offsetAzimuth = aHeading;
+    if ( fabs(fgGetDouble("/sim/presets/offset-azimuth-deg")) > SG_EPSILON ) {
+      offsetAzimuth = fgGetDouble("/sim/presets/offset-azimuth-deg");
+      aHeading = aTargetHeading;
     }
-}
 
+    SGGeod offset;
+    double az2; // dummy
+    SGGeodesy::direct(startPos, offsetAzimuth + 180, offsetDistance, offset, az2);
+    startPos = offset;
+  }
+
+  // presets
+  fgSetDouble("/sim/presets/longitude-deg", startPos.getLongitudeDeg() );
+  fgSetDouble("/sim/presets/latitude-deg", startPos.getLatitudeDeg() );
+  fgSetDouble("/sim/presets/heading-deg", aHeading );
+
+  // other code depends on the actual values being set ...
+  fgSetDouble("/position/longitude-deg",  startPos.getLongitudeDeg() );
+  fgSetDouble("/position/latitude-deg",  startPos.getLatitudeDeg() );
+  fgSetDouble("/orientation/heading-deg", aHeading );
+}
 
-// Preset lon/lat given an airport id
-static bool fgSetPosFromAirportID( const string& id ) {
-    FGAirport a;
-    // double lon, lat;
+// Set current_options lon/lat given an airport id and heading (degrees)
+static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
+    if ( id.empty() )
+        return false;
 
+    // set initial position from runway and heading
     SG_LOG( SG_GENERAL, SG_INFO,
-            "Attempting to set starting position from airport code " << id );
-
-    if ( fgFindAirportID( id, &a ) ) {
-        // presets
-        fgSetDouble("/sim/presets/longitude-deg", a.longitude );
-        fgSetDouble("/sim/presets/latitude-deg", a.latitude );
-
-        // other code depends on the actual postition being set so set
-        // that as well
-        fgSetDouble("/position/longitude-deg", a.longitude );
-        fgSetDouble("/position/latitude-deg", a.latitude );
+            "Attempting to set starting position from airport code "
+            << id << " heading " << tgt_hdg );
 
-        SG_LOG( SG_GENERAL, SG_INFO,
-                "Position for " << id << " is (" << a.longitude
-                << ", " << a.latitude << ")" );
+    const FGAirport* apt = fgFindAirportID(id);
+    if (!apt) return false;
+    FGRunway* r = apt->findBestRunwayForHeading(tgt_hdg);
+    fgSetString("/sim/atc/runway", r->ident().c_str());
 
-        return true;
-    } else {
-        return false;
-    }
+    SGGeod startPos = r->pointOnCenterline(fgGetDouble("/sim/airport/runways/start-offset-m", 5.0));
+         fgApplyStartOffset(startPos, r->headingDeg(), tgt_hdg);
+    return true;
 }
 
+// Set current_options lon/lat given an airport id and parkig position name
+static bool fgSetPosFromAirportIDandParkpos( const string& id, const string& parkpos ) {
+    if ( id.empty() )
+        return false;
 
-// Set current tower position lon/lat given an airport id
-static bool fgSetTowerPosFromAirportID( const string& id, double hdg ) {
-    FGAirport a;
-    // tower height hard coded for now...
-    float towerheight=50.0f;
-
-    // make a little off the heading for 1 runway airports...
-    float fudge_lon = fabs(sin(hdg)) * .003f;
-    float fudge_lat = .003f - fudge_lon;
-
-    if ( fgFindAirportID( id, &a ) ) {
-        fgSetDouble("/sim/tower/longitude-deg",  a.longitude + fudge_lon);
-        fgSetDouble("/sim/tower/latitude-deg",  a.latitude + fudge_lat);
-        fgSetDouble("/sim/tower/altitude-ft", a.elevation + towerheight);
-        return true;
-    } else {
+    // can't see an easy way around this const_cast at the moment
+    FGAirport* apt = const_cast<FGAirport*>(fgFindAirportID(id));
+    if (!apt) {
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to find airport " << id );
         return false;
     }
-
-}
-
-
-// Set current_options lon/lat given an airport id and heading (degrees)
-static bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
-    FGRunway r;
-
-    if ( id.length() ) {
-        // set initial position from runway and heading
-
-        SG_LOG( SG_GENERAL, SG_INFO,
-                "Attempting to set starting position from airport code "
-                << id << " heading " << tgt_hdg );
-               
-        if ( ! globals->get_runways()->search( id, (int)tgt_hdg, &r ) ) {
-            SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find a good runway for " << id << '\n' );
-            return false;
-        }      
-    } else {
+    FGAirportDynamics* dcs = apt->getDynamics();
+    if (!dcs) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Failed to find parking position " << parkpos <<
+                " at airport " << id );
         return false;
     }
-
-    double lat2, lon2, az2;
-    double heading = r.heading;
-    double azimuth = heading + 180.0;
-    while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
-
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "runway =  " << r.lon << ", " << r.lat
-            << " length = " << r.length * SG_FEET_TO_METER 
-            << " heading = " << azimuth );
-           
-    geo_direct_wgs_84 ( 0, r.lat, r.lon, azimuth, 
-                        r.length * SG_FEET_TO_METER * 0.5 - 5.0,
-                        &lat2, &lon2, &az2 );
-
-    if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON ) {
-        double olat, olon;
-        double odist = fgGetDouble("/sim/presets/offset-distance");
-        odist *= SG_NM_TO_METER;
-        double oaz = azimuth;
-        if ( fabs(fgGetDouble("/sim/presets/offset-azimuth")) > SG_EPSILON ) {
-            oaz = fgGetDouble("/sim/presets/offset-azimuth") + 180;
-            heading = tgt_hdg;
-        }
-        while ( oaz >= 360.0 ) { oaz -= 360.0; }
-        geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
-        lat2=olat;
-        lon2=olon;
+    
+    int park_index = dcs->getNrOfParkings() - 1;
+    while (park_index >= 0 && dcs->getParkingName(park_index) != parkpos) park_index--;
+    if (park_index < 0) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Failed to find parking position " << parkpos <<
+                " at airport " << id );
+        return false;
     }
-
-    // presets
-    fgSetDouble("/sim/presets/longitude-deg",  lon2 );
-    fgSetDouble("/sim/presets/latitude-deg",  lat2 );
-    fgSetDouble("/sim/presets/heading-deg", heading );
-
-    // other code depends on the actual values being set ...
-    fgSetDouble("/position/longitude-deg",  lon2 );
-    fgSetDouble("/position/latitude-deg",  lat2 );
-    fgSetDouble("/orientation/heading-deg", heading );
-
-    SG_LOG( SG_GENERAL, SG_INFO,
-            "Position for " << id << " is ("
-            << lon2 << ", "
-            << lat2 << ") new heading is "
-            << heading );
-           
+    FGParking* parking = dcs->getParking(park_index);
+    fgApplyStartOffset(
+      SGGeod::fromDeg(parking->getLongitude(), parking->getLatitude()),
+      parking->getHeading());
     return true;
 }
 
 
 // Set current_options lon/lat given an airport id and runway number
-static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
-    FGRunway r;
-
-    if ( id.length() ) {
-        // set initial position from airport and runway number
-
-        SG_LOG( SG_GENERAL, SG_INFO,
-                "Attempting to set starting position for "
-                << id << ":" << rwy );
-
-        if ( ! globals->get_runways()->search( id, rwy, &r ) ) {
-            SG_LOG( SG_GENERAL, SG_ALERT,
-                    "Failed to find runway " << rwy << 
-                    " at airport " << id );
-            return false;
-        }
-    } else {
+static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy, bool rwy_req ) {
+    if ( id.empty() )
         return false;
-    }
 
-    double lat2, lon2, az2;
-    double heading = r.heading;
-    double azimuth = heading + 180.0;
-    while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
-    
+    // set initial position from airport and runway number
     SG_LOG( SG_GENERAL, SG_INFO,
-    "runway =  " << r.lon << ", " << r.lat
-    << " length = " << r.length * SG_FEET_TO_METER 
-    << " heading = " << azimuth );
-    
-    geo_direct_wgs_84 ( 0, r.lat, r.lon, 
-    azimuth,
-    r.length * SG_FEET_TO_METER * 0.5 - 5.0,
-    &lat2, &lon2, &az2 );
-    
-    if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
-    {
-       double olat, olon;
-       double odist = fgGetDouble("/sim/presets/offset-distance");
-       odist *= SG_NM_TO_METER;
-       double oaz = azimuth;
-       if ( fabs(fgGetDouble("/sim/presets/offset-azimuth")) > SG_EPSILON )
-       {
-           oaz = fgGetDouble("/sim/presets/offset-azimuth") + 180;
-            heading = fgGetDouble("/sim/presets/heading-deg");
-       }
-       while ( oaz >= 360.0 ) { oaz -= 360.0; }
-       geo_direct_wgs_84 ( 0, lat2, lon2, oaz, odist, &olat, &olon, &az2 );
-       lat2=olat;
-       lon2=olon;
+            "Attempting to set starting position for "
+            << id << ":" << rwy );
+
+    const FGAirport* apt = fgFindAirportID(id);
+    if (!apt) {
+      SG_LOG( SG_GENERAL, SG_ALERT, "Failed to find airport:" << id);
+      return false;
     }
     
-    // presets
-    fgSetDouble("/sim/presets/longitude-deg",  lon2 );
-    fgSetDouble("/sim/presets/latitude-deg",  lat2 );
-    fgSetDouble("/sim/presets/heading-deg", heading );
-    
-    // other code depends on the actual values being set ...
-    fgSetDouble("/position/longitude-deg",  lon2 );
-    fgSetDouble("/position/latitude-deg",  lat2 );
-    fgSetDouble("/orientation/heading-deg", heading );
-    
-    SG_LOG( SG_GENERAL, SG_INFO,
-    "Position for " << id << " is ("
-    << lon2 << ", "
-    << lat2 << ") new heading is "
-    << heading );
+    if (!apt->hasRunwayWithIdent(rwy)) {
+      SG_LOG( SG_GENERAL, rwy_req ? SG_ALERT : SG_INFO,
+                "Failed to find runway " << rwy <<
+                " at airport " << id << ". Using default runway." );
+      return false;
+    }
     
+    FGRunway* r(apt->getRunwayByIdent(rwy));
+    fgSetString("/sim/atc/runway", r->ident().c_str());
+    SGGeod startPos = r->pointOnCenterline( fgGetDouble("/sim/airport/runways/start-offset-m", 5.0));
+         fgApplyStartOffset(startPos, r->headingDeg());
     return true;
 }
 
 
 static void fgSetDistOrAltFromGlideSlope() {
+    // cout << "fgSetDistOrAltFromGlideSlope()" << endl;
     string apt_id = fgGetString("/sim/presets/airport-id");
     double gs = fgGetDouble("/sim/presets/glideslope-deg")
         * SG_DEGREES_TO_RADIANS ;
-    double od = fgGetDouble("/sim/presets/offset-distance");
+    double od = fgGetDouble("/sim/presets/offset-distance-nm");
     double alt = fgGetDouble("/sim/presets/altitude-ft");
 
     double apt_elev = 0.0;
@@ -828,7 +868,7 @@ static void fgSetDistOrAltFromGlideSlope() {
         // set offset-distance from glideslope and altitude
         od  = (alt - apt_elev) / tan(gs);
         od *= -1*SG_FEET_TO_METER * SG_METER_TO_NM;
-        fgSetDouble("/sim/presets/offset-distance", od);
+        fgSetDouble("/sim/presets/offset-distance-nm", od);
         fgSetBool("/sim/presets/onground", false);
         SG_LOG( SG_GENERAL, SG_INFO, "Calculated offset distance as: " 
                 << od  << " nm" );
@@ -838,107 +878,81 @@ static void fgSetDistOrAltFromGlideSlope() {
         SG_LOG( SG_GENERAL, SG_ALERT, "Resetting glideslope to zero" );
         fgSetDouble("/sim/presets/glideslope-deg", 0);
         fgSetBool("/sim/presets/onground", true);
-    }                              
-}                       
+    }
+}
 
 
 // Set current_options lon/lat given an airport id and heading (degrees)
 static bool fgSetPosFromNAV( const string& id, const double& freq ) {
-    FGNav *nav = current_navlist->findByIdentAndFreq( id.c_str(), freq );
+    FGNavRecord *nav
+        = globals->get_navlist()->findByIdentAndFreq( id.c_str(), freq );
 
-    // set initial position from runway and heading
-    if ( nav != NULL ) {
-        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
+  if (!nav) {
+    SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
                 << id << ":" << freq );
-
-        double lon = nav->get_lon();
-        double lat = nav->get_lat();
-
-        if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
-        {
-            double odist = fgGetDouble("/sim/presets/offset-distance")
-                * SG_NM_TO_METER;
-            double oaz = fabs(fgGetDouble("/sim/presets/offset-azimuth"))
-                + 180.0;
-            while ( oaz >= 360.0 ) { oaz -= 360.0; }
-            double olat, olon, az2;
-            geo_direct_wgs_84 ( 0, lat, lon, oaz, odist, &olat, &olon, &az2 );
-
-            lat = olat;
-            lon = olon;
-        }
-
-        // presets
-        fgSetDouble("/sim/presets/longitude-deg",  lon );
-        fgSetDouble("/sim/presets/latitude-deg",  lat );
-
-        // other code depends on the actual values being set ...
-        fgSetDouble("/position/longitude-deg",  lon );
-        fgSetDouble("/position/latitude-deg",  lat );
-        fgSetDouble("/orientation/heading-deg", 
-                    fgGetDouble("/sim/presets/heading-deg") );
-
-        SG_LOG( SG_GENERAL, SG_INFO,
-                "Position for " << id << ":" << freq << " is ("
-                << lon << ", "<< lat << ")" );
-
-        return true;
-    } else {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
-                << id << ":" << freq );
-        return false;
-    }
+    return false;
+  }
+  
+  fgApplyStartOffset(nav->geod(), fgGetDouble("/sim/presets/heading-deg"));
+  return true;
 }
 
-
-// Set current_options lon/lat given an airport id and heading (degrees)
-static bool fgSetPosFromFix( const string& id ) {
-    FGFix fix;
+// Set current_options lon/lat given an aircraft carrier id
+static bool fgSetPosFromCarrier( const string& carrier, const string& posid ) {
 
     // set initial position from runway and heading
-    if ( current_fixlist->query( id.c_str(), &fix ) ) {
-        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
-                << id );
-
-        double lon = fix.get_lon();
-        double lat = fix.get_lat();
-
-        if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
-        {
-            double odist = fgGetDouble("/sim/presets/offset-distance")
-                * SG_NM_TO_METER;
-            double oaz = fabs(fgGetDouble("/sim/presets/offset-azimuth"))
-                + 180.0;
-            while ( oaz >= 360.0 ) { oaz -= 360.0; }
-            double olat, olon, az2;
-            geo_direct_wgs_84 ( 0, lat, lon, oaz, odist, &olat, &olon, &az2 );
-
-            lat = olat;
-            lon = olon;
-        }
+    SGGeod geodPos;
+    double heading;
+    SGVec3d uvw;
+    if (FGAIManager::getStartPosition(carrier, posid, geodPos, heading, uvw)) {
+        double lon = geodPos.getLongitudeDeg();
+        double lat = geodPos.getLatitudeDeg();
+        double alt = geodPos.getElevationFt();
 
-        // presets
-        fgSetDouble("/sim/presets/longitude-deg",  lon );
-        fgSetDouble("/sim/presets/latitude-deg",  lat );
+        SG_LOG( SG_GENERAL, SG_INFO, "Attempting to set starting position for "
+                << carrier << " at lat = " << lat << ", lon = " << lon
+                << ", alt = " << alt << ", heading = " << heading);
 
-        // other code depends on the actual values being set ...
-        fgSetDouble("/position/longitude-deg",  lon );
-        fgSetDouble("/position/latitude-deg",  lat );
-        fgSetDouble("/orientation/heading-deg", 
-                    fgGetDouble("/sim/presets/heading-deg") );
+        fgSetDouble("/sim/presets/longitude-deg",  lon);
+        fgSetDouble("/sim/presets/latitude-deg",  lat);
+        fgSetDouble("/sim/presets/altitude-ft", alt);
+        fgSetDouble("/sim/presets/heading-deg", heading);
+        fgSetDouble("/position/longitude-deg",  lon);
+        fgSetDouble("/position/latitude-deg",  lat);
+        fgSetDouble("/position/altitude-ft", alt);
+        fgSetDouble("/orientation/heading-deg", heading);
+
+        fgSetString("/sim/presets/speed-set", "UVW");
+        fgSetDouble("/velocities/uBody-fps", uvw(0));
+        fgSetDouble("/velocities/vBody-fps", uvw(1));
+        fgSetDouble("/velocities/wBody-fps", uvw(2));
+        fgSetDouble("/sim/presets/uBody-fps", uvw(0));
+        fgSetDouble("/sim/presets/vBody-fps", uvw(1));
+        fgSetDouble("/sim/presets/wBody-fps", uvw(2));
 
-        SG_LOG( SG_GENERAL, SG_INFO,
-                "Position for " << id << " is ("
-                << lon << ", "<< lat << ")" );
+        fgSetBool("/sim/presets/onground", true);
 
         return true;
     } else {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate NAV = "
-                << id );
+        SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate aircraft carrier = "
+                << carrier );
         return false;
     }
 }
-
+// Set current_options lon/lat given an airport id and heading (degrees)
+static bool fgSetPosFromFix( const string& id )
+{
+  FGPositioned::TypeFilter fixFilter(FGPositioned::FIX);
+  FGPositioned* fix = FGPositioned::findNextWithPartialId(NULL, id, &fixFilter);
+  if (!fix) {
+    SG_LOG( SG_GENERAL, SG_ALERT, "Failed to locate fix = " << id );
+    return false;
+  }
+  
+  fgApplyStartOffset(fix->geod(), fgGetDouble("/sim/presets/heading-deg"));
+  return true;
+}
 
 /**
  * Initialize vor/ndb/ils/fix list management and query systems (as
@@ -947,39 +961,52 @@ static bool fgSetPosFromFix( const string& id ) {
 bool
 fgInitNav ()
 {
-    SG_LOG(SG_GENERAL, SG_INFO, "Loading Simple Airport List");
-    SGPath p_simple( globals->get_fg_root() );
-    p_simple.append( "Airports/basic.dat" );
-    FGAirportList *airports = new FGAirportList( p_simple.str() );
-    globals->set_airports( airports );
-
-    SG_LOG(SG_GENERAL, SG_INFO, "Loading Runway List");
-    SGPath p_runway( globals->get_fg_root() );
-    p_runway.append( "Airports/runways.dat" );
-    FGRunwayList *runways = new FGRunwayList( p_runway.str() );
-    globals->set_runways( runways );
-
-    SG_LOG(SG_GENERAL, SG_INFO, "Loading Navaids");
-
-    SG_LOG(SG_GENERAL, SG_INFO, "  VOR/NDB");
-    current_navlist = new FGNavList;
-    SGPath p_nav( globals->get_fg_root() );
-    p_nav.append( "Navaids/default.nav" );
-    current_navlist->init( p_nav );
-
-    SG_LOG(SG_GENERAL, SG_INFO, "  ILS and Marker Beacons");
-    current_beacons = new FGMarkerBeacons;
-    current_beacons->init();
-    current_ilslist = new FGILSList;
-    SGPath p_ils( globals->get_fg_root() );
-    p_ils.append( "Navaids/default.ils" );
-    current_ilslist->init( p_ils );
+    SG_LOG(SG_GENERAL, SG_INFO, "Loading Airport Database ...");
+
+    SGPath aptdb( globals->get_fg_root() );
+    aptdb.append( "Airports/apt.dat" );
 
+    SGPath p_metar( globals->get_fg_root() );
+    p_metar.append( "Airports/metar.dat" );
+
+    fgAirportDBLoad( aptdb.str(), p_metar.str() );
+
+    FGNavList *navlist = new FGNavList;
+    FGNavList *loclist = new FGNavList;
+    FGNavList *gslist = new FGNavList;
+    FGNavList *dmelist = new FGNavList;
+    FGNavList *tacanlist = new FGNavList;
+    FGNavList *carrierlist = new FGNavList;
+    FGTACANList *channellist = new FGTACANList;
+
+    globals->set_navlist( navlist );
+    globals->set_loclist( loclist );
+    globals->set_gslist( gslist );
+    globals->set_dmelist( dmelist );
+    globals->set_tacanlist( tacanlist );
+    globals->set_carrierlist( carrierlist );
+    globals->set_channellist( channellist );
+
+    if ( !fgNavDBInit(navlist, loclist, gslist, dmelist, tacanlist, carrierlist, channellist) ) {
+        SG_LOG( SG_GENERAL, SG_ALERT,
+                "Problems loading one or more navigational database" );
+    }
+    
     SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
-    current_fixlist = new FGFixList;
     SGPath p_fix( globals->get_fg_root() );
-    p_fix.append( "Navaids/default.fix" );
-    current_fixlist->init( p_fix );
+    p_fix.append( "Navaids/fix.dat" );
+    FGFixList *fixlist = new FGFixList;
+    fixlist->init( p_fix );
+
+    SG_LOG(SG_GENERAL, SG_INFO, "  Airways");
+    SGPath p_awy( globals->get_fg_root() );
+    p_awy.append( "Navaids/awy.dat" );
+    FGAirwayNetwork *awyNet = new FGAirwayNetwork;
+    //cerr << "Loading Airways" << endl;
+    awyNet->load (p_awy );
+    awyNet->init();
+    //cerr << "initializing airways" << endl;
+    globals->set_airwaynet( awyNet );
 
     return true;
 }
@@ -987,12 +1014,18 @@ fgInitNav ()
 
 // Set the initial position based on presets (or defaults)
 bool fgInitPosition() {
+    // cout << "fgInitPosition()" << endl;
+    double gs = fgGetDouble("/sim/presets/glideslope-deg")
+        * SG_DEGREES_TO_RADIANS ;
+    double od = fgGetDouble("/sim/presets/offset-distance-nm");
+    double alt = fgGetDouble("/sim/presets/altitude-ft");
+
     bool set_pos = false;
 
     // If glideslope is specified, then calculate offset-distance or
     // altitude relative to glide slope if either of those was not
     // specified.
-    if ( fgGetDouble("/sim/presets/glideslope-deg") > 0.1 ) {
+    if ( fabs( gs ) > 0.01 ) {
         fgSetDistOrAltFromGlideSlope();
     }
 
@@ -1013,19 +1046,49 @@ bool fgInitPosition() {
 
     string apt = fgGetString("/sim/presets/airport-id");
     string rwy_no = fgGetString("/sim/presets/runway");
-    double hdg = fgGetDouble("/sim/presets/heading-deg");
+    bool rwy_req = fgGetBool("/sim/presets/runway-requested");
     string vor = fgGetString("/sim/presets/vor-id");
     double vor_freq = fgGetDouble("/sim/presets/vor-freq");
     string ndb = fgGetString("/sim/presets/ndb-id");
     double ndb_freq = fgGetDouble("/sim/presets/ndb-freq");
+    string carrier = fgGetString("/sim/presets/carrier");
+    string parkpos = fgGetString("/sim/presets/parkpos");
     string fix = fgGetString("/sim/presets/fix");
+    SGPropertyNode *hdg_preset = fgGetNode("/sim/presets/heading-deg", true);
+    double hdg = hdg_preset->getDoubleValue();
+
+    // save some start parameters, so that we can later say what the
+    // user really requested. TODO generalize that and move it to options.cxx
+    static bool start_options_saved = false;
+    if (!start_options_saved) {
+        start_options_saved = true;
+        SGPropertyNode *opt = fgGetNode("/sim/startup/options", true);
+
+        opt->setDoubleValue("latitude-deg", lat_deg);
+        opt->setDoubleValue("longitude-deg", lon_deg);
+        opt->setDoubleValue("heading-deg", hdg);
+        opt->setStringValue("airport", apt.c_str());
+        opt->setStringValue("runway", rwy_no.c_str());
+    }
+
+    if (hdg > 9990.0)
+        hdg = fgGetDouble("/environment/config/boundary/entry/wind-from-heading-deg", 270);
+
+    if ( !set_pos && !apt.empty() && !parkpos.empty() ) {
+        // An airport + parking position is requested
+        if ( fgSetPosFromAirportIDandParkpos( apt, parkpos ) ) {
+            // set tower position
+            fgSetString("/sim/tower/airport-id",  apt.c_str());
+            set_pos = true;
+        }
+    }
 
     if ( !set_pos && !apt.empty() && !rwy_no.empty() ) {
         // An airport + runway is requested
-        if ( fgSetPosFromAirportIDandRwy( apt, rwy_no ) ) {
+        if ( fgSetPosFromAirportIDandRwy( apt, rwy_no, rwy_req ) ) {
             // set tower position (a little off the heading for single
             // runway airports)
-            fgSetTowerPosFromAirportID( apt, hdg );
+           fgSetString("/sim/tower/airport-id",  apt.c_str());
             set_pos = true;
         }
     }
@@ -1035,11 +1098,14 @@ bool fgInitPosition() {
         if ( fgSetPosFromAirportIDandHdg( apt, hdg ) ) {
             // set tower position (a little off the heading for single
             // runway airports)
-            fgSetTowerPosFromAirportID( apt, hdg );
+           fgSetString("/sim/tower/airport-id",  apt.c_str());
             set_pos = true;
         }
     }
 
+    if (hdg_preset->getDoubleValue() > 9990.0)
+        hdg_preset->setDoubleValue(hdg);
+
     if ( !set_pos && !vor.empty() ) {
         // a VOR is requested
         if ( fgSetPosFromNAV( vor, vor_freq ) ) {
@@ -1054,6 +1120,13 @@ bool fgInitPosition() {
         }
     }
 
+    if ( !set_pos && !carrier.empty() ) {
+        // an aircraft carrier is requested
+        if ( fgSetPosFromCarrier( carrier, parkpos ) ) {
+            set_pos = true;
+        }
+    }
+
     if ( !set_pos && !fix.empty() ) {
         // a Fix is requested
         if ( fgSetPosFromFix( fix ) ) {
@@ -1072,8 +1145,14 @@ bool fgInitPosition() {
                  fgGetDouble("/sim/presets/longitude-deg") );
     fgSetDouble( "/position/latitude-deg",
                  fgGetDouble("/sim/presets/latitude-deg") );
-    fgSetDouble( "/orientation/heading-deg",
-                 fgGetDouble("/sim/presets/heading-deg") );
+    fgSetDouble( "/orientation/heading-deg", hdg_preset->getDoubleValue());
+
+    // determine if this should be an on-ground or in-air start
+    if ((fabs(gs) > 0.01 || fabs(od) > 0.1 || alt > 0.1) && carrier.empty()) {
+        fgSetBool("/sim/presets/onground", false);
+    } else {
+        fgSetBool("/sim/presets/onground", true);
+    }
 
     return true;
 }
@@ -1083,10 +1162,6 @@ bool fgInitPosition() {
 bool fgInitGeneral() {
     string root;
 
-#if defined(FX) && defined(XMESA)
-    char *mesa_win_state;
-#endif
-
     SG_LOG( SG_GENERAL, SG_INFO, "General Initialization" );
     SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
 
@@ -1100,21 +1175,18 @@ bool fgInitGeneral() {
     }
     SG_LOG( SG_GENERAL, SG_INFO, "FG_ROOT = " << '"' << root << '"' << endl );
 
-#if defined(FX) && defined(XMESA)
-    // initialize full screen flag
-    globals->set_fullscreen(false);
-    if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
-        // Test for the MESA_GLX_FX env variable
-        if ( (mesa_win_state = getenv( "MESA_GLX_FX" )) != NULL) {
-            // test if we are fullscreen mesa/glide
-            if ( (mesa_win_state[0] == 'f') ||
-                 (mesa_win_state[0] == 'F') ) {
-                globals->set_fullscreen(true);
-            }
-        }
-    }
-#endif
+    globals->set_browser(fgGetString("/sim/startup/browser-app", "firefox %u"));
+
+    char buf[512], *cwd = getcwd(buf, 511);
+    buf[511] = '\0';
+    SGPropertyNode *curr = fgGetNode("/sim", true);
+    curr->removeChild("fg-current", 0, false);
+    curr = curr->getChild("fg-current", 0, true);
+    curr->setStringValue(cwd ? cwd : "");
+    curr->setAttribute(SGPropertyNode::WRITE, false);
 
+    fgSetBool("/sim/startup/stdout-to-terminal", isatty(1));
+    fgSetBool("/sim/startup/stderr-to-terminal", isatty(2));
     return true;
 }
 
@@ -1131,85 +1203,85 @@ void fgInitFDM() {
     }
 
     double dt = 1.0 / fgGetInt("/sim/model-hz");
-    aircraft_dir = fgGetString("/sim/aircraft-dir");
-    const string &model = fgGetString("/sim/flight-model");
-
-    try {
-        if ( model == "larcsim" ) {
-            cur_fdm_state = new FGLaRCsim( dt );
-        } else if ( model == "jsb" ) {
-            cur_fdm_state = new FGJSBsim( dt );
-        } else if ( model == "ada" ) {
-            cur_fdm_state = new FGADA( dt );
-        } else if ( model == "balloon" ) {
-            cur_fdm_state = new FGBalloonSim( dt );
-        } else if ( model == "magic" ) {
-            cur_fdm_state = new FGMagicCarpet( dt );
-        } else if ( model == "ufo" ) {
-            cur_fdm_state = new FGUFO( dt );
-        } else if ( model == "external" ) {
-            // external is a synonym for "--fdm=null" and is
-            // maintained here for backwards compatibility
-            cur_fdm_state = new FGNullFDM( dt );
-        } else if ( model.find("network") == 0 ) {
-            string host = "localhost";
-            int port1 = 5501;
-            int port2 = 5502;
-            int port3 = 5503;
-            string net_options = model.substr(8);
-            string::size_type begin, end;
-            begin = 0;
-            // host
-            end = net_options.find( ",", begin );
-            if ( end != string::npos ) {
-                host = net_options.substr(begin, end - begin);
-                begin = end + 1;
-            }
-            // port1
-            end = net_options.find( ",", begin );
-            if ( end != string::npos ) {
-                port1 = atoi( net_options.substr(begin, end - begin).c_str() );
-                begin = end + 1;
-            }
-            // port2
-            end = net_options.find( ",", begin );
-            if ( end != string::npos ) {
-                port2 = atoi( net_options.substr(begin, end - begin).c_str() );
-                begin = end + 1;
-            }
-            // port3
-            end = net_options.find( ",", begin );
-            if ( end != string::npos ) {
-                port3 = atoi( net_options.substr(begin, end - begin).c_str() );
-                begin = end + 1;
-            }
-            cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
-        } else if ( model.find("pipe") == 0 ) {
-            string pipe_path = model.substr(5);
-            cur_fdm_state = new FGExternalPipe( dt, pipe_path );
-        } else if ( model == "null" ) {
-            cur_fdm_state = new FGNullFDM( dt );
-        } else if ( model == "yasim" ) {
-            cur_fdm_state = new YASim( dt );
-        } else {
-            SG_LOG(SG_GENERAL, SG_ALERT,
-                   "Unrecognized flight model '" << model
-                   << "', cannot init flight dynamics model.");
-            exit(-1);
+    string model = fgGetString("/sim/flight-model");
+
+    if ( model == "larcsim" ) {
+        cur_fdm_state = new FGLaRCsim( dt );
+    } else if ( model == "jsb" ) {
+        cur_fdm_state = new FGJSBsim( dt );
+#if ENABLE_SP_FDM
+    } else if ( model == "ada" ) {
+        cur_fdm_state = new FGADA( dt );
+    } else if ( model == "acms" ) {
+        cur_fdm_state = new FGACMS( dt );
+    } else if ( model == "balloon" ) {
+        cur_fdm_state = new FGBalloonSim( dt );
+    } else if ( model == "magic" ) {
+        cur_fdm_state = new FGMagicCarpet( dt );
+#endif
+    } else if ( model == "ufo" ) {
+        cur_fdm_state = new FGUFO( dt );
+    } else if ( model == "external" ) {
+        // external is a synonym for "--fdm=null" and is
+        // maintained here for backwards compatibility
+        cur_fdm_state = new FGNullFDM( dt );
+    } else if ( model.find("network") == 0 ) {
+        string host = "localhost";
+        int port1 = 5501;
+        int port2 = 5502;
+        int port3 = 5503;
+        string net_options = model.substr(8);
+        string::size_type begin, end;
+        begin = 0;
+        // host
+        end = net_options.find( ",", begin );
+        if ( end != string::npos ) {
+            host = net_options.substr(begin, end - begin);
+            begin = end + 1;
         }
-    } catch ( ... ) {
-        SG_LOG(SG_GENERAL, SG_ALERT, "FlightGear aborting\n\n");
-        exit(-1);
-    }
-}
-
-static void printMat(const sgVec4 *mat, char *name="")
-{
-    int i;
-    SG_LOG(SG_GENERAL, SG_BULK, name );
-    for(i=0; i<4; i++) {
-        SG_LOG(SG_GENERAL, SG_BULK, "  " << mat[i][0] << " " << mat[i][1]
-                                    << " " << mat[i][2] << " " << mat[i][3] );
+        // port1
+        end = net_options.find( ",", begin );
+        if ( end != string::npos ) {
+            port1 = atoi( net_options.substr(begin, end - begin).c_str() );
+            begin = end + 1;
+        }
+        // port2
+        end = net_options.find( ",", begin );
+        if ( end != string::npos ) {
+            port2 = atoi( net_options.substr(begin, end - begin).c_str() );
+            begin = end + 1;
+        }
+        // port3
+        end = net_options.find( ",", begin );
+        if ( end != string::npos ) {
+            port3 = atoi( net_options.substr(begin, end - begin).c_str() );
+            begin = end + 1;
+        }
+        cur_fdm_state = new FGExternalNet( dt, host, port1, port2, port3 );
+    } else if ( model.find("pipe") == 0 ) {
+        // /* old */ string pipe_path = model.substr(5);
+        // /* old */ cur_fdm_state = new FGExternalPipe( dt, pipe_path );
+        string pipe_path = "";
+        string pipe_protocol = "";
+        string pipe_options = model.substr(5);
+        string::size_type begin, end;
+        begin = 0;
+        // pipe file path
+        end = pipe_options.find( ",", begin );
+        if ( end != string::npos ) {
+            pipe_path = pipe_options.substr(begin, end - begin);
+            begin = end + 1;
+        }
+        // protocol (last option)
+        pipe_protocol = pipe_options.substr(begin);
+        cur_fdm_state = new FGExternalPipe( dt, pipe_path, pipe_protocol );
+    } else if ( model == "null" ) {
+        cur_fdm_state = new FGNullFDM( dt );
+    } else if ( model == "yasim" ) {
+        cur_fdm_state = new YASim( dt );
+    } else {
+        throw sg_throwable(string("Unrecognized flight model '") + model
+               + "', cannot init flight dynamics model.");
     }
 }
 
@@ -1219,11 +1291,6 @@ void fgInitView() {
   globals->get_aircraft_model()->update(0);
   // run update for current view so that data is current...
   globals->get_viewmgr()->update(0);
-
-  printMat(globals->get_current_view()->get_VIEW(),"VIEW");
-  printMat(globals->get_current_view()->get_UP(),"UP");
-  // printMat(globals->get_current_view()->get_LOCAL(),"LOCAL");
-  
 }
 
 
@@ -1245,45 +1312,118 @@ SGTime *fgInitTime() {
                             zone.str(),
                             cur_time_override->getLongValue() );
 
+    globals->set_warp_delta( 0 );
+
+    t->update( 0.0, 0.0,
+               cur_time_override->getLongValue(),
+               globals->get_warp() );
+
+    return t;
+}
+
+
+// set up a time offset (aka warp) if one is specified
+void fgInitTimeOffset() {
+    static const SGPropertyNode *longitude
+        = fgGetNode("/position/longitude-deg");
+    static const SGPropertyNode *latitude
+        = fgGetNode("/position/latitude-deg");
+    static const SGPropertyNode *cur_time_override
+        = fgGetNode("/sim/time/cur-time-override", true);
+
     // Handle potential user specified time offsets
+    int orig_warp = globals->get_warp();
+    SGTime *t = globals->get_time_params();
     time_t cur_time = t->get_cur_time();
     time_t currGMT = sgTimeGetGMT( gmtime(&cur_time) );
     time_t systemLocalTime = sgTimeGetGMT( localtime(&cur_time) );
     time_t aircraftLocalTime = 
         sgTimeGetGMT( fgLocaltime(&cur_time, t->get_zonename() ) );
-
-    // Okay, we now have six possible scenarios
+    
+    // Okay, we now have several possible scenarios
     int offset = fgGetInt("/sim/startup/time-offset");
-    const string &offset_type = fgGetString("/sim/startup/time-offset-type");
-    if (offset_type == "system-offset") {
-        globals->set_warp( offset );
-    } else if (offset_type == "gmt-offset") {
-        globals->set_warp( offset - (currGMT - systemLocalTime) );
-    } else if (offset_type == "latitude-offset") {
-        globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) );
-    } else if (offset_type == "system") {
-        globals->set_warp( offset - cur_time );
-    } else if (offset_type == "gmt") {
-        globals->set_warp( offset - currGMT );
-    } else if (offset_type == "latitude") {
-        globals->set_warp( offset - (aircraftLocalTime - systemLocalTime) - 
-                           cur_time ); 
+    string offset_type = fgGetString("/sim/startup/time-offset-type");
+
+    int warp = 0;
+    if ( offset_type == "real" ) {
+        warp = 0;
+    } else if ( offset_type == "dawn" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           90.0, true ); 
+    } else if ( offset_type == "morning" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           75.0, true ); 
+    } else if ( offset_type == "noon" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           0.0, true ); 
+    } else if ( offset_type == "afternoon" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           60.0, false ); 
+     } else if ( offset_type == "dusk" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           90.0, false ); 
+     } else if ( offset_type == "evening" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           100.0, false ); 
+    } else if ( offset_type == "midnight" ) {
+        warp = fgTimeSecondsUntilSunAngle( cur_time,
+                                           longitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           latitude->getDoubleValue()
+                                             * SGD_DEGREES_TO_RADIANS,
+                                           180.0, false ); 
+    } else if ( offset_type == "system-offset" ) {
+        warp = offset;
+       orig_warp = 0;
+    } else if ( offset_type == "gmt-offset" ) {
+        warp = offset - (currGMT - systemLocalTime);
+       orig_warp = 0;
+    } else if ( offset_type == "latitude-offset" ) {
+        warp = offset - (aircraftLocalTime - systemLocalTime);
+       orig_warp = 0;
+    } else if ( offset_type == "system" ) {
+      warp = offset - (systemLocalTime - currGMT) - cur_time;
+    } else if ( offset_type == "gmt" ) {
+        warp = offset - cur_time;
+    } else if ( offset_type == "latitude" ) {
+        warp = offset - (aircraftLocalTime - currGMT)- cur_time; 
     } else {
         SG_LOG( SG_GENERAL, SG_ALERT,
                 "FG_TIME::Unsupported offset type " << offset_type );
         exit( -1 );
     }
-
-    SG_LOG( SG_GENERAL, SG_INFO, "After time init, warp = " 
-            << globals->get_warp() );
-
-    globals->set_warp_delta( 0 );
-
-    t->update( 0.0, 0.0,
+    globals->set_warp( orig_warp + warp );
+    t->update( longitude->getDoubleValue() * SGD_DEGREES_TO_RADIANS,
+               latitude->getDoubleValue() * SGD_DEGREES_TO_RADIANS,
                cur_time_override->getLongValue(),
                globals->get_warp() );
 
-    return t;
+    SG_LOG( SG_GENERAL, SG_INFO, "After fgInitTimeOffset(): warp = " 
+            << globals->get_warp() );
 }
 
 
@@ -1298,12 +1438,27 @@ bool fgInitSubsystems() {
     //     = fgGetNode("/sim/presets/latitude-deg");
     // static const SGPropertyNode *altitude
     //     = fgGetNode("/sim/presets/altitude-ft");
-
-    fgLIGHT *l = &cur_light_params;
-
     SG_LOG( SG_GENERAL, SG_INFO, "Initialize Subsystems");
     SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the event manager subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->get_event_mgr()->init();
+    globals->get_event_mgr()->setRealtimeProperty(fgGetNode("/sim/time/delta-realtime-sec", true));
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the property interpolator subsystem. Put into the INIT
+    // group because the "nasal" subsystem may need it at GENERAL take-down.
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("interpolator", new SGInterpolator, SGSubsystemMgr::INIT);
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Add the FlightGear property utilities.
+    ////////////////////////////////////////////////////////////////////
+    globals->add_subsystem("properties", new FGProperties);
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the material property subsystem.
@@ -1311,22 +1466,13 @@ bool fgInitSubsystems() {
 
     SGPath mpath( globals->get_fg_root() );
     mpath.append( "materials.xml" );
-    if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str()) ) {
+    string season = fgGetString("/sim/startup/season", "summer");
+    if ( ! globals->get_matlib()->load(globals->get_fg_root(), mpath.str(), season.c_str(),
+            globals->get_props()) ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Error loading material lib!" );
         exit(-1);
     }
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the event manager subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    global_events.init();
-
-    // Output event stats every 60 seconds
-    global_events.Register( "FGEventMgr::print_stats()",
-                            &global_events, &FGEventMgr::print_stats,
-                            60000 );
-
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the scenery management subsystem.
@@ -1342,16 +1488,9 @@ bool fgInitSubsystems() {
         exit(-1);
     }
 
-    // cause refresh of viewer scenery timestamps every 15 seconds...
-    global_events.Register( "FGTileMgr::refresh_view_timestamps()",
-                            globals->get_tile_mgr(),
-                            &FGTileMgr::refresh_view_timestamps,
-                            15000 );
-
-    SG_LOG( SG_GENERAL, SG_DEBUG,
-            "Current terrain elevation after tile mgr init " <<
-            globals->get_scenery()->get_cur_elev() );
-
+    globals->get_scenery()->get_scene_graph()
+        ->addChild(simgear::Particles::getCommonRoot());
+    simgear::GlobalParticleCallback::setSwitch(fgGetNode("/sim/rendering/particles", true));
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the flight model subsystem.
@@ -1365,58 +1504,46 @@ bool fgInitSubsystems() {
 
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the view manager subsystem.
+    // Initialize the weather subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    fgInitView();
+    // Initialize the weather modeling subsystem
+    globals->add_subsystem("environment", new FGEnvironmentMgr);
 
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the lighting subsystem.
+    // Initialize the aircraft systems and instrumentation (before the
+    // autopilot.)
     ////////////////////////////////////////////////////////////////////
 
-    // fgUpdateSunPos() needs a few position and view parameters set
-    // so it can calculate local relative sun angle and a few other
-    // things for correctly orienting the sky.
-    fgUpdateSunPos();
-    fgUpdateMoonPos();
-    global_events.Register( "fgUpdateSunPos()", &fgUpdateSunPos,
-                            60000);
-    global_events.Register( "fgUpdateMoonPos()", &fgUpdateMoonPos,
-                            60000);
-
-    // Initialize Lighting interpolation tables
-    l->Init();
-
-    // force one lighting update to make it right to start with...
-    l->Update();
-    // update the lighting parameters (based on sun angle)
-    global_events.Register( "fgLight::Update()",
-                            &cur_light_params, &fgLIGHT::Update,
-                            30000 );
-
+    globals->add_subsystem("instrumentation", new FGInstrumentMgr);
+    globals->add_subsystem("systems", new FGSystemMgr);
 
     ////////////////////////////////////////////////////////////////////
-    // Create and register the logger.
+    // Initialize the XML Autopilot subsystem.
     ////////////////////////////////////////////////////////////////////
-    
-    globals->add_subsystem("logger", new FGLogger);
 
+    globals->add_subsystem( "xml-autopilot", new FGXMLAutopilot );
+    globals->add_subsystem( "route-manager", new FGRouteMgr );
 
-#if defined(HAVE_PLIB_PSL)
+  
     ////////////////////////////////////////////////////////////////////
-    // Create and register the script manager.
+    // Initialize the view manager subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("scripting", new FGScriptMgr);
-#endif // HAVE_PLIB_PSL
+    fgInitView();
 
+    ////////////////////////////////////////////////////////////////////
+    // Create and register the logger.
+    ////////////////////////////////////////////////////////////////////
+    
+    globals->add_subsystem("logger", new FGLogger);
 
     ////////////////////////////////////////////////////////////////////
     // Create and register the XML GUI.
     ////////////////////////////////////////////////////////////////////
 
-    globals->add_subsystem("gui", new NewGUI, FGSubsystemMgr::INIT);
+    globals->add_subsystem("gui", new NewGUI, SGSubsystemMgr::INIT);
 
 
     ////////////////////////////////////////////////////////////////////
@@ -1424,100 +1551,41 @@ bool fgInitSubsystems() {
     ////////////////////////////////////////////////////////////////////
 
     // update the current timezone each 30 minutes
-    global_events.Register( "fgUpdateLocalTime()", &fgUpdateLocalTime,
-                            30*60*1000 );
+    globals->get_event_mgr()->addTask( "fgUpdateLocalTime()",
+                                       &fgUpdateLocalTime, 30*60 );
+    fgInitTimeOffset();                // the environment subsystem needs this
 
 
     ////////////////////////////////////////////////////////////////////
-    // Initialize the weather subsystem.
+    // Initialize the lighting subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    // Initialize the weather modeling subsystem
-#ifdef FG_WEATHERCM
-    // Initialize the WeatherDatabase
-    SG_LOG(SG_GENERAL, SG_INFO, "Creating LocalWeatherDatabase");
-    sgVec3 position;
-    sgSetVec3( position, current_aircraft.fdm_state->get_Latitude(),
-               current_aircraft.fdm_state->get_Longitude(),
-               current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER );
-    double init_vis = fgGetDouble("/environment/visibility-m");
-
-    FGLocalWeatherDatabase::DatabaseWorkingType working_type;
-
-    if (!strcmp(fgGetString("/environment/weather/working-type"), "internet"))
-    {
-      working_type = FGLocalWeatherDatabase::use_internet;
-    } else {
-      working_type = FGLocalWeatherDatabase::default_mode;
-    }
-    
-    if ( init_vis > 0 ) {
-      FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 
-        new FGLocalWeatherDatabase( position,
-                                    globals->get_fg_root(),
-                                    working_type,
-                                    init_vis );
-    } else {
-      FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 
-        new FGLocalWeatherDatabase( position,
-                                    globals->get_fg_root(),
-                                    working_type );
-    }
-
-    // cout << theFGLocalWeatherDatabase << endl;
-    // cout << "visibility = " 
-    //      << theFGLocalWeatherDatabase->getWeatherVisibility() << endl;
-
-    WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
+    globals->add_subsystem("lighting", new FGLight);
 
-    // register the periodic update of the weather
-    global_events.Register( "weather update", &fgUpdateWeatherDatabase,
-                            30000);
-#else
-    globals->add_subsystem("environment", new FGEnvironmentMgr);
-#endif
+    //////////////////////////////////////////////////////////////////////
+    // Initialize the 2D cloud subsystem.
+    ////////////////////////////////////////////////////////////////////
+    fgGetBool("/sim/rendering/bump-mapping", false);
 
-#ifdef FG_USE_CLOUDS_3D
+#ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
-    // Initialize the 3D cloud subsystem.
+    // Initialize the sound subsystem.
     ////////////////////////////////////////////////////////////////////
-    if ( fgGetBool("/sim/rendering/clouds3d") ) {
-        static const SGPropertyNode *longitude
-           = fgGetNode("/sim/presets/longitude-deg");
-        static const SGPropertyNode *latitude
-           = fgGetNode("/sim/presets/latitude-deg");
-        static const SGPropertyNode *altitude
-           = fgGetNode("/sim/presets/altitude-ft");
-
-        SGPath cloud_path(globals->get_fg_root());
-#if 0
-        cloud_path.append("Textures/Sky/scattered.rgba");
-        SG_LOG(SG_GENERAL, SG_INFO, "Loading CLOUDS3d from: " << cloud_path.c_str());
-
-        SGTexture tx;
-        tx.read_rgba_texture(cloud_path.c_str());
-        if ( !sgCloud3d->Load( tx.texture(), tx.width(),
-#else
-        cloud_path.append("large.sky");
-        if ( !sgCloud3d->Load( cloud_path.str(),
-#endif
-                               latitude->getDoubleValue(),
-                               longitude->getDoubleValue()) )
-        {
-            fgSetBool("/sim/rendering/clouds3d", false);
-            SG_LOG(SG_GENERAL, SG_INFO, "CLOUDS3d FAILED: ");
-        }
-        SG_LOG(SG_GENERAL, SG_INFO, "CLOUDS3d Loaded: ");
-    }
-#endif
+
+    init_volume = fgGetFloat("/sim/sound/volume");
+    fgSetFloat("/sim/sound/volume", 0.0f);
+    globals->set_soundmgr(new SGSoundMgr);
+    globals->get_soundmgr()->init();
+    globals->get_soundmgr()->bind();
+
 
     ////////////////////////////////////////////////////////////////////
-    // Initialise ATC display system
+    // Initialize the sound-effects subsystem.
     ////////////////////////////////////////////////////////////////////
 
-    SG_LOG(SG_GENERAL, SG_INFO, "  ATC Display");
-    globals->set_ATC_display(new FGATCDisplay);
-    globals->get_ATC_display()->init(); 
+    globals->add_subsystem("fx", new FGFX);
+    globals->add_subsystem("voice", new FGVoiceMgr);
+#endif
 
     ////////////////////////////////////////////////////////////////////
     // Initialise the ATC Manager 
@@ -1535,41 +1603,23 @@ bool fgInitSubsystems() {
     globals->set_AI_mgr(new FGAIMgr);
     globals->get_AI_mgr()->init();
 
-
-#ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
-    // Initialize the sound subsystem.
+    // Initialise the AI Model Manager
     ////////////////////////////////////////////////////////////////////
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Model Manager");
+    globals->add_subsystem("ai_model", new FGAIManager);
+    globals->add_subsystem("submodel_mgr", new FGSubmodelMgr);
 
-    globals->set_soundmgr(new SGSoundMgr);
-    globals->get_soundmgr()->init();
-    globals->get_soundmgr()->bind();
 
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the sound-effects subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    globals->add_subsystem("fx", new FGFX);
-    
-#endif
-
-    globals->add_subsystem("instrumentation", new FGInstrumentMgr);
-    globals->add_subsystem("systems", new FGSystemMgr);
-
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the radio stack subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    current_radiostack = new FGRadioStack;
-    current_radiostack->init();
-    current_radiostack->bind();
+    // It's probably a good idea to initialize the top level traffic manager
+    // After the AI and ATC systems have been initialized properly.
+    // AI Traffic manager
+    globals->add_subsystem("Traffic Manager", new FGTrafficManager);
 
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the cockpit subsystem
     ////////////////////////////////////////////////////////////////////
-
     if( fgCockpitInit( &current_aircraft )) {
         // Cockpit initialized ok.
     } else {
@@ -1578,21 +1628,6 @@ bool fgInitSubsystems() {
     }
 
 
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the autopilot subsystem.
-    ////////////////////////////////////////////////////////////////////
-
-    globals->set_autopilot(new FGAutopilot);
-    globals->get_autopilot()->init();
-    globals->get_autopilot()->bind();
-
-                                // FIXME: these should go in the
-                                // GUI initialization code, not here.
-    fgAPAdjustInit();
-    NewTgtAirportInit();
-    NewHeadingInit();
-    NewAltitudeInit();
-
     ////////////////////////////////////////////////////////////////////
     // Initialize I/O subsystem.
     ////////////////////////////////////////////////////////////////////
@@ -1610,7 +1645,7 @@ bool fgInitSubsystems() {
 
     globals->set_current_panel( fgReadPanel(panel_path) );
     if (globals->get_current_panel() == 0) {
-        SG_LOG( SG_INPUT, SG_ALERT, 
+        SG_LOG( SG_INPUT, SG_ALERT,
                 "Error reading new panel from " << panel_path );
     } else {
         SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
@@ -1618,13 +1653,6 @@ bool fgInitSubsystems() {
         globals->get_current_panel()->bind();
     }
 
-    
-    ////////////////////////////////////////////////////////////////////
-    // Initialize the default (kludged) properties.
-    ////////////////////////////////////////////////////////////////////
-
-    fgInitProps();
-
 
     ////////////////////////////////////////////////////////////////////
     // Initialize the controls subsystem.
@@ -1653,18 +1681,23 @@ bool fgInitSubsystems() {
     globals->get_subsystem_mgr()->bind();
     globals->get_subsystem_mgr()->init();
 
-
-#ifdef FG_MPLAYER_AS
     ////////////////////////////////////////////////////////////////////
     // Initialize multiplayer subsystem
     ////////////////////////////////////////////////////////////////////
 
-    globals->set_multiplayer_tx_mgr(new FGMultiplayTxMgr);
-    globals->get_multiplayer_tx_mgr()->init();
+    globals->set_multiplayer_mgr(new FGMultiplayMgr);
+    globals->get_multiplayer_mgr()->init();
 
-    globals->set_multiplayer_rx_mgr(new FGMultiplayRxMgr);
-    globals->get_multiplayer_rx_mgr()->init();
-#endif
+    ////////////////////////////////////////////////////////////////////////
+    // Initialize the Nasal interpreter.
+    // Do this last, so that the loaded scripts see initialized state
+    ////////////////////////////////////////////////////////////////////////
+    FGNasalSys* nasal = new FGNasalSys();
+    globals->add_subsystem("nasal", nasal, SGSubsystemMgr::INIT);
+    nasal->init();
+
+    // initialize methods that depend on other subsystems.
+    globals->get_subsystem_mgr()->postinit();
 
     ////////////////////////////////////////////////////////////////////////
     // End of subsystem initialization.
@@ -1675,7 +1708,7 @@ bool fgInitSubsystems() {
                                 // Save the initial state for future
                                 // reference.
     globals->saveInitialState();
-
+    
     return true;
 }
 
@@ -1699,6 +1732,11 @@ void fgReInitSubsystems()
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", true);
     }
+    fgSetBool("/sim/crashed", false);
+
+    // Force reupdating the positions of the ai 3d models. They are used for
+    // initializing ground level for the FDM.
+    globals->get_subsystem("ai_model")->reinit();
 
     // Initialize the FDM
     fgInitFDM();
@@ -1713,15 +1751,71 @@ void fgReInitSubsystems()
     fgInitView();
 
     globals->get_controls()->reset_all();
-    globals->get_autopilot()->reset();
 
-    fgUpdateSunPos();
-    fgUpdateMoonPos();
-    cur_light_params.Update();
     fgUpdateLocalTime();
 
+    // re-init to proper time of day setting
+    fgInitTimeOffset();
+
     if ( !freeze ) {
         fgSetBool("/sim/freeze/master", false);
     }
+    fgSetBool("/sim/sceneryloaded",false);
+}
+
+
+void reInit(void)  // from gui_local.cxx -- TODO merge with fgReInitSubsystems()
+{
+    static SGPropertyNode_ptr master_freeze = fgGetNode("/sim/freeze/master", true);
+
+    bool freeze = master_freeze->getBoolValue();
+    if (!freeze)
+        master_freeze->setBoolValue(true);
+
+    fgSetBool("/sim/signals/reinit", true);
+    cur_fdm_state->unbind();
+
+    // in case user has changed window size as
+    // restoreInitialState() overwrites these
+    int xsize = fgGetInt("/sim/startup/xsize");
+    int ysize = fgGetInt("/sim/startup/ysize");
+
+    // viewports also needs to be saved/restored as
+    // restoreInitialState() overwrites these
+    SGPropertyNode *guiNode = new SGPropertyNode;
+    SGPropertyNode *cameraNode = new SGPropertyNode;
+    SGPropertyNode *cameraGroupNode = fgGetNode("/sim/rendering/camera-group");
+    copyProperties(cameraGroupNode->getChild("camera"), cameraNode);
+    copyProperties(cameraGroupNode->getChild("gui"), guiNode);
+
+    globals->restoreInitialState();
+
+    // update our position based on current presets
+    fgInitPosition();
+
+    // We don't know how to resize the window, so keep the last values
+    //  for xsize and ysize, and don't use the one set initially
+    fgSetInt("/sim/startup/xsize", xsize);
+    fgSetInt("/sim/startup/ysize", ysize);
+
+    copyProperties(cameraNode, cameraGroupNode->getChild("camera"));
+    copyProperties(guiNode, cameraGroupNode->getChild("gui"));
+
+    delete guiNode;
+    delete cameraNode;
+
+    SGTime *t = globals->get_time_params();
+    delete t;
+    t = fgInitTime();
+    globals->set_time_params(t);
+
+    fgReInitSubsystems();
+
+    globals->get_tile_mgr()->update(fgGetDouble("/environment/visibility-m"));
+    globals->get_renderer()->resize(xsize, ysize);
+    fgSetBool("/sim/signals/reinit", false);
+
+    if (!freeze)
+        master_freeze->setBoolValue(false);
 }