Added support for unavailable metar

Fixed landing report 0 index
opensky-to · Dec 13, 2023 · 361a8c2 · 361a8c2
1 parent 62f5379
commit 361a8c2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/OpenSky.Agent.Simulator/Simulator.Metar.cs b/OpenSky.Agent.Simulator/Simulator.Metar.cs
@@ -23,21 +23,21 @@ public partial class Simulator
         /// The alternate metar.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        private string alternateMetar = "???";
+        private string alternateMetar = "???\n";
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Destination metar.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        private string destinationMetar = "???";
+        private string destinationMetar = "???\n";
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The origin metar.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
-        private string originMetar = "???";
+        private string originMetar = "???\n";
 
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
@@ -122,10 +122,14 @@ public void RefreshMetar()
                             {
                                 var url = $"https://aviationweather.gov/api/data/metar?ids={this.Flight.Origin.Icao}";
                                 this.OriginMetar = client.DownloadString(url);
+                                if (string.IsNullOrEmpty(this.OriginMetar))
+                                {
+                                    this.OriginMetar = "Unavailable\n";
+                                }
                             }
                             else
                             {
-                                this.OriginMetar = "???";
+                                this.OriginMetar = "???\n";
                             }
                         }
                         catch (Exception ex)
@@ -140,10 +144,14 @@ public void RefreshMetar()
                             {
                                 var url = $"https://aviationweather.gov/api/data/metar?ids={this.Flight.Destination.Icao}";
                                 this.DestinationMetar = client.DownloadString(url);
+                                if (string.IsNullOrEmpty(this.DestinationMetar))
+                                {
+                                    this.DestinationMetar = "Unavailable\n";
+                                }
                             }
                             else
                             {
-                                this.DestinationMetar = "???";
+                                this.DestinationMetar = "???\n";
                             }
                         }
                         catch (Exception ex)
@@ -158,10 +166,14 @@ public void RefreshMetar()
                             {
                                 var url = $"https://aviationweather.gov/api/data/metar?ids={this.Flight.Alternate.Icao}";
                                 this.AlternateMetar = client.DownloadString(url);
+                                if (string.IsNullOrEmpty(this.AlternateMetar))
+                                {
+                                    this.AlternateMetar = "Unavailable\n";
+                                }
                             }
                             else
                             {
-                                this.AlternateMetar = "???";
+                                this.AlternateMetar = "???\n";
                             }
                         }
                         catch (Exception ex)

diff --git a/OpenSky.Agent.Simulator/Simulator.Process.cs b/OpenSky.Agent.Simulator/Simulator.Process.cs
@@ -379,7 +379,7 @@ private void ProcessPrimaryTracking()
                             }
 
                             // Are we close to landing?
-                            this.SampleRates[Requests.LandingAnalysis] = this.WasAirborne && ppt.New.RadioHeight < 500 ? 25 : 500;
+                            this.SampleRates[Requests.LandingAnalysis] = this.WasAirborne && ppt.New.RadioHeight < 200 ? 25 : 500;
                             this.OnPropertyChanged(nameof(this.SampleRates));
 
                             // Was the sim paused/un-paused?

diff --git a/OpenSky.Agent/Views/Models/LandingReportViewModel.cs b/OpenSky.Agent/Views/Models/LandingReportViewModel.cs
@@ -66,7 +66,7 @@ public LandingReportViewModel()
             this.FlightNumberHeader = $"Flight #{this.Simulator.Flight?.FullFlightNumber}\r\nLanding Report";
 
             // Fetch the initial already existing landing report(s)
-            if (this.Simulator.FinalTouchDownIndex > 0)
+            if (this.Simulator.FinalTouchDownIndex >= 0)
             {
                 for (var i = this.Simulator.FinalTouchDownIndex; i < this.Simulator.LandingReports.Count; i++)
                 {