Skip to content

Commit

Permalink
Corrected wrong departure position for saved LNMPLN and FSX/P3D PLN f…
Browse files Browse the repository at this point in the history 
…light plans. Now uses position from parking, helipad or runway/start for PLN `DepartureLLA` and LNMPLN `Start` element.

#608
  • Loading branch information
@albar965
albar965 committed Jan 30, 2021
1 parent 2154ab1 commit dad05d3
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 100 deletions.
17 changes: 11 additions & 6 deletions CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ For example: #3 is https://github.com/albar965/littlenavmap/issues/3.

===============================================================================

# Version 2.6.7 hotfix
# Version 2.6.8

Note that the hotfix has the same version number but a different revision.

* Fixed flight plan export for FSX and MSFS which used the wrong coordinates for
destination confusing third party programs.
* Fixed crash on startup which can appear with Mercator projection zoomed far out.
* Fixed procedure display issues for turn bow after circular legs.
Example LGSR VOR-B FD324 transition BINKI.
Example: LGSR VOR-B transition BINKI.
* Corrections to X-Plane FMS export. Using DEP and DES keywords now instead of truncating ident.
This allows to reload the plan in *Little Navmap*.
* Added verbose logging option for X-Plane compiler based on navdatareader.cfg.
Added warnings if rows are not written to the database.
* Fixed flight plan export for FSX and MSFS which used the wrong coordinates for
destination element `DestinationLLA` in flight plan. This confused third party programs.
* Corrected wrong departure position for saved LNMPLN and FSX/P3D PLN flight plans. Now uses
position from parking, helipad or runway/start for PLN `DepartureLLA` and LNMPLN `Start` element.
albar965/littlenavmap#608

===============================================================================

Expand Down
23 changes: 23 additions & 0 deletions src/route/route.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1364,11 +1364,34 @@ void Route::updateDepartureAndDestination()
flightplan.setDepartureName(departure.getName());
flightplan.setDeparturePosition(departure.getPosition());

if(hasDepartureParking())
{
// Get position from parking spot
flightplan.setDepartureParkingName(map::parkingNameForFlightplan(departure.getDepartureParking()));
flightplan.setDepartureParkingPosition(departure.getDepartureParking().position,
departure.getPosition().getAltitude());
}
else if(hasDepartureStart())
{
// Get position from start
flightplan.setDepartureParkingName(departure.getDepartureStart().runwayName);
flightplan.setDepartureParkingPosition(departure.getDepartureStart().position,
departure.getPosition().getAltitude());
}
else
{
// No start position and no parking - use airport/navaid position
flightplan.setDepartureParkingName(QString());
flightplan.setDepartureParkingPosition(departure.getPosition());
}

const RouteLeg& destination = getDestinationAirportLeg();
flightplan.setDestinationIdent(destination.getIdent());
flightplan.setDestinationName(destination.getName());
flightplan.setDestinationPosition(destination.getPosition());
}
else
flightplan.clear();
}

void Route::updateAll()
Expand Down
123 changes: 33 additions & 90 deletions src/route/routecontroller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,7 @@ bool RouteController::insertFlightplan(const QString& filename, int insertBefore
qDebug() << Q_FUNC_INFO << filename << insertBefore;

Flightplan flightplan;
pln::Flightplan& routePlan = route.getFlightplan();
try
{
// Will throw an exception if something goes wrong
Expand Down Expand Up @@ -1180,21 +1181,21 @@ bool RouteController::insertFlightplan(const QString& filename, int insertBefore

// Append flight plan to current flightplan object - route is updated later
for(const FlightplanEntry& entry : flightplan.getEntries())
route.getFlightplan().getEntries().append(entry);
routePlan.getEntries().append(entry);

// Appended after destination airport
route.getFlightplan().setDestinationName(flightplan.getDestinationName());
route.getFlightplan().setDestinationIdent(flightplan.getDestinationIdent());
route.getFlightplan().setDestinationPosition(flightplan.getDestinationPosition());
routePlan.setDestinationName(flightplan.getDestinationName());
routePlan.setDestinationIdent(flightplan.getDestinationIdent());
routePlan.setDestinationPosition(flightplan.getDestinationPosition());

// Copy any STAR and arrival procedure properties from the loaded plan
atools::fs::pln::copyArrivalProcedureProperties(route.getFlightplan().getProperties(),
atools::fs::pln::copyArrivalProcedureProperties(routePlan.getProperties(),
flightplan.getProperties());
atools::fs::pln::copyStarProcedureProperties(route.getFlightplan().getProperties(),
atools::fs::pln::copyStarProcedureProperties(routePlan.getProperties(),
flightplan.getProperties());

// Load alternates from appended plan if any
atools::fs::pln::copyAlternateProperties(route.getFlightplan().getProperties(),
atools::fs::pln::copyAlternateProperties(routePlan.getProperties(),
flightplan.getProperties());
}
else
Expand All @@ -1209,13 +1210,15 @@ bool RouteController::insertFlightplan(const QString& filename, int insertBefore
route.removeProcedureLegs(proc::PROCEDURE_DEPARTURE);

// Added before departure airport
route.getFlightplan().setDepartureName(flightplan.getDepartureName());
route.getFlightplan().setDepartureIdent(flightplan.getDepartureIdent());
route.getFlightplan().setDeparturePosition(flightplan.getDeparturePosition(),
flightplan.getEntries().first().getPosition().getAltitude());
routePlan.setDepartureName(flightplan.getDepartureName());
routePlan.setDepartureIdent(flightplan.getDepartureIdent());
routePlan.setDeparturePosition(flightplan.getDeparturePosition(),
flightplan.getEntries().first().getPosition().getAltitude());
routePlan.setDepartureParkingPosition(flightplan.getDepartureParkingPosition());
routePlan.setDepartureParkingName(flightplan.getDepartureParkingName());

// Copy SID properties from source
atools::fs::pln::copySidProcedureProperties(route.getFlightplan().getProperties(),
atools::fs::pln::copySidProcedureProperties(routePlan.getProperties(),
flightplan.getProperties());

route.eraseAirway(1);
Expand Down Expand Up @@ -1247,11 +1250,11 @@ bool RouteController::insertFlightplan(const QString& filename, int insertBefore

// Copy new legs to the flightplan object only - update route later
for(auto it = flightplan.getEntries().rbegin(); it != flightplan.getEntries().rend(); ++it)
route.getFlightplan().getEntries().insert(insertBefore, *it);
routePlan.getEntries().insert(insertBefore, *it);
}

// Clear procedure legs from the flightplan object
route.getFlightplan().removeNoSaveEntries();
routePlan.removeNoSaveEntries();

// Clear procedure structures
route.clearProcedures(proc::PROCEDURE_ALL);
Expand Down Expand Up @@ -1844,6 +1847,7 @@ void RouteController::reverseRoute()

// Overwrite parking position with airport position
flightplan.setDeparturePosition(entries.first().getPosition());
flightplan.setDepartureParkingPosition(entries.first().getPosition());
flightplan.setDepartureParkingName(QString());

// Erase all airways to avoid wrong direction travel against one way
Expand Down Expand Up @@ -2847,7 +2851,7 @@ void RouteController::moveSelectedLegsInternal(MoveDirection direction)
// Force update of start if departure airport was moved
updateStartPositionBestRunway(forceDeparturePosition, false /* undo */);

routeToFlightPlan();
route.updateDepartureAndDestination();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();

Expand Down Expand Up @@ -2937,7 +2941,7 @@ void RouteController::deleteSelectedLegsInternal(const QList<int>& rows)
// Force update of start if departure airport was removed
updateStartPositionBestRunway(rows.contains(0) /* force */, false /* undo */);

routeToFlightPlan();
route.updateDepartureAndDestination();

// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();
Expand Down Expand Up @@ -3042,15 +3046,15 @@ void RouteController::routeSetParking(const map::MapParking& parking)

// Update the current airport which is new or the same as the one used by the parking spot
route.getFlightplan().setDepartureParkingName(map::parkingNameForFlightplan(parking));
route.getFlightplan().setDeparturePosition(parking.position,
route.getDepartureAirportLeg().getPosition().getAltitude());
route.getFlightplan().setDepartureParkingPosition(parking.position,
route.getDepartureAirportLeg().getPosition().getAltitude());
route.setDepartureParking(parking);

route.updateAll();
route.updateAirwaysAndAltitude(false /* adjustRouteAltitude */);
route.updateLegAltitudes();

routeToFlightPlan();
route.updateDepartureAndDestination();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();
updateTableModel();
Expand Down Expand Up @@ -3087,15 +3091,15 @@ void RouteController::routeSetStartPosition(map::MapStart start)
// Use helipad number or runway name
route.getFlightplan().setDepartureParkingName(start.runwayName);

route.getFlightplan().setDeparturePosition(start.position,
route.getDepartureAirportLeg().getPosition().getAltitude());
route.getFlightplan().setDepartureParkingPosition(start.position,
route.getDepartureAirportLeg().getPosition().getAltitude());
route.setDepartureStart(start);

route.updateAll();
route.updateAirwaysAndAltitude(false /* adjustRouteAltitude */);
route.updateLegAltitudes();
route.updateDepartureAndDestination();

routeToFlightPlan();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();
updateTableModel();
Expand All @@ -3122,8 +3126,8 @@ void RouteController::routeSetDeparture(map::MapAirport airport)
route.updateAll();
route.updateAirwaysAndAltitude(false /* adjustRouteAltitude */);
route.updateLegAltitudes();
route.updateDepartureAndDestination();

routeToFlightPlan();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();

Expand Down Expand Up @@ -3190,8 +3194,8 @@ void RouteController::routeSetDestination(map::MapAirport airport)
route.updateAll();
route.updateAirwaysAndAltitude(false /* adjustRouteAltitude */);
route.updateLegAltitudes();
route.updateDepartureAndDestination();

routeToFlightPlan();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();

Expand Down Expand Up @@ -3229,8 +3233,8 @@ void RouteController::routeAddAlternate(map::MapAirport airport)
route.updateAll();
route.updateAirwaysAndAltitude(false /* adjustRouteAltitude */);
route.updateLegAltitudes();
route.updateDepartureAndDestination();

routeToFlightPlan();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();

Expand Down Expand Up @@ -3417,8 +3421,7 @@ void RouteController::routeAddProcedure(proc::MapProcedureLegs legs, const QStri
route.updateAll();
route.updateAirwaysAndAltitude(false /* adjustRouteAltitude */);
route.updateLegAltitudes();

routeToFlightPlan();
route.updateDepartureAndDestination();

// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();
Expand Down Expand Up @@ -3486,7 +3489,7 @@ void RouteController::routeAdd(int id, atools::geo::Pos userPos, map::MapTypes t

// Force update of start if departure airport was added
updateStartPositionBestRunway(false /* force */, false /* undo */);
routeToFlightPlan();
route.updateDepartureAndDestination();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();

Expand Down Expand Up @@ -3561,7 +3564,7 @@ void RouteController::routeReplace(int id, atools::geo::Pos userPos, map::MapTyp
// Force update of start if departure airport was changed
updateStartPositionBestRunway(legIndex == 0 /* force */, false /* undo */);

routeToFlightPlan();
route.updateDepartureAndDestination();
// Get type and cruise altitude from widgets
updateFlightplanFromWidgets();

Expand Down Expand Up @@ -3638,66 +3641,6 @@ void RouteController::updateFlightplanEntryAirway(int airwayId, FlightplanEntry&
entry.setFlag(atools::fs::pln::entry::TRACK, airway.isTrack());
}

/* Copy all data from route map objects and widgets to the flight plan */
void RouteController::routeToFlightPlan()
{
Flightplan& flightplan = route.getFlightplan();

if(route.isEmpty())
flightplan.clear();
else
{
QString departureIcao, destinationIcao;

const RouteLeg& firstLeg = route.getDepartureAirportLeg();
if(firstLeg.getMapObjectType() == map::AIRPORT)
{
departureIcao = firstLeg.getAirport().ident;
flightplan.setDepartureName(firstLeg.getAirport().name);
flightplan.setDepartureIdent(departureIcao);

if(route.hasDepartureParking())
{
flightplan.setDepartureParkingName(map::parkingNameForFlightplan(firstLeg.getDepartureParking()));
flightplan.setDeparturePosition(firstLeg.getDepartureParking().position, firstLeg.getPosition().getAltitude());
}
else if(route.hasDepartureStart())
{
// Use runway name or helipad number
flightplan.setDepartureParkingName(firstLeg.getDepartureStart().runwayName);
flightplan.setDeparturePosition(firstLeg.getDepartureStart().position, firstLeg.getPosition().getAltitude());
}
else
// No start position and no parking - use airport/navaid position
flightplan.setDeparturePosition(firstLeg.getPosition());
}
else
{
// Invalid departure
flightplan.setDepartureName(QString());
flightplan.setDepartureIdent(QString());
flightplan.setDepartureParkingName(QString());
flightplan.setDeparturePosition(Pos(), 0.f);
}

const RouteLeg& lastLeg = route.getDestinationAirportLeg();
if(lastLeg.getMapObjectType() == map::AIRPORT)
{
destinationIcao = lastLeg.getAirport().ident;
flightplan.setDestinationName(lastLeg.getAirport().name);
flightplan.setDestinationIdent(destinationIcao);
flightplan.setDestinationPosition(lastLeg.getPosition());
}
else
{
// Invalid destination
flightplan.setDestinationName(QString());
flightplan.setDestinationIdent(QString());
flightplan.setDestinationPosition(Pos());
}
}
}

/* Copy type and cruise altitude from widgets to flight plan */
void RouteController::updateFlightplanFromWidgets()
{
Expand Down Expand Up @@ -4754,7 +4697,7 @@ bool RouteController::updateStartPositionBestRunway(bool force, bool undo)
undoCommand = preChange(tr("Set Start Position"));

route.setDepartureStart(start);
routeToFlightPlan();
route.updateDepartureAndDestination();

if(undo)
postChange(undoCommand);
Expand Down
2 changes: 0 additions & 2 deletions src/route/routecontroller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,6 @@ class RouteController :

void updateMoveAndDeleteActions();

void routeToFlightPlan();

void routeSetDepartureInternal(const map::MapAirport& airport);
void routeSetDestinationInternal(const map::MapAirport& airport);

Expand Down
5 changes: 3 additions & 2 deletions src/route/routeleg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ void RouteLeg::createFromDatabaseByEntry(int entryIndex, const RouteLeg *prevLeg

// Get nearest with the same name
QList<map::MapParking> parkings;
airportQuery->getParkingByName(parkings, airport.id, name, flightplan->getDeparturePosition());
airportQuery->getParkingByName(parkings, airport.id, name, flightplan->getDepartureParkingPosition());

if(parkings.isEmpty())
{
Expand Down Expand Up @@ -921,7 +921,8 @@ void RouteLeg::assignNdb(const map::MapResult& mapobjectResult, atools::fs::pln:

void RouteLeg::assignRunwayOrHelipad(const QString& name)
{
NavApp::getAirportQuerySim()->getStartByNameAndPos(start, airport.id, name, flightplan->getDeparturePosition());
NavApp::getAirportQuerySim()->getStartByNameAndPos(start, airport.id, name,
flightplan->getDepartureParkingPosition());

if(!start.isValid())
{
Expand Down
2 changes: 2 additions & 0 deletions src/routestring/routestringreader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ bool RouteStringReader::createRouteFromString(const QString& routeString, rs::Ro
fp->setDepartureName(entries.first().getIdent());
fp->setDepartureIdent(entries.first().getIdent());
fp->setDeparturePosition(entries.first().getPosition());
fp->setDepartureParkingPosition(entries.first().getPosition());

fp->setDestinationName(entries.last().getIdent());
fp->setDestinationIdent(entries.last().getIdent());
Expand Down Expand Up @@ -559,6 +560,7 @@ bool RouteStringReader::addDeparture(atools::fs::pln::Flightplan *flightplan, ma
flightplan->setDepartureName(departure.name);
flightplan->setDepartureIdent(departure.ident);
flightplan->setDeparturePosition(departure.position);
flightplan->setDepartureParkingPosition(departure.position);

FlightplanEntry entry;
entryBuilder->buildFlightplanEntry(departure, entry, false /* alternate */);
Expand Down

0 comments on commit dad05d3

Please sign in to comment.