even more warning fixes
This commit is contained in:
parent
e294ab7b39
commit
2ea02594c0
6 changed files with 16 additions and 14 deletions
|
@ -42,7 +42,7 @@ int main( int argc, char **argv ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// calculate runway threshold point
|
// calculate runway threshold point
|
||||||
double thresh_lat, thresh_lon, return_az;
|
double thresh_lat = 0.0, thresh_lon = 0.0, return_az = 0.0;
|
||||||
geo_direct_wgs_84 ( 0.0, rwy_lat, rwy_lon, rwy_hdg,
|
geo_direct_wgs_84 ( 0.0, rwy_lat, rwy_lon, rwy_hdg,
|
||||||
rwy_len / 2.0, &thresh_lat, &thresh_lon, &return_az );
|
rwy_len / 2.0, &thresh_lat, &thresh_lon, &return_az );
|
||||||
cout << "Threshold = " << thresh_lat << "," << thresh_lon << endl;
|
cout << "Threshold = " << thresh_lat << "," << thresh_lon << endl;
|
||||||
|
@ -54,7 +54,7 @@ int main( int argc, char **argv ) {
|
||||||
cout << "Distance = " << dist_m << endl;
|
cout << "Distance = " << dist_m << endl;
|
||||||
|
|
||||||
// back project that distance along the runway center line
|
// back project that distance along the runway center line
|
||||||
double nloc_lat, nloc_lon;
|
double nloc_lat = 0.0, nloc_lon = 0.0;
|
||||||
geo_direct_wgs_84 ( 0.0, thresh_lat, thresh_lon, rwy_hdg + 180.0,
|
geo_direct_wgs_84 ( 0.0, thresh_lat, thresh_lon, rwy_hdg + 180.0,
|
||||||
dist_m, &nloc_lat, &nloc_lon, &return_az );
|
dist_m, &nloc_lat, &nloc_lon, &return_az );
|
||||||
printf("New localizer = %.6f %.6f\n", nloc_lat, nloc_lon );
|
printf("New localizer = %.6f %.6f\n", nloc_lat, nloc_lon );
|
||||||
|
|
|
@ -117,6 +117,8 @@ void FGAirportDynamicsXMLLoader::startElement (const char * name, const XMLAttr
|
||||||
holdPointType=3;
|
holdPointType=3;
|
||||||
} else if (attval==string("PushBack")) {
|
} else if (attval==string("PushBack")) {
|
||||||
holdPointType=3;
|
holdPointType=3;
|
||||||
|
} else {
|
||||||
|
holdPointType=0;
|
||||||
}
|
}
|
||||||
//cerr << "Setting Holding point to " << holdPointType << endl;
|
//cerr << "Setting Holding point to " << holdPointType << endl;
|
||||||
taxiNode.setHoldPointType(holdPointType);
|
taxiNode.setHoldPointType(holdPointType);
|
||||||
|
|
|
@ -536,9 +536,9 @@ const string& FGAirportDynamics::getId() const {
|
||||||
// so that at least I can start working on assigning different frequencies to different
|
// so that at least I can start working on assigning different frequencies to different
|
||||||
// operations.
|
// operations.
|
||||||
|
|
||||||
int FGAirportDynamics::getGroundFrequency(int leg) {
|
int FGAirportDynamics::getGroundFrequency(unsigned leg) {
|
||||||
//return freqGround.size() ? freqGround[0] : 0; };
|
//return freqGround.size() ? freqGround[0] : 0; };
|
||||||
int groundFreq;
|
int groundFreq = 0;
|
||||||
if (leg < 2) {
|
if (leg < 2) {
|
||||||
SG_LOG(SG_ATC, SG_ALERT, "Leg value is smaller than two at " << SG_ORIGIN);
|
SG_LOG(SG_ATC, SG_ALERT, "Leg value is smaller than two at " << SG_ORIGIN);
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,7 +117,7 @@ public:
|
||||||
FGTowerController *getTowerController() { return &towerController; };
|
FGTowerController *getTowerController() { return &towerController; };
|
||||||
|
|
||||||
const string& getAtisInformation() { return atisInformation; };
|
const string& getAtisInformation() { return atisInformation; };
|
||||||
int getGroundFrequency(int leg); //{ return freqGround.size() ? freqGround[0] : 0; };
|
int getGroundFrequency(unsigned leg); //{ return freqGround.size() ? freqGround[0] : 0; };
|
||||||
|
|
||||||
void setRwyUse(const FGRunwayPreference& ref);
|
void setRwyUse(const FGRunwayPreference& ref);
|
||||||
};
|
};
|
||||||
|
|
|
@ -267,11 +267,11 @@ void FGGroundNetwork::init()
|
||||||
{
|
{
|
||||||
if ((*j)->getEnd()->getIndex() == (*i)->getStart()->getIndex())
|
if ((*j)->getEnd()->getIndex() == (*i)->getStart()->getIndex())
|
||||||
{
|
{
|
||||||
int start1 = (*i)->getStart()->getIndex();
|
// int start1 = (*i)->getStart()->getIndex();
|
||||||
int end1 = (*i)->getEnd() ->getIndex();
|
// int end1 = (*i)->getEnd() ->getIndex();
|
||||||
int start2 = (*j)->getStart()->getIndex();
|
// int start2 = (*j)->getStart()->getIndex();
|
||||||
int end2 = (*j)->getEnd()->getIndex();
|
// int end2 = (*j)->getEnd()->getIndex();
|
||||||
int oppIndex = (*j)->getIndex();
|
// int oppIndex = (*j)->getIndex();
|
||||||
//cerr << "Opposite of " << (*i)->getIndex() << " (" << start1 << "," << end1 << ") "
|
//cerr << "Opposite of " << (*i)->getIndex() << " (" << start1 << "," << end1 << ") "
|
||||||
// << "happens to be " << oppIndex << " (" << start2 << "," << end2 << ") " << endl;
|
// << "happens to be " << oppIndex << " (" << start2 << "," << end2 << ") " << endl;
|
||||||
(*i)->setOpposite(*j);
|
(*i)->setOpposite(*j);
|
||||||
|
@ -316,7 +316,7 @@ int FGGroundNetwork::findNearestNode(double lat, double lon)
|
||||||
return findNearestNode(SGGeod::fromDeg(lon, lat));
|
return findNearestNode(SGGeod::fromDeg(lon, lat));
|
||||||
}
|
}
|
||||||
|
|
||||||
FGTaxiNode *FGGroundNetwork::findNode(int idx)
|
FGTaxiNode *FGGroundNetwork::findNode(unsigned idx)
|
||||||
{ /*
|
{ /*
|
||||||
for (FGTaxiNodeVectorIterator
|
for (FGTaxiNodeVectorIterator
|
||||||
itr = nodes.begin();
|
itr = nodes.begin();
|
||||||
|
@ -332,7 +332,7 @@ FGTaxiNode *FGGroundNetwork::findNode(int idx)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
FGTaxiSegment *FGGroundNetwork::findSegment(int idx)
|
FGTaxiSegment *FGGroundNetwork::findSegment(unsigned idx)
|
||||||
{/*
|
{/*
|
||||||
for (FGTaxiSegmentVectorIterator
|
for (FGTaxiSegmentVectorIterator
|
||||||
itr = segments.begin();
|
itr = segments.begin();
|
||||||
|
|
|
@ -256,8 +256,8 @@ public:
|
||||||
int findNearestNode(double lat, double lon);
|
int findNearestNode(double lat, double lon);
|
||||||
int findNearestNode(const SGGeod& aGeod);
|
int findNearestNode(const SGGeod& aGeod);
|
||||||
|
|
||||||
FGTaxiNode *findNode(int idx);
|
FGTaxiNode *findNode(unsigned idx);
|
||||||
FGTaxiSegment *findSegment(int idx);
|
FGTaxiSegment *findSegment(unsigned idx);
|
||||||
FGTaxiRoute findShortestRoute(int start, int end, bool fullSearch=true);
|
FGTaxiRoute findShortestRoute(int start, int end, bool fullSearch=true);
|
||||||
//void trace(FGTaxiNode *, int, int, double dist);
|
//void trace(FGTaxiNode *, int, int, double dist);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue