Merge pull request #327 from johnarban/ralfs-requests

New updates for the radwave

radwave/src/Radwave.vue

@@ -42,7 +42,9 @@
         </div>
         <div id="splash-screen-text">
           <p>
-            Want to surf a <span style="color: red;">giant wave</span> in the Milky Way Galaxy? 
+            Want to surf a <span 
+            :style="{'color': accentColor}"
+            >giant wave</span> in the Milky Way Galaxy? 
             <!-- see the <span style="color: red;">Radcliffe Wave</span> <span class="color-span">oscillating</span> through our Galaxy? -->
           </p>
         </div>
@@ -75,8 +77,9 @@
           <v-btn
             v-if="!showSplashScreen"
             id="loading-button"
+            color="white"
             :disabled="isLoading"
-            :color="accentColor"
+            variant="outlined"
             @click="userNotReady = false"
             @keyup.enter="userNotReady = false"
             elevation="10"
@@ -530,12 +533,15 @@ export default defineComponent({
       position2D: initial2DPosition as Omit<GotoRADecZoomParams,'instant'>,
       initial2DPosition,
       allSkyImagesets: [
-        'Mellinger color optical survey', 
+        'Deep Star Maps 2020', 
+        'Mellinger color optical survey',  // HIPS
+        "Gaia DR2",
         'Digitized Sky Survey (Color)',
+        'unWISE color, from W2 and W1 bands', // HIPS
         'WISE All Sky (Infrared)',
-        'unWISE color, from W2 and W1 bands',
-        "Gaia DR2",
-        "Deep Star Maps 2020",
+        'Planck Thermal Dust',
+        'Hydrogen Alpha Full Sky Map',
+        "PLANCK R2 HFI color composition 353-545-857 GHz", // HIPS
       ],
       previousMode: mode as "2D" | "3D" | "full" | null,
       fullwavePosition: fullwavePosition,
@@ -669,7 +675,7 @@ export default defineComponent({
     
     async loadHipsWTML () {
       return this.loadImageCollection({
-        url: "https://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=hips",
+        url: "https://raw.githubusercontent.com/cosmicds/cds-website/main/public/wwt-content/radwave-wtml/hips.wtml",
         loadChildFolders: true,
       });
     },
@@ -965,6 +971,9 @@ export default defineComponent({
 
   watch: {
     playing(play: boolean) {
+      if (!play) {
+        this.playCount += 1;
+      }
       this.setClockSync(play);
       this.setClockRate(play ? this.timeRate : 0);
     },
@@ -1122,6 +1131,10 @@ export default defineComponent({
   color: #ffffff;
 }
 
+#loading-button {
+  background-color: black;
+}
+
 .color-span {
   color:var(--accent-color);
 }

radwave/src/hips.wtml

@@ -0,0 +1,25 @@
+<!-- from https://www.worldwidetelescope.org/wwtweb/catalog.aspx?W=hips -->
+<Folder Browseable="True" Group="Explorer" MSRCommunityId="0" MSRComponentId="0" Name="Visible" Permission="0" Searchable="True" Type="Sky">
+    <ImageSet BandPass="Visible" BaseDegreesPerTile="180.0" BaseTileLevel="0" BottomsUp="False" CenterX="0.0" CenterY="0.0" DataSetType="Sky" ElevationModel="False" FileType="jpeg" Generic="False" MeanRadius="1.0" MSRCommunityId="0" MSRComponentId="0" Name="Mellinger color optical survey" OffsetX="0.0" OffsetY="0.0" Permission="0" Projection="Healpix" QuadTreeMap="0123" ReferenceFrame="Sky" Rotation="0.0" Sparse="True" StockSet="False" TileLevels="4" Url="http://alasky.u-strasbg.fr/MellingerRGB/Norder{0}/Dir{1}/Npix{2}" WidthFactor="1">
+        <Credits>Copyright 2000-2017 Axel Mellinger. All rights reserved.</Credits>
+        <CreditsUrl>http://www.milkywaysky.com/</CreditsUrl>
+        <Description>HiPS List ID: CDS/P/Mellinger/color</Description>
+        <ThumbnailUrl>http://alasky.u-strasbg.fr/MellingerRGB/preview.jpg</ThumbnailUrl>
+      </ImageSet>
+    <ImageSet BandPass="Visible" BaseDegreesPerTile="180.0" BaseTileLevel="0" BottomsUp="False" CenterX="0.0" CenterY="0.0" DataSetType="Sky" ElevationModel="False" FileType="jpeg fits" Generic="False" MeanRadius="1.0" MSRCommunityId="0" MSRComponentId="0" Name="Finkbeiner Halpha composite survey" OffsetX="0.0" OffsetY="0.0" Permission="0" Projection="Healpix" QuadTreeMap="0123" ReferenceFrame="Sky" Rotation="0.0" Sparse="True" StockSet="False" TileLevels="3" Url="http://alasky.u-strasbg.fr/FinkbeinerHalpha/Norder{0}/Dir{1}/Npix{2}" WidthFactor="1">
+        <Credits>Composite map by Douglas Finkbeiner (2004).</Credits>
+        <Description>HiPS List ID: CDS/P/Finkbeiner</Description>
+        <ThumbnailUrl>http://alasky.u-strasbg.fr/FinkbeinerHalpha/preview.jpg</ThumbnailUrl>
+      </ImageSet>
+      <ImageSet BandPass="Radio" BaseDegreesPerTile="180.0" BaseTileLevel="0" BottomsUp="False" CenterX="0.0" CenterY="0.0" DataSetType="Sky" ElevationModel="False" FileType="jpeg" Generic="False" MeanRadius="1.0" MSRCommunityId="0" MSRComponentId="0" Name="PLANCK R2 HFI color composition 353-545-857 GHz" OffsetX="0.0" OffsetY="0.0" Permission="0" Projection="Healpix" QuadTreeMap="0123" ReferenceFrame="Sky" Rotation="0.0" Sparse="True" StockSet="False" TileLevels="3" Url="http://alasky.u-strasbg.fr/PLANCK/R2/HFI_Color_353_545_857/Norder{0}/Dir{1}/Npix{2}" WidthFactor="1">
+        <Credits>Planck Legacy Archive</Credits>
+        <CreditsUrl>http://pla.esac.esa.int/pla</CreditsUrl>
+        <Description>HiPS List ID: CDS/P/PLANCK/R2/HFI/color</Description>
+        <ThumbnailUrl>http://alasky.u-strasbg.fr/PLANCK/R2/HFI_Color_353_545_857/preview.jpg</ThumbnailUrl>
+      </ImageSet>
+      <ImageSet BandPass="IR" BaseDegreesPerTile="180.0" BaseTileLevel="0" BottomsUp="False" CenterX="0.0" CenterY="0.0" DataSetType="Sky" ElevationModel="False" FileType="jpeg" Generic="False" MeanRadius="1.0" MSRCommunityId="0" MSRComponentId="0" Name="unWISE color, from W2 and W1 bands" OffsetX="0.0" OffsetY="0.0" Permission="0" Projection="Healpix" QuadTreeMap="0123" ReferenceFrame="Sky" Rotation="0.0" Sparse="True" StockSet="False" TileLevels="8" Url="http://alasky.u-strasbg.fr/unWISE/color-W2-W1W2-W1/Norder{0}/Dir{1}/Npix{2}" WidthFactor="1">
+        <Credits>IPAC/NASA - D. Lang for the reprocessing</Credits>
+        <Description>HiPS List ID: CDS/P/unWISE/color-W2-W1W2-W1</Description>
+        <ThumbnailUrl>http://alasky.u-strasbg.fr/unWISE/color-W2-W1W2-W1/preview.jpg</ThumbnailUrl>
+      </ImageSet>
+</Folder>