vatger/aman-es
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check if the PTA exists

Browse Source
This commit is contained in:
Sven Czarnian
2021-12-19 13:06:19 +01:00
parent c3a75bb900
commit 2795011021
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/PlugIn.cpp
View File

@@ -558,10 +558,16 @@ void PlugIn::OnGetTagItem(EuroScopePlugIn::CFlightPlan flightPlan, EuroScopePlug
} }
case TagItemElement::PlannedTimeOfArrival: case TagItemElement::PlannedTimeOfArrival:
{ {
if (this->m_inbounds.cend() != it) if (this->m_inbounds.cend() != it) {
message = UtcTime::timeToString(it->second.pta(), "%H:%M"); const auto pta = it->second.pta();
else if (true == forced || true == planExpected) if (UtcTime::Point() == pta)
message = "??:??";
else
message = UtcTime::timeToString(it->second.pta(), "%H:%M");
}
else if (true == forced || true == planExpected) {
message = "??:??"; message = "??:??";
}
break; break;
} }
case TagItemElement::DeltaTime: case TagItemElement::DeltaTime:

2
src/types/Inbound.cpp
View File

@@ -420,6 +420,8 @@ UtcTime::Point Inbound::eta() const {
} }
UtcTime::Point Inbound::pta() const { UtcTime::Point Inbound::pta() const {
if (this->m_nextStarWaypoint >= this->m_arrivalRoute.size())
return UtcTime::Point();
return gsl::at(this->m_arrivalRoute, this->m_nextStarWaypoint).plannedArrivalTime(); return gsl::at(this->m_arrivalRoute, this->m_nextStarWaypoint).plannedArrivalTime();
} }