- Added ultra-light traffic is now a separate traffic class that can have its

[flightgear.git] / src / Main / fg_props.cxx

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 1ab498b29f53a22c896d159f4ca2edf39e936faa..a56cfc59cd17c6a03eb1e667cbc1c82afa9474e7 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -35,7 +35,6 @@
 
 #include STL_IOSTREAM
 
-#include <ATC/ATCdisplay.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Time/tmp.hxx>
 #include <Environment/environment.hxx>
@@ -96,7 +95,8 @@ static const char *
 getLoggingClasses ()
 {
   sgDebugClass classes = logbuf::get_log_classes();
-  static string result = "";   // FIXME
+  static string result;
+  result = "";
   for (int i = 0; log_class_mappings[i].c != SG_UNDEFD; i++) {
     if ((classes&log_class_mappings[i].c) > 0) {
       if (!result.empty())
@@ -316,11 +316,10 @@ setDateString (const char * date_string)
 static const char *
 getGMTString ()
 {
-  static char buf[16];         // FIXME
+  static char buf[16];
   struct tm *t = globals->get_time_params()->getGmt();
-  sprintf(buf, " %.2d:%.2d:%.2d",
-         t->tm_hour, t->tm_min, t->tm_sec);
-  // cout << t << " " << buf << endl;
+  snprintf(buf, 16, "%.2d:%.2d:%.2d",
+      t->tm_hour, t->tm_min, t->tm_sec);
   return buf;
 }
 
@@ -441,9 +440,10 @@ getLongitudeString ()
   static char buf[32];
   double d = n->getDoubleValue();
   int format = f->getIntValue();
+  char c = d < 0.0 ? 'W' : 'E';
 
   if (format == 0) {
-    snprintf(buf, 32, "%3.6f", d);
+    snprintf(buf, 32, "%3.6f%c", d, c);
 
   } else if (format == 1) {
     // dd mm.mmm' (DMM-Format) -- uses a round-off factor tailored to the
@@ -451,8 +451,7 @@ getLongitudeString ()
     // preventing minute values of 60.
     double deg = fabs(d) + 5.0E-4 / 60.0;
     double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4;
-    snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min,
-        d < 0.0 ? 'W' : 'E');
+    snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, c);
 
   } else {
     // mm'ss.s'' (DMS-Format) -- uses a round-off factor tailored to the
@@ -462,7 +461,7 @@ getLongitudeString ()
     double min = (deg - int(deg)) * 60.0;
     double sec = (min - int(min)) * 60.0 - 0.049;
     snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
-      int(min), sec, d < 0.0 ? 'W' : 'E');
+        int(min), fabs(sec), c);
   }
   return buf;
 }
@@ -475,22 +474,22 @@ getLatitudeString ()
   static char buf[32];
   double d = n->getDoubleValue();
   int format = f->getIntValue();
+  char c = d < 0.0 ? 'S' : 'N';
 
   if (format == 0) {
-    snprintf(buf, 32, "%3.6f", d);
+    snprintf(buf, 32, "%3.6f%c", d, c);
 
   } else if (format == 1) {
     double deg = fabs(d) + 5.0E-4 / 60.0;
     double min = fabs(deg - int(deg)) * 60.0 - 4.999E-4;
-    snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min,
-        d < 0.0 ? 'S' : 'N');
+    snprintf(buf, 32, "%d*%06.3f%c", int(d < 0.0 ? -deg : deg), min, c);
 
   } else {
     double deg = fabs(d) + 0.05 / 3600.0;
     double min = (deg - int(deg)) * 60.0;
     double sec = (min - int(min)) * 60.0 - 0.049;
     snprintf(buf, 32, "%d*%02d %04.1f%c", int(d < 0.0 ? -deg : deg),
-      int(min), sec, d < 0.0 ? 'S' : 'N');
+        int(min), fabs(sec), c);
   }
   return buf;
 }