1019 add moon to aladin sky chart on target list page

tom_targets/templates/tom_targets/partials/aladin_skymap.html

@@ -15,17 +15,67 @@
     showCooGridControl: true,
     });
 
-    aladin.setCooGrid({ color: 'green', labelSize: 10 });
-
+    aladin.setCooGrid({ color: 'grey', labelSize: 10 });
+
+    // extract the targets from the context
     var targets = {{ targets|safe }}; //targets cannot be a queryset; here it is a list of dictionaries
 
+    // define catalog for the targets
+    var catalogOptions = {
+        name: 'Targets',
+        color: 'rgb(46, 107, 131)', // TOMToolkit Blue
+        sourceSize: 16};
+    var targetCatalog = A.catalog(catalogOptions);
+
+    // add targets to the catalog
     for (var i = 0; i < targets.length; i++) {
         var target = targets[i];
-        var cat = A.catalog({name: target.name , color: 'blue', sourceSize: 16});
-        aladin.addCatalog(cat);
-        popup_info = ['RA: '.concat(target.ra, '<br>',  'Dec: ', target.dec)];
-        cat.addSources([A.marker(target.ra, target.dec, {popupTitle: target.name, popupDesc: popup_info})]);
+        popupInfo = ['RA: '.concat(target.ra, '<br>',  'Dec: ', target.dec)];
+        targetCatalog.addSources([A.marker(target.ra, target.dec, {popupTitle: target.name, popupDesc: popupInfo})]);
     }
+    aladin.addCatalog(targetCatalog);
+
+    // extract Moon information from the context
+    const moonRaDeg = {{ moon_ra|safe }};
+    const moonDecDeg = {{ moon_dec|safe }};
+    const moonIllumination = {{ moon_illumination|safe }}.toFixed(3);
+    const moonGreyscale = 255 * moonIllumination;
+
+    // add catalog for the Moon
+    const moonCatalog = A.catalog({
+        name: 'Moon',
+        shape: 'circle',
+        color: `rgb(${moonGreyscale}, ${moonGreyscale}, ${moonGreyscale})`,
+        sourceSize: 26});
+
+    const popupMoonDescription = `Illumination: ${moonIllumination} <br> RA: ${moonRaDeg.toFixed(4)} <br> Dec: ${moonDecDeg.toFixed(4)}`;
+
+    moonCatalog.addSources([A.marker(moonRaDeg, moonDecDeg,
+        {popupTitle: 'Geocentric Moon',
+        popupDesc: popupMoonDescription
+        })]);
+
+    aladin.addCatalog(moonCatalog);
+
+    // now add the sun in its own catalog
+    const sunCatalog = A.catalog({
+        name: 'Sun',
+        shape: 'circle',
+        color: 'yellow',
+        sourceSize: 15});
+
+    const sunRaDeg = {{ sun_ra|safe }};
+    const sunDecDeg = {{ sun_dec|safe }};
+
+    const popupSunDescription = `RA: ${sunRaDeg.toFixed(4)} <br> Dec: ${sunDecDeg.toFixed(4)}`;
+
+    sunCatalog.addSources([A.marker(sunRaDeg, sunDecDeg,
+        {popupTitle: 'Geocentric Sun',
+        popupDesc: popupSunDescription,
+        })]);
+
+    aladin.addCatalog(sunCatalog);
+
     });
 </script>
 

tom_targets/templatetags/targets_extras.py

@@ -276,17 +276,32 @@ def aladin_skymap(targets):
     Displays aladin skyview on Target Distribution skymap. Markers on the skymap show where your targets are. Max of
     25 targets show at a time (one page of targets). This templatetag converts the targets queryset into a list of
     dictionaries suitable for javascript and aladin, and only works for sidereal targets.
+
+    Also, puts the current Moon and Sun positions (from astropy) into the context.
     """
     target_list = []
-
     for target in targets:
         if target.type == Target.SIDEREAL:
             name = target.name
             ra = target.ra
             dec = target.dec
             target_list.append({'name': name, 'ra': ra, 'dec': dec})
 
-    context = {'targets': target_list}
+    # To display the Moon and Sun on the skymap, calculate postions for
+    # them here and pass them to the template in the context
+    now = Time.now()
+    moon_pos = get_body('moon', now)
+    moon_illum = moon_illumination(now)
+    sun_pos = get_body('sun', now)
+
+    context = {
+        'targets': target_list,
+        'moon_ra': moon_pos.ra.deg,
+        'moon_dec': moon_pos.dec.deg,
+        'moon_illumination': moon_illum,
+        'sun_ra': sun_pos.ra.deg,
+        'sun_dec': sun_pos.dec.deg,
+    }
     return context