Release commit created with Cranko.

+++ cranko-release-info-v1 [[projects]] qnames = ["WWTCoreUWP", "csproj"] version = "6.0.2.0" age = 9 [[projects]] qnames = ["OculusWrap", "csproj"] version = "2.3.5.0" age = 10 [[projects]] qnames = ["MakeDataCabinetFile", "csproj"] version = "1.0.1.0" age = 9 [[projects]] qnames = ["WWTCore", "csproj"] version = "6.0.14.0" age = 9 [[projects]] qnames = ["WWTExplorer", "csproj"] version = "6.0.908.0" age = 0 [[projects]] qnames = ["UwpRenderEngine", "csproj"] version = "6.0.2.0" age = 9 [[projects]] qnames = ["WWTHolographic", "csproj"] version = "6.0.2.0" age = 9 [[projects]] qnames = ["WorldWideTelescope", "csproj"] version = "6.0.2.0" age = 9 +++
WorldWideTelescope · Feb 11, 2022 · 4f28900 · 4f28900
2 parents 70e1b3c + 3d11f4e
commit 4f28900
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 19 deletions.
diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj
@@ -1976,15 +1976,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:AAS WorldWide Telescope"
-        "ProductCode" = "8:{7006ED16-770F-42C7-B630-BA74C6C67451}"
-        "PackageCode" = "8:{7006ED16-770F-42C7-B630-BA74C6C67451}"
+        "ProductCode" = "8:{CEF6217A-4831-400B-A6F3-3371BC4B13A2}"
+        "PackageCode" = "8:{CEF6217A-4831-400B-A6F3-3371BC4B13A2}"
         "UpgradeCode" = "8:{543D9051-C7F5-4C6B-BEA5-6CA148C8487F}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:6.0.907"
+        "ProductVersion" = "8:6.0.908"
         "Manufacturer" = "8:American Astronomical Society"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/WWTExplorer3d/3dWindow.cs b/WWTExplorer3d/3dWindow.cs
@@ -1180,6 +1180,11 @@ public Earth3d()
                 {
                 }
             }
+
+            // On HiDPI displays, jagged lines can appear when the client starts up,
+            // but disappear on a window resize.
+            // So, to avoid this, we explicitly call OnResize here
+            OnResize(EventArgs.Empty);
         }
 
         public static void BackgroundInit()

diff --git a/WWTExplorer3d/CHANGELOG.md b/WWTExplorer3d/CHANGELOG.md
@@ -1,3 +1,35 @@
+# WWTExplorer 6.0.908.0 (2022-02-11)
+
+We expect this to be the final beta release before 6.1.
+
+### Code changes
+
+- Update the built-in default WMS server URL to NASA's GIBS:
+  `https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi` (#206, @pkgw,
+  @astrodavid10)
+- Add a query-string `?client=wwt6windows` to the end of HiPS tile URL requests,
+  to enable HiPS providers to do some analytics on their traffic (#206, @pkgw).
+  Considering just the Windows client, it would be nicer to change the
+  User-Agent header, but the web clients won't be able to do that. This approach
+  should allow us to be consistent across platforms.
+- When a reference frame's mean radius is changed in the UI, mark all of that
+  frame's layers as dirty, so that altitudes to properly recomputed (#205,
+  @Carifio24).
+- Add an explicit call to OnResize on app startup, as a workaround to remove
+  jagged lines in some HiDPI display setups (#204, @Carifio24).
+
+### Data updates
+
+This release updates the built-in data bundle to version 2022-02-15. We expect
+this to be the final data update before 6.1.
+
+- Remove some Crab studies with bad astrometry
+- Add a bunch of updated planet maps
+- Add the Curiosity rover Navarro Mountain panorama
+- Annotate that our built-in SDSS is DR7, and built-in DSS is based on DSS2
+- Update informational URLs for hundreds of Spitzer images
+
+
 # WWTExplorer 6.0.907.0 (2022-01-24)
 
 - Update the built-in data bundle to version 2022-01-20, deploying the WWT2022

diff --git a/WWTExplorer3d/FrameWizardMain.cs b/WWTExplorer3d/FrameWizardMain.cs
@@ -41,6 +41,7 @@ public override bool Save()
         {
             bool failed = false;
 
+            double initialMeanRadius = frame.MeanRadius;
             frame.MeanRadius = ParseAndValidateDouble(MeanRadius, frame.MeanRadius, ref failed);
             frame.Oblateness = ParseAndValidateDouble(Oblateness, frame.Oblateness, ref failed);
             frame.Scale = ParseAndValidateDouble(Scale, frame.Scale, ref failed);
@@ -52,6 +53,18 @@ public override bool Save()
 
             frame.ShowAsPoint = ShowAsPoint.Checked;
             frame.ShowOrbitPath = ShowOrbitPath.Checked;
+
+            // If the mean radius changes, mark each of the frame's layers as dirty so that it is re-drawn
+            bool radiusChanged = initialMeanRadius != frame.MeanRadius;
+            if (radiusChanged && LayerManager.AllMaps.ContainsKey(frame.name))
+            {
+                LayerMap map = LayerManager.AllMaps[frame.name];
+                foreach (Layer layer in map.Layers)
+                {
+                    layer.CleanUp();
+                }
+            }
+
             return !failed;
         }
 

diff --git a/WWTExplorer3d/Healpix/HealpixTile.cs b/WWTExplorer3d/Healpix/HealpixTile.cs
@@ -320,7 +320,7 @@ private void createGeometry()
         static bool galMatInit = false;
         static Matrix3d galacticMatrix = Matrix3d.Identity;
 
-        public string GetDirectory(IImageSet dataset, int level, int x, int y)
+        public new string GetDirectory(IImageSet dataset, int level, int x, int y)
         {
             StringBuilder sb = new StringBuilder();
 
@@ -345,7 +345,7 @@ public string GetDirectory(IImageSet dataset, int level, int x, int y)
 
         public string GetFilename()
         {
-            string extention = GetHipsFileExtention();
+            string extention = GetHipsFileExtension();
 
             StringBuilder sb = new StringBuilder();
             sb.Append(Properties.Settings.Default.CahceDirectory);
@@ -439,10 +439,9 @@ public static void GenerateLevel2(string filename)
             }
         }
 
-        public string GetUrl(IImageSet dataset, int level, int x, int y)
+        public new string GetUrl(IImageSet dataset, int level, int x, int y)
         {
-            string returnUrl = "";
-            string extention = GetHipsFileExtention();
+            string extension = GetHipsFileExtension();
 
             int tileTextureIndex = -1;
             if (level == 0)
@@ -453,6 +452,7 @@ public string GetUrl(IImageSet dataset, int level, int x, int y)
             {
                 tileTextureIndex = this.face * nside * nside / 4 + this.tileIndex;
             }
+
             StringBuilder sb = new StringBuilder();
 
             int subDirIndex = tileTextureIndex / 10000;
@@ -467,12 +467,18 @@ public string GetUrl(IImageSet dataset, int level, int x, int y)
                 sb.Append("0");
             }
 
-            returnUrl = string.Format(dataset.Url, level.ToString(), sb.ToString(), tileTextureIndex.ToString() + extention);
-
-            return returnUrl;
+            // Add a query string component to help the HiPS services do analytics on their traffic.
+            // Here on Windows we could use a user-agent, but that isn't an option for the web-based
+            // client(s), and it'll keep things simpler to use the same mechanism across platforms.
+            return string.Format(
+                dataset.Url,
+                level.ToString(),
+                sb.ToString(),
+                tileTextureIndex.ToString() + extension + "?client=wwt6windows"
+            );
         }
 
-        private string GetHipsFileExtention()
+        private string GetHipsFileExtension()
         {
             // The extension will contain either a list of type or a single type
             // The imageset can be set to the perfrered file type if desired IE: FITS will never be chosen if others are avaialbe,

diff --git a/WWTExplorer3d/Properties/AssemblyInfo.cs b/WWTExplorer3d/Properties/AssemblyInfo.cs
@@ -30,8 +30,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("6.0.907.0")]
-[assembly: AssemblyFileVersion("6.0.907.0")]
+[assembly: AssemblyVersion("6.0.908.0")]
+[assembly: AssemblyFileVersion("6.0.908.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 [assembly: System.Windows.Media.DisableDpiAwareness]
 
diff --git a/WWTExplorer3d/WmsLayer.cs b/WWTExplorer3d/WmsLayer.cs
@@ -227,7 +227,7 @@ public TimeSpan TimeStep
             }
         }
 
-        string serviceUrl = "http://svs.gsfc.nasa.gov/cgi-bin/wms?";
+        string serviceUrl = "https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi?";
 
         [LayerProperty]
         public string ServiceUrl

diff --git a/WWTExplorer3d/WmsLayerWizard.Designer.cs b/WWTExplorer3d/WmsLayerWizard.Designer.cs
diff --git a/WWTExplorer3d/WmsLayerWizard.resx b/WWTExplorer3d/WmsLayerWizard.resx
@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>