Map window saved/restored, map resolution now correct after startup

Author: sweiland-openrails

Source/RunActivity/Viewer3D/Map/MapForm.cs

@@ -140,9 +140,9 @@ public MapViewer(Simulator simulator, Viewer viewer)
             MapThemeProvider = new MapThemeProvider();
             nodes = simulator.TDB.TrackDB.TrackNodes;
 
+            ViewWindow = new RectangleF(0, 0, 5000f, 5000f);
             InitializeForm();
 
-            ViewWindow = new RectangleF(0, 0, 5000f, 5000f);
             mapResolutionUpDown.Accelerations.Add(new NumericUpDownAcceleration(1, 100));
             selectedTrainList = new List<Train>();
 

Source/RunActivity/Viewer3D/Processes/GameStateViewer3D.cs

@@ -53,7 +53,6 @@ internal override void BeginRender(RenderFrame frame)
                 // We must create these forms on the main thread (Render) or they won't pump events correctly.
                 Program.MapForm = new MapViewer(Viewer.Simulator, Viewer);
                 Program.MapForm.Hide();
-                Viewer.MapViewerEnabled = false;
 
                 Program.SoundDebugForm = new SoundDebugForm(Viewer);
                 Program.SoundDebugForm.Hide();

Source/RunActivity/Viewer3D/Viewer.cs

@@ -191,7 +191,7 @@ void CameraActivate()
         public Vector3 NearPoint { get; private set; }
         public Vector3 FarPoint { get; private set; }
 
-        public bool MapViewerEnabled { get; set; }
+        public bool MapViewerEnabled { get; set; } = false;
         public bool SoundDebugFormEnabled { get; set; }
 
         public TRPFile TRP; // Track profile file
@@ -375,6 +375,7 @@ public void Save(BinaryWriter outf, string fileStem)
             outf.Write(Simulator.Trains.IndexOf(SelectedTrain));
 
             WindowManager.Save(outf);
+            outf.Write(MapViewerEnabled);
 
             outf.Write(WellKnownCameras.IndexOf(Camera));
             foreach (var camera in WellKnownCameras)
@@ -419,6 +420,7 @@ public void Restore(BinaryReader inf)
             }
 
             WindowManager.Restore(inf);
+            MapViewerEnabled = inf.ReadBoolean();
 
             var cameraToRestore = inf.ReadInt32();
             foreach (var camera in WellKnownCameras)