fly/flightgear
1
0
Fork 0
Code Activity

FlightPlan parses waypoints using Simgear code

Browse source 
This means many formats are supported in the route-manager input
method, and when creating waypoints from a string.
This commit is contained in:
James Turner 2018-06-29 14:53:30 +01:00
parent dea2d5e45e
commit 602c2c30dd
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Navaids/FlightPlan.cxx
View file

@ -1052,18 +1052,22 @@ WayptRef intersectionFromString(FGPositionedRef p1,
WayptRef wayptFromLonLatString(const std::string& target) WayptRef wayptFromLonLatString(const std::string& target)
{ {
size_t pos = target.find( ',' ); SGGeod g;
if ( pos == string::npos ) const bool defaultToLonLat = true; // parseStringAsGeod would otherwise default to lat,lon
return WayptRef(); if (!simgear::strutils::parseStringAsGeod(target, &g, defaultToLonLat)) {
return {};
}
// build a short name, like
const int lonDeg = static_cast<int>(g.getLongitudeDeg());
const int latDeg = static_cast<int>(g.getLatitudeDeg());
double lon = atof( target.substr(0, pos).c_str());
double lat = atof( target.c_str() + pos + 1);
char buf[32]; char buf[32];
char ew = (lon < 0.0) ? 'W' : 'E'; char ew = (lonDeg < 0) ? 'W' : 'E';
char ns = (lat < 0.0) ? 'S' : 'N'; char ns = (latDeg < 0) ? 'S' : 'N';
snprintf(buf, 32, "%c%03d%c%03d", ew, (int) fabs(lon), ns, (int)fabs(lat)); snprintf(buf, 32, "%c%03d%c%03d", ew, std::abs(lonDeg), ns, std::abs(latDeg));
return new BasicWaypt(SGGeod::fromDeg(lon, lat), buf, NULL); return new BasicWaypt(g, buf, nullptr);
} }
WayptRef viaFromString(const SGGeod& basePosition, const std::string& target) WayptRef viaFromString(const SGGeod& basePosition, const std::string& target)