added offline test

Author: emolter

astroquery/solarsystem/pds/core.py

@@ -37,7 +37,7 @@ def __init__(self, planet=None, obs_time=None):
 
         Parameters
         ----------
-        
+
         """
 
         super().__init__()
@@ -53,7 +53,7 @@ def __str__(self):
         >>> print(nodeobj)  # doctest: +SKIP
         PDSRingNode instance
         """
-        return 'PDSRingNode instance'
+        return "PDSRingNode instance"
 
     # --- pretty stuff above this line, get it working below this line ---
 
@@ -76,8 +76,8 @@ def ephemeris_async(
         ----------
         self : RingNodeClass instance
         planet : str, required. one of Mars, Jupiter, Saturn, Uranus, Neptune, or Pluto
-        obs_time : astropy.Time object, or str in format YYYY-MM-DD hh:mm, optional. 
-                If str is provided then UTC is assumed. If no obs_time is provided, 
+        obs_time : astropy.Time object, or str in format YYYY-MM-DD hh:mm, optional.
+                If str is provided then UTC is assumed. If no obs_time is provided,
                 the current time is used.
         location : array-like, or `~astropy.coordinates.EarthLocation`, optional
             Observer's location as a
@@ -141,7 +141,7 @@ def ephemeris_async(
                 )
         elif type(obs_time) == Time:
             try:
-                obs_time = obs_time.utc.to_value('iso', subfmt = 'date_hm')
+                obs_time = obs_time.utc.to_value("iso", subfmt="date_hm")
             except Exception as e:
                 raise ValueError(
                     "illegal value for 'obs_time' parameter. could not parse astropy.time.core.Time object into format 'yyyy-mm-dd hh:mm' (UTC)"
@@ -154,25 +154,27 @@ def ephemeris_async(
         else:
             viewpoint = "latlon"
             if type(location) != EarthLocation:
-                if hasattr(location, '__iter__'):
+                if hasattr(location, "__iter__"):
                     if len(location) != 3:
                         raise ValueError(
                             "location arrays require three values:"
-                            " longitude, latitude, and altitude")
+                            " longitude, latitude, and altitude"
+                        )
                 else:
                     raise TypeError(
-                        "location must be array-like or astropy EarthLocation")
-                        
+                        "location must be array-like or astropy EarthLocation"
+                    )
+
             if isinstance(location, EarthLocation):
                 loc = location.geodetic
                 longitude = loc[0].deg
                 latitude = loc[1].deg
                 altitude = loc[2].to(u.m).value
-            elif hasattr(location, '__iter__'):
-                longitude = Angle(location[0]).deg
-                latitude = Angle(location[1]).deg
-                altitude = u.Quantity(location[2]).to('m').value
-            
+            elif hasattr(location, "__iter__"):
+                latitude = Angle(location[0]).deg
+                longitude = Angle(location[1]).deg
+                altitude = u.Quantity(location[2]).to("m").value
+
         if int(neptune_arcmodel) not in [1, 2, 3]:
             raise ValueError(
                 f"Illegal Neptune arc model {neptune_arcmodel}. must be one of 1, 2, or 3 (see https://pds-rings.seti.org/tools/viewer3_nep.shtml for details)"
@@ -183,12 +185,9 @@ def ephemeris_async(
         # thankfully, adding extra planet-specific keywords here does not break query for other planets
         request_payload = OrderedDict(
             [
-                ("abbrev", planet[:3]),
-                (
-                    "ephem",
-                    conf.planet_defaults[planet]["ephem"],
-                ),  # change hardcoding for other planets
-                ("time", obs_time), #UTC. this should be enforced when checking inputs
+                ("abbrev", planet.lower()[:3]),
+                ("ephem", conf.planet_defaults[planet]["ephem"],),
+                ("time", obs_time),  # UTC. this should be enforced when checking inputs
                 (
                     "fov",
                     10,
@@ -297,17 +296,10 @@ def _parse_ringnode(self, src):
                         "dRA",
                         "dDec",
                     ),
-                    )
-                units_list = [None, 
-                        None,
-                        None,
-                        None,
-                        u.deg, 
-                        u.deg,
-                        u.arcsec,
-                        u.arcsec]
-                bodytable = table.QTable(bodytable, units = units_list)
-                #for i in range(len(bodytable.colnames)):
+                )
+                units_list = [None, None, None, None, u.deg, u.deg, u.arcsec, u.arcsec]
+                bodytable = table.QTable(bodytable, units=units_list)
+                # for i in range(len(bodytable.colnames)):
                 #    bodytable[bodytable.colnames[i]].unit = units_list[i]
             # minor body table part 2
             elif group.startswith("Sub-"):
@@ -327,18 +319,11 @@ def _parse_ringnode(self, src):
                         "sub_sun_lat",
                         "phase",
                         "distance",
-                    ))
-                units_list=[
-                    None,
-                    None,
-                    u.deg,
-                    u.deg,
-                    u.deg,
-                    u.deg,
-                    u.deg,
-                    u.km * 1e6]
-                bodytable2 = table.QTable(bodytable2, units = units_list)
-                #for i in range(len(bodytable2.colnames)):
+                    ),
+                )
+                units_list = [None, None, u.deg, u.deg, u.deg, u.deg, u.deg, u.km * 1e6]
+                bodytable2 = table.QTable(bodytable2, units=units_list)
+                # for i in range(len(bodytable2.colnames)):
                 #    bodytable2[bodytable2.colnames[i]].unit = units_list[i]
 
             # ring plane data
@@ -359,15 +344,15 @@ def _parse_ringnode(self, src):
                         }
 
                     elif "Ring plane opening angle" in l[0]:
-                        systemtable["opening_angle"] = float(
-                            re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()")
-                        ) * u.deg
+                        systemtable["opening_angle"] = (
+                            float(re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()")) * u.deg
+                        )
                     elif "Ring center phase angle" in l[0]:
                         systemtable["phase_angle"] = float(l[1].strip(", \n")) * u.deg
                     elif "Sub-solar longitude" in l[0]:
-                        systemtable["sub_sun_lon"] = float(
-                            re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()")
-                        ) * u.deg
+                        systemtable["sub_sun_lon"] = (
+                            float(re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()")) * u.deg
+                        )
                     elif "Sub-observer longitude" in l[0]:
                         systemtable["sub_obs_lon"] = float(l[1].strip(", \n")) * u.deg
                     else:
@@ -379,10 +364,10 @@ def _parse_ringnode(self, src):
                 for line in lines:
                     l = line.split(":")
                     if "Sun-planet distance (AU)" in l[0]:
-                        #systemtable["d_sun_AU"] = float(l[1].strip(", \n"))
+                        # systemtable["d_sun_AU"] = float(l[1].strip(", \n"))
                         pass
                     elif "Observer-planet distance (AU)" in l[0]:
-                        #systemtable["d_obs_AU"] = float(l[1].strip(", \n"))
+                        # systemtable["d_obs_AU"] = float(l[1].strip(", \n"))
                         pass
                     elif "Sun-planet distance (km)" in l[0]:
                         systemtable["d_sun"] = (
@@ -405,11 +390,12 @@ def _parse_ringnode(self, src):
                     format="fixed_width",
                     col_starts=(5, 18, 29),
                     col_ends=(18, 29, 36),
-                    names=("ring", "pericenter", "ascending node"))
-                    
-                units_list=[None, u.deg, u.deg]
-                ringtable = table.QTable(ringtable, units = units_list)
-                
+                    names=("ring", "pericenter", "ascending node"),
+                )
+
+                units_list = [None, u.deg, u.deg]
+                ringtable = table.QTable(ringtable, units=units_list)
+
             # Saturn F-ring data
             elif group.startswith("F Ring"):
                 lines = group.split("\n")
@@ -422,7 +408,7 @@ def _parse_ringnode(self, src):
                 ringtable = table.Table(
                     [["F"], [peri], [ascn]],
                     names=("ring", "pericenter", "ascending node"),
-                    units=(None, u.deg, u.deg)
+                    units=(None, u.deg, u.deg),
                 )
 
             # Neptune ring arcs data
@@ -439,24 +425,23 @@ def _parse_ringnode(self, src):
                         ringtable = table.Table(
                             [[ring], [min_angle], [max_angle]],
                             names=("ring", "min_angle", "max_angle"),
-                            units=(None, u.deg, u.deg)
+                            units=(None, u.deg, u.deg),
                         )
                     else:
                         ringtable.add_row([ring, min_angle, max_angle])
 
             else:
                 pass
 
-        #
-        ## do some cleanup from the parsing job
-        # 
+        # do some cleanup from the parsing job
         ringtable.add_index("ring")
-        
-        bodytable = table.join(bodytable, bodytable2) # concatenate minor body table
+
+        bodytable = table.join(bodytable, bodytable2)  # concatenate minor body table
         bodytable.add_index("Body")
-        
-        systemtable["obs_time"] = Time(obs_time, format = 'iso', scale = 'utc') # add obs time to systemtable
-        
+
+        systemtable["obs_time"] = Time(
+            obs_time, format="iso", scale="utc"
+        )  # add obs time to systemtable
 
         return systemtable, bodytable, ringtable
 

astroquery/solarsystem/pds/tests/data/uranus_ephemeris.html

@@ -0,0 +1,118 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<title>Uranus Viewer 3.0 Results</title>
+<body style="font-family:arial; font-size:medium">
+<h1>Uranus Viewer 3.0 Results</h1>
+<p>
+<pre>
+Input Parameters
+----------------
+ 
+  Observation time: 2022-05-03 00:00
+         Ephemeris: URA111 + URA115 + DE440
+     Field of view: 10 (Uranus radii)
+    Diagram center: Uranus
+         Viewpoint: Lat = 10 (deg)
+                    Lon = -120.355 (deg east)
+                    Alt = 1000 (m)
+    Moon selection: All inner moons (U1-U15,U25-U27)
+    Ring selection: Nine major rings
+    Standard stars: No
+   Additional star: No
+      Other bodies: None
+             Title: 
+       Moon labels: Small (6 points)
+  Moon enlargement: 0 (points)
+       Blank disks: No
+Pericenter markers: None
+       Marker size: 4 (points)
+   Prime meridians: Yes
+ 
+ 
+Field of View Description (J2000)
+---------------------------------
+ 
+     Body          RA                 Dec                 RA (deg)    Dec (deg)    dRA (")     dDec (")
+ 799 Uranus         2h 48m 02.3164s    15d 48m 04.141s     42.009651   15.801150      0.000      0.000
+ 701 Ariel          2h 48m 02.6985s    15d 48m 14.802s     42.011244   15.804112      5.515     10.661
+ 702 Umbriel        2h 48m 03.0454s    15d 48m 16.080s     42.012689   15.804467     10.522     11.939
+ 703 Titania        2h 48m 02.9240s    15d 47m 36.893s     42.012184   15.793581      8.771    -27.248
+ 704 Oberon         2h 48m 04.1962s    15d 47m 42.409s     42.017484   15.795114     27.133    -21.732
+ 705 Miranda        2h 48m 02.7625s    15d 48m 07.862s     42.011510   15.802184      6.439      3.722
+ 706 Cordelia       2h 48m 02.2509s    15d 48m 07.282s     42.009379   15.802023     -0.944      3.141
+ 707 Ophelia        2h 48m 02.2438s    15d 48m 00.861s     42.009349   15.800239     -1.047     -3.280
+ 708 Bianca         2h 48m 02.0990s    15d 48m 05.324s     42.008746   15.801479     -3.137      1.183
+ 709 Cressida       2h 48m 02.3358s    15d 48m 00.038s     42.009732   15.800011      0.280     -4.102
+ 710 Desdemona      2h 48m 02.4006s    15d 48m 08.008s     42.010003   15.802224      1.217      3.867
+ 711 Juliet         2h 48m 02.1052s    15d 48m 06.438s     42.008772   15.801788     -3.047      2.298
+ 712 Portia         2h 48m 02.3709s    15d 48m 08.408s     42.009879   15.802336      0.787      4.267
+ 713 Rosalind       2h 48m 02.5516s    15d 48m 06.258s     42.010632   15.801738      3.395      2.117
+ 714 Belinda        2h 48m 02.4108s    15d 47m 59.372s     42.010045   15.799825      1.363     -4.769
+ 715 Puck           2h 48m 02.1358s    15d 48m 09.016s     42.008899   15.802505     -2.605      4.876
+ 725 Perdita        2h 48m 02.3249s    15d 48m 09.230s     42.009687   15.802564      0.124      5.089
+ 726 Mab            2h 48m 02.6883s    15d 48m 04.764s     42.011201   15.801323      5.368      0.623
+ 727 Cupid          2h 48m 02.5963s    15d 48m 04.777s     42.010818   15.801327      4.040      0.636
+ 
+                   Sub-Observer         Sub-Solar     
+     Body          Lon(degE) Lat(deg)   Lon(degE) Lat(deg)   Phase(deg)   Distance(10^6 km)
+ 799 Uranus         24.025    56.016     24.014    56.122      0.10924    3098.568884
+ 701 Ariel         124.977    56.141    124.967    56.249      0.10934    3098.505814
+ 702 Umbriel       139.323    56.082    139.313    56.190      0.10941    3098.454209
+ 703 Titania       251.999    56.036    251.987    56.141      0.10931    3098.498297
+ 704 Oberon        216.747    55.830    216.739    55.936      0.10959    3098.307219
+ 705 Miranda       151.067    54.505    151.037    54.611      0.10934    3098.502972
+ 706 Cordelia      308.108    56.084    308.095    56.194      0.10923    3098.576275
+ 707 Ophelia        89.619    56.085     89.605    56.188      0.10922    3098.581622
+ 708 Bianca        334.349    55.945    334.331    56.053      0.10919    3098.599901
+ 709 Cressida      280.863    56.045    280.852    56.149      0.10923    3098.568767
+ 710 Desdemona     145.642    55.889    145.633    55.998      0.10926    3098.554071
+ 711 Juliet         45.698    55.990     45.681    56.098      0.10920    3098.598161
+ 712 Portia        105.643    55.932    105.633    56.041      0.10926    3098.557986
+ 713 Rosalind      147.213    55.738    147.207    55.846      0.10929    3098.533106
+ 714 Belinda       223.015    56.048    223.006    56.152      0.10925    3098.558348
+ 715 Puck           55.434    56.246     55.421    56.355      0.10921    3098.591319
+ 725 Perdita       163.507    55.992    163.496    56.101      0.10925    3098.564229
+ 726 Mab           223.976    55.906    223.969    56.013      0.10932    3098.514000
+ 727 Cupid         246.256    55.885    246.250    55.992      0.10930    3098.527432
+
+     Ring          Pericenter   Ascending Node (deg, from ring plane ascending node)
+     Six            58.012      283.243
+     Five          300.684      245.829
+     Four          128.182      177.661
+     Alpha          13.729       62.922
+     Beta          231.051      353.609
+     Eta             0.000        0.000
+     Gamma         200.019        0.000
+     Delta           0.000        0.000
+     Epsilon        13.383        0.000
+ 
+   Ring sub-solar latitude (deg): -56.12233  (-56.13586  to -56.10881)
+  Ring plane opening angle (deg): -56.01577  (lit)
+   Ring center phase angle (deg):   0.10924
+       Sub-solar longitude (deg): 354.11072  from ring plane ascending node
+    Sub-observer longitude (deg): 354.12204
+
+        Sun-planet distance (AU):  19.70547
+   Observer-planet distance (AU):  20.71265
+        Sun-planet distance (km):  2947.896667 x 10^6
+   Observer-planet distance (km):  3098.568884 x 10^6
+         Light travel time (sec): 10335.713263
+
+</pre>
+<hr><b>Preview:</b><p>
+<a href="/work/viewer3_ura_24390.pdf"><image src="/work/viewer3_ura_24390tn.jpg"/></a><br>
+Click
+<a href="/work/viewer3_ura_24390.pdf">here</a>
+to download diagram (PDF, 21116 bytes).<p>
+Click
+<a href="/work/viewer3_ura_24390.jpg">here</a>
+to download diagram (JPEG format, 185169 bytes).<p>
+Click
+<a href="/work/viewer3_ura_24390.ps">here</a>
+to download diagram (PostScript format, 62562 bytes).
+<hr>
+<a href="/tools/viewer3_ura.shtml">Uranus Viewer Form</a> |
+<a href="/tools/index.html">RMS Node Tools</a> |
+<a href="/">Ring-Moon Systems Home</a>
+</body>
+</html>

astroquery/solarsystem/pds/tests/setup_package.py

@@ -0,0 +1,7 @@
+import os
+
+
+def get_package_data():
+    paths = [os.path.join("data", "*.html")]  # etc, add other extensions
+
+    return {"astroquery.solarsystem.pds.tests": paths}