Removed need for imageset datatype "CatalogHips"

WorldWideTelescope · Mar 14, 2021 · 2e0a8a3 · 2e0a8a3
1 parent d2d58c1
commit 2e0a8a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/engine/wwtlib/HealpixTile.cs b/engine/wwtlib/HealpixTile.cs
@@ -77,7 +77,8 @@ public HealpixTile(int level, int x, int y, Imageset dataset, Tile parent)
                 this.faceY = parentTile.faceY * 2 + y;
             }
 
-            IsCatalogTile = dataset.DataSetType == ImageSetType.CatalogHips;
+            IsCatalogTile = dataset.HipsProperties.Properties.ContainsKey("dataproduct_type")
+                && dataset.HipsProperties.Properties["dataproduct_type"].ToLowerCase() == "catalog";
             // All healpix is inside out
             //insideOut = true;
             ComputeBoundingSphere();

diff --git a/engine/wwtlib/IImageSet.cs b/engine/wwtlib/IImageSet.cs
@@ -43,6 +43,6 @@ namespace wwtlib
     //}
 
     public enum ProjectionType { Mercator = 0, Equirectangular = 1, Tangent = 2, Tan = 2, Toast = 3, Spherical = 4, SkyImage = 5, Plotted = 6, Healpix = 7 };
-    public enum ImageSetType { Earth = 0, Planet = 1, Sky = 2, Panorama = 3, SolarSystem = 4, Sandbox = 5, CatalogHips = 6};
+    public enum ImageSetType { Earth = 0, Planet = 1, Sky = 2, Panorama = 3, SolarSystem = 4, Sandbox = 5};
     public enum BandPass { Gamma = 0, XRay = 1, Ultraviolet = 2, Visible = 3, HydrogenAlpha = 4, IR = 4, Microwave = 5, Radio = 6, VisibleNight = 6 };
 }