From daf63de55fe7a0f8913aa246d9fec607ed3e6917 Mon Sep 17 00:00:00 2001
From: heurist1 <git@heurist.co.uk>
Date: Tue, 28 Feb 2023 23:00:51 +0000
Subject: [PATCH] Final corrections to make merged code compile, and reduce the
 adding and removing of other markers

---
 firmware/application/apps/ui_adsb_rx.cpp | 2 +-
 firmware/application/apps/ui_adsb_rx.hpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/firmware/application/apps/ui_adsb_rx.cpp b/firmware/application/apps/ui_adsb_rx.cpp
index c2b8669d..ca899ffc 100644
--- a/firmware/application/apps/ui_adsb_rx.cpp
+++ b/firmware/application/apps/ui_adsb_rx.cpp
@@ -488,7 +488,7 @@ void ADSBRxView::updateDetailsAndMap(int ageStep) {
 				details_view->update(entry);
 			}
 			// Store if the view is present and the list isn't full
-			else if (otherMarkersCanBeSent && (markerStored != MARKER_LIST_FULL) && (entry.age_state==0)) 
+			else if (otherMarkersCanBeSent && (markerStored != MARKER_LIST_FULL) && entry.pos.valid && (entry.age_state<=2)) 
 			{
 				marker.lon = entry.pos.longitude;
 				marker.lat = entry.pos.latitude;
diff --git a/firmware/application/apps/ui_adsb_rx.hpp b/firmware/application/apps/ui_adsb_rx.hpp
index 4764d7b9..b22d3930 100644
--- a/firmware/application/apps/ui_adsb_rx.hpp
+++ b/firmware/application/apps/ui_adsb_rx.hpp
@@ -272,6 +272,7 @@ public:
 
 	std::database::AirlinesDBRecord airline_record = {};
 	
+	GeoMapView* geomap_view { nullptr };
 private:
 	AircraftRecentEntry 		entry_copy { 0 };
 	std::function<void(void)> 	on_close_ { };