// extract altitude
double alt = -9999.0;
- unsigned int pos = target.find( '@' );
+ size_t pos = target.find( '@' );
if ( pos != string::npos ) {
alt = atof( target.c_str() + pos + 1 );
target = target.substr( 0, pos );
return 2;
}
- // check for fix id
- FGFix f;
- if ( globals->get_fixlist()->query( target, &f ) ) {
- SG_LOG( SG_GENERAL, SG_INFO, "Adding waypoint (fix) = " << target );
- *wp = new SGWayPoint( f.get_lon(), f.get_lat(), alt, SGWayPoint::WGS84, target );
- return 3;
- }
-
- // Try finding a nav matching the ID
double lat, lon;
// The base lon/lat are determined by the last WP,
// or the current pos if the WP list is empty.
lon = fgGetNode("/position/longitude-deg")->getDoubleValue();
}
+ // check for fix id
+ FGFix f;
+ double heading;
+ double dist;
+
+ if ( globals->get_fixlist()->query_and_offset( target, lon, lat, 0, &f, &heading, &dist ) ) {
+ SG_LOG( SG_GENERAL, SG_INFO, "Adding waypoint (fix) = " << target );
+ *wp = new SGWayPoint( f.get_lon(), f.get_lat(), alt, SGWayPoint::WGS84, target );
+ return 3;
+ }
+
+ // Try finding a nav matching the ID
lat *= SGD_DEGREES_TO_RADIANS;
lon *= SGD_DEGREES_TO_RADIANS;
// command interface /autopilot/route-manager/input:
//
-// @clear ... clear route
-// @pop ... remove first entry
-// @delete3 ... delete 4th entry
-// @insert2:ksfo@900 ... insert "ksfo@900" as 3rd entry
-// ksfo@900 ... append "ksfo@900"
+// @CLEAR ... clear route
+// @POP ... remove first entry
+// @DELETE3 ... delete 4th entry
+// @INSERT2:KSFO@900 ... insert "KSFO@900" as 3rd entry
+// KSFO@900 ... append "KSFO@900"
//
void FGRouteMgr::Listener::valueChanged(SGPropertyNode *prop)
{
const char *s = prop->getStringValue();
- if (!strcmp(s, "@clear"))
+ if (!strcmp(s, "@CLEAR"))
mgr->init();
- else if (!strcmp(s, "@pop"))
+ else if (!strcmp(s, "@POP"))
mgr->pop_waypoint(0);
- else if (!strncmp(s, "@delete", 7))
+ else if (!strncmp(s, "@DELETE", 7))
mgr->pop_waypoint(atoi(s + 7));
- else if (!strncmp(s, "@insert", 7)) {
+ else if (!strncmp(s, "@INSERT", 7)) {
char *r;
int pos = strtol(s + 7, &r, 10);
if (*r++ != ':')