fly/flightgear
1
0
Fork 0
Code Activity

Parse radial+offset from lat,lon waypoint

Browse source
This commit is contained in:
James Turner 2018-12-13 13:46:53 +00:00
parent 738101942f
commit 56cc96f280
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Navaids/FlightPlan.cxx
View file

@ -1264,13 +1264,26 @@ WayptRef intersectionFromString(FGPositionedRef p1,
WayptRef wayptFromLonLatString(const std::string& target)
{
SGGeod g;
const bool defaultToLonLat = true; // parseStringAsGeod would otherwise default to lat,lon
if (!simgear::strutils::parseStringAsGeod(target, &g, defaultToLonLat)) {
// permit lat,lon/radial/offset format
string_list pieces(simgear::strutils::split(target, "/"));
if ((pieces.size() != 1) && (pieces.size() != 3)) {
return {};
}
// build a short name, like
SGGeod g;
const bool defaultToLonLat = true; // parseStringAsGeod would otherwise default to lat,lon
if (!simgear::strutils::parseStringAsGeod(pieces[0], &g, defaultToLonLat)) {
return {};
}
if (pieces.size() == 3) {
// process offset
const double bearing = std::stod(pieces[1]);
const double distanceNm = std::stod(pieces[2]);
g = SGGeodesy::direct(g, bearing, distanceNm * SG_NM_TO_METER);
}
// build a short name
const int lonDeg = static_cast<int>(g.getLongitudeDeg());
const int latDeg = static_cast<int>(g.getLatitudeDeg());