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

Merge branch 'jmt/geodistance'

Browse Source
This commit is contained in:
Tim Moore
2010-01-11 07:10:46 +01:00
parent 51b0cf535e 578af00b0d
commit 601c0977df
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/math/SGGeodesy.cxx
+9 -2
View File
@@ -540,7 +540,7 @@ SGGeodesy::courseRad(const SGGeoc& from, const SGGeoc& to)
} }
double double
SGGeodesy::distanceM(const SGGeoc& from, const SGGeoc& to) SGGeodesy::distanceRad(const SGGeoc& from, const SGGeoc& to)
{ {
// d = 2*asin(sqrt((sin((lat1-lat2)/2))^2 + // d = 2*asin(sqrt((sin((lat1-lat2)/2))^2 +
// cos(lat1)*cos(lat2)*(sin((lon1-lon2)/2))^2)) // cos(lat1)*cos(lat2)*(sin((lon1-lon2)/2))^2))
@@ -550,5 +550,12 @@ SGGeodesy::distanceM(const SGGeoc& from, const SGGeoc& to)
double tmp2 = sin(0.5*(from.getLongitudeRad() - to.getLongitudeRad())); double tmp2 = sin(0.5*(from.getLongitudeRad() - to.getLongitudeRad()));
double square = tmp1*tmp1 + cosLatFrom*cosLatTo*tmp2*tmp2; double square = tmp1*tmp1 + cosLatFrom*cosLatTo*tmp2*tmp2;
double s = SGMiscd::min(sqrt(SGMiscd::max(square, 0)), 1); double s = SGMiscd::min(sqrt(SGMiscd::max(square, 0)), 1);
return 2 * asin(s) * SG_RAD_TO_NM * SG_NM_TO_METER; return 2 * asin(s);
}
double
SGGeodesy::distanceM(const SGGeoc& from, const SGGeoc& to)
{
return distanceRad(from, to) * SG_RAD_TO_NM * SG_NM_TO_METER;
} }
simgear/math/SGGeodesy.hxx
+1
View File
@@ -61,6 +61,7 @@ public:
static void advanceRadM(const SGGeoc& geoc, double course, double distance, static void advanceRadM(const SGGeoc& geoc, double course, double distance,
SGGeoc& result); SGGeoc& result);
static double courseRad(const SGGeoc& from, const SGGeoc& to); static double courseRad(const SGGeoc& from, const SGGeoc& to);
static double distanceRad(const SGGeoc& from, const SGGeoc& to);
static double distanceM(const SGGeoc& from, const SGGeoc& to); static double distanceM(const SGGeoc& from, const SGGeoc& to);
}; };