Merge branch 'next' of git@gitorious.org:fg/flightgear into next

CMakeLists.txt

@@ -49,7 +49,7 @@ option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" ON)
 option(ENABLE_YASIM "Set to ON to build FlightGear with YASIM FDM" ON)
 option(ENABLE_JSBSIM "Set to ON to build FlightGear with JSBSim FDM" ON)
 option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" OFF)
-option(MSVC_3RDPARTY_DIR "Location where the third-party dependencies are extracted" NOT_FOUND)
+set(MSVC_3RDPARTY_DIR NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 
 if(LOGGING)
 	# nothing
@@ -86,17 +86,7 @@ endif (MSVC_3RDPARTY_DIR)
 
 
 # check required dependencies
-if (MSVC)
+find_package(Boost REQUIRED)
-    # on MSVC, Olaf reports that the serialization library is required at
-    # link time. No one has you explained why, unfortunately.
-    set(Boost_USE_STATIC_LIBS        ON)
-    set(Boost_USE_MULTITHREADED      ON)
-    set(Boost_USE_STATIC_RUNTIME    OFF)
-    find_package(Boost REQUIRED COMPONENTS serialization)
-else (MSVC)
-    find_package(Boost REQUIRED)
-endif (MSVC)
-
 find_package(ZLIB REQUIRED)
 find_package(Threads REQUIRED)
 find_package(OpenGL REQUIRED)

src/ATCDCL/atis.cxx

@@ -216,9 +216,12 @@ int FGATIS::GenTransmission(const int regen, const int special) {
   using namespace lex;
 
   string BRK = ".\n";
+  string PAUSE = " / ";
 
   double tstamp = atof(fgGetString("sim/time/elapsed-sec"));
-  int interval = ATIS ? ATIS_interval : 2*minute;	// AWOS updated frequently
+  int interval = _type == ATIS ?
+        ATIS_interval   // ATIS updated hourly
+      : 2*minute;	// AWOS updated more frequently
   int sequence = current_commlist->GetAtisSequence(ident, 
   			tstamp, interval, special);
   if (!regen && sequence > LTRS) {
@@ -320,6 +323,9 @@ int FGATIS::GenTransmission(const int regen, const int special) {
       transmission += " " + at + " " + ConvertNumToSpokenDigits(buf) + BRK;
   }
 
+// Sounds better with a pause in there:
+  transmission += PAUSE;
+
   int did_some(0);
   int did_ceiling(0);
 
@@ -431,21 +437,24 @@ int FGATIS::GenTransmission(const int regen, const int special) {
   transmission += ConvertNumToSpokenDigits(buf) + BRK;
 
   if (_type == ATIS /* as opposed to AWOS */) {
-      const FGAirport* apt = fgFindAirportID(ident);
+    const FGAirport* apt = fgFindAirportID(ident);
-      assert(apt);
+    if (apt) {
-        string rwy_no = apt->getActiveRunwayForUsage()->ident();
+      string rwy_no = apt->getActiveRunwayForUsage()->ident();
       if(rwy_no != "NN") {
         transmission += Landing_and_departing_runway + " ";
         transmission += ConvertRwyNumToSpokenString(rwy_no) + BRK;
+#ifdef ATIS_TEST
         if (msg_OK) {
           msg_time = cur_time;
-          //cout << "In atis.cxx, r.rwy_no: " << rwy_no
+          cout << "In atis.cxx, r.rwy_no: " << rwy_no
-          //   << " wind_dir: " << wind_dir << endl;
+             << " wind_dir: " << wind_dir << endl;
         }
+#endif
+      }
     }
     transmission += On_initial_contact_advise_you_have_information + " ";
     transmission += phonetic_seq_string;
-    transmission += "... " + BRK;
+    transmission += "... " + BRK + PAUSE + PAUSE;
   }
 #ifdef ATIS_TEST
   cout << "**** ATIS active on:";
@@ -474,7 +483,7 @@ int FGATIS::GenTransmission(const int regen, const int special) {
   for (size_t where;;) {
     where = transmission.find_first_of(":.");
     if (where == string::npos) break;
-    transmission.replace(where, 1, " /_ ");
+    transmission.replace(where, 1, PAUSE);
   }
   return 1;
 }

src/ATCDCL/atis_lexicon.hxx

@@ -34,9 +34,12 @@ Q(hundred)
 Q(zero)
 Q(Temperature)
 Q(clear)
+Q(isolated)
+Q(few)
 Q(scattered)
 Q(broken)
 Q(overcast)
+Q(thin)
 Q(Sky_condition)
 Q(Ceiling)
 Q(minus)

src/ATCDCL/atis_remap.hxx

@@ -3,6 +3,7 @@ REMAP(Rgnl,  Regional)
 REMAP(Co,    County)
 REMAP(Muni,  Municipal)
 REMAP(Mem,   Memorial)
+REMAP(Meml,  Memorial)
 REMAP(Apt,   Airport)
 REMAP(Arpt,  Airport)
 REMAP(Fld,   Field)

src/Main/CMakeLists.txt

@@ -39,7 +39,6 @@ target_link_libraries(fgfs
 	${ALUT_LIBRARY} 
 	${ZLIB_LIBRARIES}
 	${PLIB_LIBRARIES}
-	${RT_LIBRARY}
+	${RT_LIBRARY})
-	${Boost_SERIALIZATION_LIBRARY})
 	
 install(TARGETS fgfs RUNTIME DESTINATION bin)