[apt_math] Maintenance
This commit is contained in:
parent
48e80937c9
commit
f9575d0d4e
1 changed files with 50 additions and 49 deletions
|
@ -13,123 +13,124 @@
|
||||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <simgear/compiler.h>
|
|
||||||
#include "apt_math.hxx"
|
#include "apt_math.hxx"
|
||||||
|
#include <simgear/compiler.h>
|
||||||
|
|
||||||
tgContour gen_wgs84_area( SGGeod origin,
|
|
||||||
double length_m,
|
tgContour gen_wgs84_area(SGGeod origin,
|
||||||
double displ1, double displ2,
|
double length_m,
|
||||||
double width_m,
|
double displ1, double displ2,
|
||||||
double heading_deg,
|
double width_m,
|
||||||
bool add_mid )
|
double heading_deg,
|
||||||
|
bool add_mid)
|
||||||
{
|
{
|
||||||
tgContour result;
|
tgContour result;
|
||||||
double length_hdg = heading_deg;
|
double length_hdg = heading_deg;
|
||||||
double left_hdg = SGMiscd::normalizePeriodic(0, 360, length_hdg - 90.0);
|
double left_hdg = SGMiscd::normalizePeriodic(0.0, 360.0, length_hdg - 90.0);
|
||||||
|
|
||||||
// move to the +l end/center of the runway
|
// move to the +l end/center of the runway
|
||||||
SGGeod ref = SGGeodesy::direct( origin, length_hdg, length_m / 2.0 - displ2 );
|
SGGeod ref = SGGeodesy::direct(origin, length_hdg, length_m / 2.0 - displ2);
|
||||||
|
|
||||||
// move to the l,-w corner (then we add points in a clockwise direction)
|
// move to the l,-w corner (then we add points in a clockwise direction)
|
||||||
result.AddNode( SGGeodesy::direct( ref, left_hdg, -width_m / 2.0) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, -width_m / 2.0));
|
||||||
|
|
||||||
// move to the l,w corner
|
// move to the l,w corner
|
||||||
result.AddNode( SGGeodesy::direct( ref, left_hdg, width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, width_m / 2.0));
|
||||||
|
|
||||||
if ( add_mid ) {
|
if (add_mid) {
|
||||||
// move to the 0,w point (then we add points in a clockwise direction)
|
// move to the 0,w point (then we add points in a clockwise direction)
|
||||||
result.AddNode( SGGeodesy::direct( origin, left_hdg, width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(origin, left_hdg, width_m / 2.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
// move to the -l end/center of the runway
|
// move to the -l end/center of the runway
|
||||||
ref = SGGeodesy::direct( origin, length_hdg, displ1 - length_m/2.0);
|
ref = SGGeodesy::direct(origin, length_hdg, displ1 - length_m / 2.0);
|
||||||
|
|
||||||
// move to the -l,w corner (then we add points in a clockwise direction)
|
// move to the -l,w corner (then we add points in a clockwise direction)
|
||||||
result.AddNode( SGGeodesy::direct( ref, left_hdg, width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, width_m / 2.0));
|
||||||
|
|
||||||
// move to the -l,-w corner
|
// move to the -l,-w corner
|
||||||
result.AddNode( SGGeodesy::direct( ref, left_hdg, -width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, -width_m / 2.0));
|
||||||
|
|
||||||
if ( add_mid ) {
|
if (add_mid) {
|
||||||
// move to the 0,-w point (then we add points in a clockwise direction)
|
// move to the 0,-w point (then we add points in a clockwise direction)
|
||||||
result.AddNode( SGGeodesy::direct( origin, left_hdg, -width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(origin, left_hdg, -width_m / 2.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
result.SetHole( false );
|
result.SetHole(false);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
tgContour gen_wgs84_area( SGGeod end1, SGGeod end2,
|
tgContour gen_wgs84_area(SGGeod end1, SGGeod end2,
|
||||||
double length_ext,
|
double length_ext,
|
||||||
double displ1, double displ2,
|
double displ1, double displ2,
|
||||||
double width_m,
|
double width_m,
|
||||||
double heading_deg,
|
double heading_deg,
|
||||||
bool add_mid )
|
bool add_mid)
|
||||||
{
|
{
|
||||||
tgContour result;
|
tgContour result;
|
||||||
double left_hdg = SGMiscd::normalizePeriodic( 0, 360, heading_deg - 90.0 );
|
double left_hdg = SGMiscd::normalizePeriodic(0.0, 360.0, heading_deg - 90.0);
|
||||||
double course1, course2, distance;
|
double course1, course2, distance;
|
||||||
|
|
||||||
SGGeodesy::inverse(end1, end2, course1, course2, distance);
|
SGGeodesy::inverse(end1, end2, course1, course2, distance);
|
||||||
|
|
||||||
// Calc the center
|
// Calc the center
|
||||||
SGGeod center = SGGeodesy::direct(end1, course1, distance/2 );
|
SGGeod center = SGGeodesy::direct(end1, course1, distance / 2.0);
|
||||||
|
|
||||||
// move from end2 to the displaced threshold
|
// move from end2 to the displaced threshold
|
||||||
SGGeod ref = SGGeodesy::direct( end2, heading_deg, length_ext / 2.0 - displ2);
|
SGGeod ref = SGGeodesy::direct(end2, heading_deg, length_ext / 2.0 - displ2);
|
||||||
|
|
||||||
|
|
||||||
// move to the l,-w corner
|
// move to the l,-w corner
|
||||||
result.AddNode( SGGeodesy::direct(ref, left_hdg, -width_m / 2.0) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, -width_m / 2.0));
|
||||||
|
|
||||||
// move to the l,w corner
|
// move to the l,w corner
|
||||||
result.AddNode( SGGeodesy::direct(ref, left_hdg, width_m / 2.0) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, width_m / 2.0));
|
||||||
|
|
||||||
if ( add_mid ) {
|
if (add_mid) {
|
||||||
// move to the 0,w point
|
// move to the 0,w point
|
||||||
result.AddNode( SGGeodesy::direct( center, left_hdg, width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(center, left_hdg, width_m / 2.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
// move to the end1 center to the displ. threshold
|
// move to the end1 center to the displ. threshold
|
||||||
ref = SGGeodesy::direct( end1, heading_deg, displ1 - length_ext / 2.0 );
|
ref = SGGeodesy::direct(end1, heading_deg, displ1 - length_ext / 2.0);
|
||||||
|
|
||||||
// move to the -l,w corner
|
// move to the -l,w corner
|
||||||
result.AddNode( SGGeodesy::direct( ref, left_hdg, width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, width_m / 2.0));
|
||||||
|
|
||||||
// move to the -l,-w corner
|
// move to the -l,-w corner
|
||||||
result.AddNode( SGGeodesy::direct( ref, left_hdg, -width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(ref, left_hdg, -width_m / 2.0));
|
||||||
|
|
||||||
if ( add_mid ) {
|
if (add_mid) {
|
||||||
// move to the 0,-w point
|
// move to the 0,-w point
|
||||||
result.AddNode( SGGeodesy::direct( center, left_hdg, -width_m / 2.0 ) );
|
result.AddNode(SGGeodesy::direct(center, left_hdg, -width_m / 2.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
tgContour gen_wgs84_rect( SGGeod origin, double heading, double length, double width )
|
tgContour gen_wgs84_rect(SGGeod origin, double heading, double length, double width)
|
||||||
{
|
{
|
||||||
tgContour result;
|
tgContour result;
|
||||||
SGGeod p;
|
SGGeod p;
|
||||||
|
|
||||||
// starting point is in the middle of the rectangle width, at the beginning - stretch to heading
|
// starting point is in the middle of the rectangle width, at the beginning - stretch to heading
|
||||||
// Point 1 is -90deg, 1/2 width away
|
// Point 1 is -90deg, 1/2 width away
|
||||||
double left_hdg = SGMiscd::normalizePeriodic(0, 360, heading -90 );
|
double left_hdg = SGMiscd::normalizePeriodic(0.0, 360.0, heading - 90.0);
|
||||||
p = SGGeodesy::direct( origin, left_hdg, width / 2.0 );
|
p = SGGeodesy::direct(origin, left_hdg, width / 2.0);
|
||||||
result.AddNode( p );
|
result.AddNode(p);
|
||||||
|
|
||||||
// Point 2 is heading, length away from point 1
|
// Point 2 is heading, length away from point 1
|
||||||
p = SGGeodesy::direct( p, heading, length );
|
p = SGGeodesy::direct(p, heading, length);
|
||||||
result.AddNode( p );
|
result.AddNode(p);
|
||||||
|
|
||||||
// Point 3 is -90deg, -width away from point 2
|
// Point 3 is -90deg, -width away from point 2
|
||||||
p = SGGeodesy::direct( p, left_hdg, -width );
|
p = SGGeodesy::direct(p, left_hdg, -width);
|
||||||
result.AddNode( p );
|
result.AddNode(p);
|
||||||
|
|
||||||
// last point is heading, -length from point 3
|
// last point is heading, -length from point 3
|
||||||
p = SGGeodesy::direct( p, heading, -length );
|
p = SGGeodesy::direct(p, heading, -length);
|
||||||
result.AddNode( p );
|
result.AddNode(p);
|
||||||
|
|
||||||
result.SetHole( false );
|
result.SetHole(false);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue