Provide Navaids to GetExportText of FileExport

fixes JetStream96#14
rklomp · Aug 24, 2019 · f0a3bf9 · f0a3bf9
1 parent 9b80226
commit f0a3bf9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/src/QSP/RouteFinding/FileExport/FileExporter.cs b/src/QSP/RouteFinding/FileExport/FileExporter.cs
@@ -2,6 +2,7 @@
 using QSP.Common.Options;
 using QSP.LibraryExtension;
 using QSP.RouteFinding.Airports;
+using QSP.RouteFinding.Navaids;
 using QSP.RouteFinding.Routes;
 using QSP.Utilities;
 using System;
@@ -17,16 +18,19 @@ public class FileExporter
     {
         private readonly Route route;
         private readonly AirportManager airports;
+        private readonly MultiMap<string, Navaid> navaids;
         private readonly IEnumerable<ExportCommand> commands;
         private readonly Func<AppOptions> options;
 
         public FileExporter(
             Route route,
+            MultiMap<string, Navaid> navaids,
             AirportManager airports,
             IEnumerable<ExportCommand> commands,
             Func<AppOptions> options)
         {
             this.route = route;
+            this.navaids = navaids;
             this.airports = airports;
             this.commands = commands;
             this.options = options;
@@ -73,7 +77,7 @@ private Status Export(string nameBase, ExportCommand c, int i)
                     : fileName;
 
                 File.WriteAllText(newName,
-                    Providers.Types.GetExportText(c.ProviderType, route, airports));
+                    Providers.Types.GetExportText(c.ProviderType, route, navaids, airports));
                 return new Status(newName, true, "", false);
             }
             catch (Exception ex)

diff --git a/src/QSP/RouteFinding/FileExport/Providers/Types.cs b/src/QSP/RouteFinding/FileExport/Providers/Types.cs
@@ -2,6 +2,7 @@
 using QSP.LibraryExtension;
 using QSP.LibraryExtension.Sets;
 using QSP.RouteFinding.Airports;
+using QSP.RouteFinding.Navaids;
 using QSP.RouteFinding.Routes;
 using QSP.Utilities;
 using System;
@@ -201,11 +202,12 @@ public static string GetSimulatorPath(SimulatorType t)
         public static string GetExtension(ProviderType type) => Lookup[type].FileExtension;
 
         public static string GetExportText(ProviderType type, Route route,
-            AirportManager airports)
+            MultiMap<string, Navaid> navaids, AirportManager airports)
         {
             var input = new ExportInput()
             {
                 Route = route,
+                Navaids = navaids,
                 Airports = airports
             };
 

diff --git a/src/QSP/UI/Presenters/FuelPlan/Routes/ActionContextMenuHelper.cs b/src/QSP/UI/Presenters/FuelPlan/Routes/ActionContextMenuHelper.cs
@@ -13,6 +13,8 @@
 using System.Windows.Forms;
 using static QSP.UI.Views.Factories.FormFactory;
 using System;
+using QSP.LibraryExtension;
+using QSP.RouteFinding.Navaids;
 
 namespace QSP.UI.Presenters.FuelPlan.Routes
 {
@@ -33,6 +35,7 @@ public static void ShowMap(this ISupportActionContextMenu view, RouteGroup route
             IMessageDisplay view,
             RouteGroup Route,
             IEnumerable<ExportCommand> cmds,
+            MultiMap<string, Navaid> Navaids,
             AirportManager airportList,
             ExportMenu menu)
         {
@@ -46,6 +49,7 @@ public static void ShowMap(this ISupportActionContextMenu view, RouteGroup route
             {
                 menu.Location = new Point(0, 0);
                 menu.Route = Route;
+                menu.Navaids = Navaids;
                 menu.AirportList = airportList;
 
                 frm.AutoSizeMode = AutoSizeMode.GrowAndShrink;

diff --git a/src/QSP/UI/Presenters/FuelPlan/Routes/ActionContextMenuPresenter.cs b/src/QSP/UI/Presenters/FuelPlan/Routes/ActionContextMenuPresenter.cs
@@ -111,6 +111,7 @@ public void ExportRouteFiles()
                 view,
                 Route,
                 AppOptions.ExportCommands,
+                airwayNetwork.Navaids,
                 AirportList,
                 exportMenu);
         }

diff --git a/src/QSP/UI/Presenters/FuelPlan/Routes/RouteFinderPresenter.cs b/src/QSP/UI/Presenters/FuelPlan/Routes/RouteFinderPresenter.cs
@@ -184,9 +184,10 @@ public void ExportRouteFiles()
             Debug.Assert(view.IsAirportToAirport());
 
             var o = model.FuelPlanningModel.AppOption.Instance;
+            var navaids = model.FuelPlanningModel.AirwayNetwork.Navaids;
             var airportList = model.FuelPlanningModel.AirwayNetwork.AirportList;
             var cmds = o.ExportCommands;
-            ActionContextMenuHelper.ExportRouteFiles(view, Route, cmds, airportList, exportMenu);
+            ActionContextMenuHelper.ExportRouteFiles(view, Route, cmds, navaids, airportList, exportMenu);
         }
 
         public void AnalyzeRoute()

diff --git a/src/QSP/UI/UserControls/ExportMenu.cs b/src/QSP/UI/UserControls/ExportMenu.cs
@@ -2,6 +2,7 @@
 using QSP.LibraryExtension;
 using QSP.RouteFinding.Airports;
 using QSP.RouteFinding.FileExport;
+using QSP.RouteFinding.Navaids;
 using QSP.RouteFinding.Routes;
 using QSP.UI.Util;
 using QSP.UI.Views;
@@ -19,9 +20,10 @@ public partial class ExportMenu : UserControl, IMessageDisplay
         private Locator<AppOptions> appOption;
         private Action showOptions;
 
-        // These two properties are required for exporting the route.
+        // These three properties are required for exporting the route.
         public RouteGroup Route { get; set; }
         public AirportManager AirportList { get; set; }
+        public MultiMap<string, Navaid> Navaids { get; set; }
 
         public ExportMenu()
         {
@@ -57,7 +59,7 @@ private void ExportFiles(object sender, EventArgs e)
             var o = UpdatedOption();
             UpdateOption(o);
 
-            var writer = new FileExporter(Route.Expanded, AirportList, o.ExportCommands,
+            var writer = new FileExporter(Route.Expanded, Navaids, AirportList, o.ExportCommands,
                 () => appOption.Instance);
             IEnumerable<FileExporter.Status> reports = null;