changed how distance to ad is determined, changed references

maxrumsey · Apr 20, 2024 · 7886483 · 7886483
1 parent 5938248
commit 7886483
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/OzStripsGUI/OzStripsGUI.csproj b/OzStripsGUI/OzStripsGUI.csproj
@@ -35,6 +35,9 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>ozstrips.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\ozstrips\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>

diff --git a/OzStripsGUI/StripController.cs b/OzStripsGUI/StripController.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using vatsys;
@@ -266,12 +267,24 @@ public StripArrDepType ArrDepType
 
         public double GetDistToAerodrome(String aerodrome)
         {
-            Coordinate coord = Airspace2.GetAirport(aerodrome)?.LatLong;
             try
             {
-                if (coord != null)
+                Coordinate adCoord = Airspace2.GetAirport(aerodrome)?.LatLong;
+                Coordinate planeCoord = fdr.PredictedPosition.Location;
+                List<RDP.RadarTrack> RadarTracks = (from radarTrack in RDP.RadarTracks
+                                                   where radarTrack.ActualAircraft.Callsign == fdr.Callsign
+                                                   select radarTrack).ToList();
+
+                if (RadarTracks.Count > 0)
+                {
+                    foreach (RDP.RadarTrack rTrack in RadarTracks)
+                    {
+                        planeCoord = rTrack.ActualAircraft.Position;
+                    }
+                }
+                if (adCoord != null)
                 {
-                    double distance = Conversions.CalculateDistance(coord, fdr.PredictedPosition.Location);
+                    double distance = Conversions.CalculateDistance(adCoord, planeCoord);
                     return distance;
                 }
             }

diff --git a/ozstrips/ozstrips.csproj b/ozstrips/ozstrips.csproj
@@ -52,8 +52,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="vatSys">
-      <HintPath>..\..\..\..\Program Files (x86)\vatSys\bin\vatSys.exe</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\..\Program Files (x86)\vatSys\bin\vatSys.exe</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>