Merge remote-tracking branch 'wwt/master' into pipelines-codesign

Discarded conflicting changes in `master`, which has not been touched for a
long time.

.gitignore

@@ -217,6 +217,7 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
 Setup1/datafiles.cabinet
 /.vs/WWTExplorer/v15/sqlite3/storage.ide
 /.vs

INSTALL.md

@@ -3,7 +3,7 @@
 Prerequisites
 -------------
 
-If you do not have Visual Studio 2015 installed, you may download the free Community Edition at http://www.visualstiudio.com
+If you do not have Visual Studio 2015 installed, you may download the free Community Edition at http://www.visualstudio.com
 
 To build the installer, you will also need the Visual Studio 2015 Installer Projects add-in found here:
 https://visualstudiogallery.msdn.microsoft.com/f1cc3f3e-c300-40a7-8797-c509fb8933b9

WWTExplorer3d/TourPlayer.cs

@@ -92,16 +92,14 @@ namespace TerraViewer
                         {
                             tour.CurrentTourStop.Target.UpdatePlanetLocation(SpaceTimeController.UtcToJulian(tour.CurrentTourStop.StartTime));
                             tour.CurrentTourStop.EndTarget.UpdatePlanetLocation(SpaceTimeController.UtcToJulian(tour.CurrentTourStop.EndTime));
-                        }
-
-
+                        }
+
+
                         renderEngine.Mover = new ViewMoverKenBurnsStyle(tour.CurrentTourStop.Target.CamParams, tour.CurrentTourStop.EndTarget.CamParams, tour.CurrentTourStop.Duration.TotalMilliseconds / 1000.0, tour.CurrentTourStop.StartTime, tour.CurrentTourStop.EndTime, tour.CurrentTourStop.InterpolationType);
 
                     }
 
-                    Settings.TourSettings = tour.CurrentTourStop;
-                    SpaceTimeController.Now = tour.CurrentTourStop.StartTime;
-                    SpaceTimeController.SyncToClock = false;
+                    UpdateSettingsForTourstop();
                 }
             }
 
@@ -130,6 +128,20 @@ namespace TerraViewer
             }     
         }
 
+        private void UpdateSettingsForTourstop()
+        {
+            Settings.TourSettings = tour.CurrentTourStop;
+            SpaceTimeController.Now = tour.CurrentTourStop.StartTime;
+            SpaceTimeController.SyncToClock = false;
+            Settings ambient = Settings.Ambient as Settings;
+            if (ambient != null)
+            {
+                ambient.LocationAltitude = tour.CurrentTourStop.LocationAltitude;
+                ambient.LocationLat = tour.CurrentTourStop.LocationLat;
+                ambient.LocationLng = tour.CurrentTourStop.LocationLng;
+            }        
+        }
+
         TourDocument tour = null;
 
         public TourDocument Tour
@@ -274,9 +286,7 @@ namespace TerraViewer
 
                 slideStartTime = SpaceTimeController.MetaNow;
                 // Move to new settings
-                Settings.TourSettings = tour.CurrentTourStop;
-                SpaceTimeController.Now = tour.CurrentTourStop.StartTime;
-                SpaceTimeController.SyncToClock = false;
+                UpdateSettingsForTourstop();
 
 
             }
@@ -665,8 +675,8 @@ namespace TerraViewer
             {
 
                 if (tour.CurrentTourStop.Overlays[i].HitTest(location))
-                {
-                    // execute any action attributed to this overlay before going to url or link
+                {
+                    // execute any action attributed to this overlay before going to url or link
                     tour.CurrentTourStop.Overlays[i].ExecuteAction(tour.CurrentTourstopIndex);
 
                     if (!string.IsNullOrEmpty(tour.CurrentTourStop.Overlays[i].Url))

WWTExplorer3d/TourStop.cs

@@ -1099,7 +1099,7 @@ namespace TerraViewer
         {
             get
             {
-                if (hasTime)
+                if (hasLocation)
                 {
                     return locationAltitude;
                 }
@@ -1114,7 +1114,7 @@ namespace TerraViewer
         {
             get
             {
-                if (hasTime)
+                if (hasLocation)
                 {
                     return locationLat;
                 }
@@ -1129,7 +1129,7 @@ namespace TerraViewer
         {
             get
             {
-                if (hasTime)
+                if (hasLocation)
                 {
                     return locationLng;
                 }