1
0
Fork 0

Maintenance: runways

whitespace formatting.
increase buf size
convert atoi() to stoi()
This commit is contained in:
Scott Giese 2021-02-21 00:03:47 -06:00
parent 4a2cbc7389
commit eb708eb5fe

View file

@ -22,12 +22,12 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#include <config.h>
#endif
#include <cstdio> // sprintf()
#include <cstdlib> // atoi()
#include <cassert>
#include <cstdio> // sprintf()
#include <cstdlib> // atoi()
#include <simgear/compiler.h>
@ -38,177 +38,174 @@
#include "runways.hxx"
#include <Airports/airport.hxx>
#include <Navaids/procedure.hxx>
#include <Navaids/navrecord.hxx>
#include <Navaids/NavDataCache.hxx>
#include <Navaids/navrecord.hxx>
#include <Navaids/procedure.hxx>
using std::string;
FGRunway::FGRunway(PositionedID aGuid,
PositionedID aAirport, const string& aIdent,
const SGGeod& aGeod,
const double heading, const double length,
const double width,
const double displ_thresh,
const double stopway,
const int surface_code) :
FGRunwayBase(aGuid, RUNWAY, aIdent, aGeod,
heading, length, width, surface_code),
_airport(aAirport),
_reciprocal(0),
_displ_thresh(displ_thresh),
_stopway(stopway),
_ils(0)
const SGGeod& aGeod,
const double heading, const double length,
const double width,
const double displ_thresh,
const double stopway,
const int surface_code) : FGRunwayBase(aGuid, RUNWAY, aIdent, aGeod,
heading, length, width, surface_code),
_airport(aAirport),
_reciprocal(0),
_displ_thresh(displ_thresh),
_stopway(stopway),
_ils(0)
{
}
string FGRunway::reverseIdent(const string& aRunwayIdent)
{
// Helipads don't have a seperate number per end
if (aRunwayIdent.size() && (aRunwayIdent[0] == 'H' || aRunwayIdent[0] == 'h' || aRunwayIdent[0] == 'x')) {
return aRunwayIdent;
}
std::string ident(aRunwayIdent);
char buf[4];
int rn = atoi(ident.substr(0,2).c_str());
rn += 18;
while(rn > 36) {
rn -= 36;
}
snprintf(buf, sizeof(buf), "%02i", rn);
if(ident.size() == 3) {
char suffix = toupper(ident[2]);
if(suffix == 'L') {
buf[2] = 'R';
} else if (suffix == 'R') {
buf[2] = 'L';
} else {
// something else, just copy
buf[2] = suffix;
// Helipads don't have a seperate number per end
if (aRunwayIdent.size() && (aRunwayIdent[0] == 'H' || aRunwayIdent[0] == 'h' || aRunwayIdent[0] == 'x')) {
return aRunwayIdent;
}
buf[3] = 0;
}
return buf;
std::string ident(aRunwayIdent);
int rn = std::stoi(ident.substr(0, 2));
rn += 18;
while (rn > 36) {
rn -= 36;
}
char buf[16];
snprintf(buf, sizeof(buf) - 1, "%02i", rn);
if (ident.size() == 3) {
char suffix = toupper(ident[2]);
if (suffix == 'L') {
buf[2] = 'R';
} else if (suffix == 'R') {
buf[2] = 'L';
} else {
// something else, just copy
buf[2] = suffix;
}
buf[3] = 0;
}
return buf;
}
double FGRunway::score(double aLengthWt, double aWidthWt, double aSurfaceWt, double aIlsWt) const
{
int surface = 1;
if (_surface_code == 12 || _surface_code == 5) // dry lakebed & gravel
surface = 2;
else if (_surface_code == 1 || _surface_code == 2) // asphalt & concrete
surface = 3;
int surface = 1;
if (_surface_code == 12 || _surface_code == 5) // dry lakebed & gravel
surface = 2;
else if (_surface_code == 1 || _surface_code == 2) // asphalt & concrete
surface = 3;
int ils = (_ils != 0);
return _length * aLengthWt + _width * aWidthWt + surface * aSurfaceWt + ils * aIlsWt + 1e-20;
int ils = (_ils != 0);
return _length * aLengthWt + _width * aWidthWt + surface * aSurfaceWt + ils * aIlsWt + 1e-20;
}
SGGeod FGRunway::begin() const
{
return pointOnCenterline(0.0);
return pointOnCenterline(0.0);
}
SGGeod FGRunway::end() const
{
return pointOnCenterline(lengthM());
return pointOnCenterline(lengthM());
}
SGGeod FGRunway::threshold() const
{
return pointOnCenterline(_displ_thresh);
return pointOnCenterline(_displ_thresh);
}
void FGRunway::setReciprocalRunway(PositionedID other)
{
assert(_reciprocal==0);
_reciprocal = other;
assert(_reciprocal == 0);
_reciprocal = other;
}
FGAirport* FGRunway::airport() const
{
return loadById<FGAirport>(_airport);
return loadById<FGAirport>(_airport);
}
FGRunway* FGRunway::reciprocalRunway() const
{
return loadById<FGRunway>(_reciprocal);
return loadById<FGRunway>(_reciprocal);
}
FGNavRecord* FGRunway::ILS() const
{
if (_ils == 0) {
return NULL;
}
return loadById<FGNavRecord>(_ils);
if (_ils == 0) {
return NULL;
}
return loadById<FGNavRecord>(_ils);
}
FGNavRecord* FGRunway::glideslope() const
{
flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
PositionedID gsId = cache->findNavaidForRunway(guid(), FGPositioned::GS);
if (gsId == 0) {
return NULL;
}
return loadById<FGNavRecord>(gsId);
flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
PositionedID gsId = cache->findNavaidForRunway(guid(), FGPositioned::GS);
if (gsId == 0) {
return NULL;
}
return loadById<FGNavRecord>(gsId);
}
flightgear::SIDList FGRunway::getSIDs() const
{
FGAirport* apt = airport();
flightgear::SIDList result;
for (unsigned int i=0; i<apt->numSIDs(); ++i) {
flightgear::SID* s = apt->getSIDByIndex(i);
if (s->isForRunway(this)) {
result.push_back(s);
}
} // of SIDs at the airport iteration
return result;
FGAirport* apt = airport();
flightgear::SIDList result;
for (unsigned int i = 0; i < apt->numSIDs(); ++i) {
flightgear::SID* s = apt->getSIDByIndex(i);
if (s->isForRunway(this)) {
result.push_back(s);
}
} // of SIDs at the airport iteration
return result;
}
flightgear::STARList FGRunway::getSTARs() const
{
FGAirport* apt = airport();
flightgear::STARList result;
for (unsigned int i=0; i<apt->numSTARs(); ++i) {
flightgear::STAR* s = apt->getSTARByIndex(i);
if (s->isForRunway(this)) {
result.push_back(s);
}
} // of STARs at the airport iteration
return result;
FGAirport* apt = airport();
flightgear::STARList result;
for (unsigned int i = 0; i < apt->numSTARs(); ++i) {
flightgear::STAR* s = apt->getSTARByIndex(i);
if (s->isForRunway(this)) {
result.push_back(s);
}
} // of STARs at the airport iteration
return result;
}
flightgear::ApproachList
FGRunway::getApproaches(flightgear::ProcedureType type) const
{
FGAirport* apt = airport();
flightgear::ApproachList result;
for (unsigned int i=0; i<apt->numApproaches(); ++i)
{
flightgear::Approach* s = apt->getApproachByIndex(i);
if( s->runway() == this
&& (type == flightgear::PROCEDURE_INVALID || type == s->type()) )
{
result.push_back(s);
}
} // of approaches at the airport iteration
return result;
FGAirport* apt = airport();
flightgear::ApproachList result;
for (unsigned int i = 0; i < apt->numApproaches(); ++i) {
flightgear::Approach* s = apt->getApproachByIndex(i);
if (s->runway() == this && (type == flightgear::PROCEDURE_INVALID || type == s->type())) {
result.push_back(s);
}
} // of approaches at the airport iteration
return result;
}
void FGRunway::updateThreshold(const SGGeod& newThreshold, double newHeading,
double newDisplacedThreshold,
double newStopway)
double newDisplacedThreshold,
double newStopway)
{
modifyPosition(newThreshold);
_heading = newHeading;
@ -217,12 +214,11 @@ void FGRunway::updateThreshold(const SGGeod& newThreshold, double newHeading,
}
FGHelipad::FGHelipad(PositionedID aGuid,
PositionedID aAirport, const string& aIdent,
const SGGeod& aGeod,
const double heading, const double length,
const double width,
const int surface_code) :
FGRunwayBase(aGuid, HELIPAD, aIdent, aGeod,
heading, length, width, surface_code)
PositionedID aAirport, const string& aIdent,
const SGGeod& aGeod,
const double heading, const double length,
const double width,
const int surface_code) : FGRunwayBase(aGuid, HELIPAD, aIdent, aGeod,
heading, length, width, surface_code)
{
}