Merge pull request #54 from #53-map-update-performance

Agent#53 map update performance
opensky-to · Feb 13, 2022 · 10755c6 · 10755c6
2 parents ebfc2e2 + 37330d6
commit 10755c6
Show file tree

Hide file tree

Showing 9 changed files with 254 additions and 89 deletions.
diff --git a/OpenSky.Agent.Simulator/Simulator.cs b/OpenSky.Agent.Simulator/Simulator.cs
@@ -99,6 +99,17 @@ public abstract partial class Simulator : INotifyPropertyChanged
         /// -------------------------------------------------------------------------------------------------
         protected Simulator(OpenSkyService openSkyServiceInstance)
         {
+            Debug.WriteLine($"Simulator interface of type {this.GetType().Name} starting...");
+
+            // Initialize empty data structures, to prevent NullReferenceExceptions
+            this.PrimaryTracking = new PrimaryTracking();
+            this.SecondaryTracking = new SecondaryTracking();
+            this.FuelTanks = new FuelTanks();
+            this.PayloadStations = new PayloadStations();
+            this.AircraftIdentity = new AircraftIdentity();
+            this.WeightAndBalance = new WeightAndBalance();
+
+            // Create queues and collections
             this.openSkyServiceInstance = openSkyServiceInstance;
             this.primaryTrackingProcessingQueue = new ConcurrentQueue<ProcessPrimaryTracking>();
             this.secondaryTrackingProcessingQueue = new ConcurrentQueue<ProcessSecondaryTracking>();
@@ -233,6 +244,7 @@ protected set
         /// -------------------------------------------------------------------------------------------------
         public static void SetSimulatorInstance(Simulator simulator)
         {
+            Instance?.Close();
             Instance = simulator;
         }
 
@@ -246,7 +258,7 @@ public static void SetSimulatorInstance(Simulator simulator)
         /// -------------------------------------------------------------------------------------------------
         public void Close()
         {
-            Debug.WriteLine("SimConnect simulator interface closing down...");
+            Debug.WriteLine($"Simulator interface of type {this.GetType().Name} closing down...");
             if (this.TrackingStatus is TrackingStatus.GroundOperations or TrackingStatus.Tracking)
             {
                 this.StopTracking(false);

diff --git a/OpenSky.Agent.UdpXPlane11/UdpXPlane11.cs b/OpenSky.Agent.UdpXPlane11/UdpXPlane11.cs
@@ -77,14 +77,6 @@ public UdpXPlane11(string simulatorIPAddress, uint simulatorPort, OpenSkyService
             this.simulatorIPAddress = simulatorIPAddress;
             this.simulatorPort = simulatorPort;
 
-            // Initialize empty data structures, to prevent NullReferenceExceptions
-            this.PrimaryTracking = new PrimaryTracking();
-            this.SecondaryTracking = new SecondaryTracking();
-            this.FuelTanks = new FuelTanks();
-            this.PayloadStations = new PayloadStations();
-            this.AircraftIdentity = new AircraftIdentity();
-            this.WeightAndBalance = new WeightAndBalance();
-
             // Start our worker thread
             new Thread(this.ReadFromXPlane) { Name = "UdpXPlane11.ReadFromXPlane" }.Start();
         }

diff --git a/OpenSky.Agent/Properties/Settings.Designer.cs b/OpenSky.Agent/Properties/Settings.Designer.cs
diff --git a/OpenSky.Agent/Properties/Settings.settings b/OpenSky.Agent/Properties/Settings.settings
@@ -56,5 +56,14 @@
     <Setting Name="XPlanePort" Type="System.UInt32" Scope="User">
       <Value Profile="(Default)">49000</Value>
     </Setting>
+    <Setting Name="SimulatorHostName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">localhost</Value>
+    </Setting>
+    <Setting Name="SimulatorPort" Type="System.String" Scope="User">
+      <Value Profile="(Default)">500</Value>
+    </Setting>
+    <Setting Name="AircraftPositionUpdateInterval" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">500</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/OpenSky.Agent/Views/FlightTracking.xaml.cs b/OpenSky.Agent/Views/FlightTracking.xaml.cs
@@ -106,12 +106,12 @@ private void AddAircraftAndTrailsToMap()
             aircraftPosition.SetValue(Panel.ZIndexProperty, 999);
             aircraftPosition.SetValue(MapLayer.PositionOriginProperty, PositionOrigin.Center);
             var rotateTransform = new RotateTransform { CenterX = 20, CenterY = 20 };
-            var headingBinding = new Binding { Source = this.DataContext, Path = new PropertyPath("Simulator.PrimaryTracking.Heading"), Mode = BindingMode.OneWay };
+            var headingBinding = new Binding { Source = this.DataContext, Path = new PropertyPath("AircraftHeading"), Mode = BindingMode.OneWay };
             BindingOperations.SetBinding(rotateTransform, RotateTransform.AngleProperty, headingBinding);
             aircraftPosition.RenderTransform = rotateTransform;
             var aircraftDrawingImage = this.FindResource("OpenSkyLogoPointingUpForMap") as DrawingImage;
             aircraftPosition.Source = aircraftDrawingImage;
-            var positionBinding = new Binding { Source = this.DataContext, Path = new PropertyPath("Simulator.PrimaryTracking.MapLocation"), Mode = BindingMode.OneWay };
+            var positionBinding = new Binding { Source = this.DataContext, Path = new PropertyPath("AircraftLocation"), Mode = BindingMode.OneWay };
             BindingOperations.SetBinding(aircraftPosition, MapLayer.PositionProperty, positionBinding);
             this.MapView.Children.Add(aircraftPosition);
         }