#endif
#include "kln89_page_apt.hxx"
-#include "ATCDCL/commlist.hxx"
-#include "Main/globals.hxx"
-#include "Airports/runways.hxx"
-#include "Airports/simple.hxx"
+#include <ATCDCL/commlist.hxx>
+#include <Main/globals.hxx>
+#include <Airports/runways.hxx>
+#include <Airports/simple.hxx>
// This function is copied from Airports/runways.cxx
// TODO - Make the original properly available and remove this instance!!!!
2, 0, 0, _to_flag, (_kln89->_mode == KLN89_MODE_CRSR && _uLinePos == 5 ? true : false));
} else if(_subPage == 2) {
// Try and calculate a realistic difference from UTC based on longitude
- float degLonPerHr = 360.0 / 24.0; // 15 degrees per hour difference.
// Since 0 longitude is the middle of UTC, the boundaries will be at 7.5, 22.5, 37.5 etc.
int hrDiff = ((int)((fabs(ap->getLongitude())) + 7.5)) / 15;
_kln89->DrawText("UTC", 2, 0, 2);
_kln89->DrawText(_iaps[_curIap]->_rwyStr, 2, 7, 3);
_kln89->DrawText(_iaps[_curIap]->_id, 2, 12, 3);
_kln89->DrawText("IAF", 2, 2, 2);
- int line = 0;
+ unsigned int line = 0;
for(unsigned int i=_iafStart; i<_IAF.size(); ++i) {
if(line == 2) {
i = _IAF.size() - 1;
_iafDialog = true;
_maxULinePos = _IAF.size();
} else {
+ // There is only 1 IAF, so load the waypoints into the approach flightplan here.
+ // TODO - there is nasty code duplication loading the approach FP between the case here where we have only one
+ // IAF and the case where we must choose the IAF from a list. Try to tidy this after it is all working properly.
+ _kln89->_approachFP->waypoints.clear();
+ GPSWaypoint* wp = new GPSWaypoint;
+ *wp = *_IAF[0]; // Need to make copies here since we're going to alter ID and type sometimes
+ string iafid = wp->id;
+ _kln89->_approachFP->waypoints.push_back(wp);
+ for(unsigned int i=0; i<_IAP.size(); ++i) {
+ if(_IAP[i]->id != iafid) { // Don't duplicate waypoints that are part of the initial fix list and the approach procedure list.
+ // FIXME - allow the same waypoint to be both the IAF and the FAF in some
+ // approaches that have a procedure turn eg. KDLL
+ // Also allow MAF to be the same as IAF!
+ wp = new GPSWaypoint;
+ *wp = *_IAP[i];
+ _kln89->_approachFP->waypoints.push_back(wp);
+ }
+ }
+ // Only add 1 missed approach procedure waypoint for now. I think this might be standard always anyway.
+ wp = new GPSWaypoint;
+ *wp = *_MAP[0];
+ //wp->id += 'h';
+ _kln89->_approachFP->waypoints.push_back(wp);
+
_addDialog = true;
_maxULinePos = 1;
}