Merge branch 'durk/traffic'

[flightgear.git] / src / Instrumentation / gps.cxx

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 2c6f36495882344acf8d2b10ddfe32bfaec72c66..e05805d831b7982fb174e13d7a4d45fb1a19a735 100644 (file)
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -222,7 +222,7 @@ GPS::Config::getCourseSource() const
     return "";
   }
   
-  return _extCourseSource->getPath(true);
+  return _extCourseSource->getPath(true).c_str();
 }
 
 void
@@ -1186,7 +1186,9 @@ double GPS::getWP1MagBearing() const
     return -9999.0;
   }
 
-  return _wp1TrueBearing - _magvar_node->getDoubleValue();
+  double magBearing = _wp1TrueBearing - _magvar_node->getDoubleValue();
+  SG_NORMALIZE_RANGE(magBearing, 0.0, 360.0);
+  return magBearing;
 }
 
 double GPS::getWP1CourseDeviation() const