FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log positions in courseDeg/distanceM failures

Browse Source 
Trying to understand what causes FLIGHTGEAR-71G on Sentry; suspect it
might be passing in uninitalised values.
This commit is contained in:
James Turner
2021-03-15 15:45:19 +00:00
parent 798e690279
commit cf2fe76bb8
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/math/SGGeodesy.cxx
+13 -6
View File
@@ -15,15 +15,14 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// //
#ifdef HAVE_CONFIG_H #include <simgear_config.h>
# include <simgear_config.h>
#endif
#include <cmath> #include <cmath>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/strutils.hxx>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx>
#include "SGMath.hxx" #include "SGMath.hxx"
@@ -71,6 +70,8 @@ static double e4 = E2*E2;
#undef _POLRAD #undef _POLRAD
#undef E2 #undef E2
using namespace std::string_literals;
void void
SGGeodesy::SGCartToGeod(const SGVec3<double>& cart, SGGeod& geod) SGGeodesy::SGCartToGeod(const SGVec3<double>& cart, SGGeod& geod)
{ {
@@ -474,7 +475,10 @@ SGGeodesy::courseDeg(const SGGeod& p1, const SGGeod& p2)
p2.getLatitudeDeg(), p2.getLongitudeDeg(), p2.getLatitudeDeg(), p2.getLongitudeDeg(),
&course1, &course2, &distance); &course1, &course2, &distance);
if (r != 0) { if (r != 0) {
throw sg_exception("SGGeodesy::courseDeg, unable to compute course"); const auto p1Str = simgear::strutils::formatGeodAsString(p1);
const auto p2Str = simgear::strutils::formatGeodAsString(p2);
throw sg_exception("SGGeodesy::courseDeg, unable to compute course:" + p1Str + " -> "s + p2Str);
} }
return course1; return course1;
@@ -488,7 +492,10 @@ SGGeodesy::distanceM(const SGGeod& p1, const SGGeod& p2)
p2.getLatitudeDeg(), p2.getLongitudeDeg(), p2.getLatitudeDeg(), p2.getLongitudeDeg(),
&course1, &course2, &distance); &course1, &course2, &distance);
if (r != 0) { if (r != 0) {
throw sg_exception("SGGeodesy::distanceM, unable to compute distance"); const auto p1Str = simgear::strutils::formatGeodAsString(p1);
const auto p2Str = simgear::strutils::formatGeodAsString(p2);
throw sg_exception("SGGeodesy::distanceM, unable to compute distance:" + p1Str + " -> "s + p2Str);
} }
return distance; return distance;