Merge pull request #1 from D-arioSpace/release_astroquery

Release astroquery

Author: D-arioSpace

astroquery/esa/neocc/__init__.py

@@ -6,7 +6,7 @@
 European Space Agency (ESA)
 
 Created on 16 Jun. 2021
-Last update 01 Mar. 2022
+Last update 22 Aug. 2022
 
 """
 import os

astroquery/esa/neocc/core.py

@@ -9,8 +9,8 @@
 * Property: European Space Agency (ESA)
 * Developed by: Elecnor Deimos
 * Author: C. Álvaro Arroyo Parejo
-* Issue: 2.1.0
-* Date: 01-03-2021
+* Issue: 2.2.0
+* Date: 19-08-2022
 * Purpose: Main module which gets NEAs data from https://neo.ssa.esa.int/
 * Module: core.py
 * History:
@@ -37,6 +37,7 @@
                          properties
 2.0.0      21-01-2022    Prepare module for Astroquery integration
 2.1.0      01-03-2022    Remove *parse* dependency
+2.2.0      19-08-2022    Impacted objects list format change
 ========   ===========   ============================================
 
 

astroquery/esa/neocc/lists.py

@@ -7,8 +7,8 @@
 * Property: European Space Agency (ESA)
 * Developed by: Elecnor Deimos
 * Author: C. Álvaro Arroyo Parejo
-* Issue: 2.1.0
-* Date: 01-03-2021
+* Issue: 2.2.0
+* Date: 19-08-2022
 * Purpose: Module which request and parse list data from ESA NEOCC
 * Module: lists.py
 * History:
@@ -31,6 +31,7 @@
                          Update docstrings.
 2.0.0      21-01-2022    Prepare module for Astroquery integration
 2.1.0      01-03-2022    Remove *parse* dependency
+2.2.0      19-08-2022    Impacted objects list format change
 ========   ===========   ==========================================
 
 © Copyright [European Space Agency][2022]
@@ -39,6 +40,8 @@
 
 import io
 from datetime import timedelta
+from astropy.table import Table
+from astropy.time import Time
 import pandas as pd
 import requests
 from astroquery.esa.neocc import conf
@@ -83,7 +86,7 @@ def get_list_url(list_name):
         "priority_list": 'esa_priority_neo_list',
         "priority_list_faint": 'esa_faint_neo_list',
         "close_encounter" : 'close_encounter2.txt',
-        "impacted_objects" : 'impactedObjectsList.txt',
+        "impacted_objects" : 'past_impactors_list',
         "neo_catalogue_current" : 'neo_kc.cat',
         "neo_catalogue_middle" : 'neo_km.cat'
         }
@@ -231,10 +234,11 @@ def parse_risk(data_byte_d):
     neocc_lst = neocc_lst.drop(neocc_lst.columns[-1], axis=1)
 
     # Convert column with date to datetime variable
-    neocc_lst['Date/Time'] = pd.to_datetime(neocc_lst['Date/Time'])
+    neocc_lst['Date/Time'] = pd.to_datetime(neocc_lst['Date/Time'],
+                                            errors='ignore')
     # Split Years into 2 columns to avoid dashed between integers
-    # Check dataframe is not empty (for special list)
-    if len(neocc_lst.index.values) != 0:
+    # Check dataframe column length is differnt from 8 (for special risk)
+    if len(neocc_lst.columns) != 8:
         neocc_lst[['First year', 'Last year']] = neocc_lst['Years']\
                                                     .str.split("-",
                                                     expand=True)\
@@ -468,17 +472,25 @@ def parse_impacted(data_byte_d):
         Decoded StringIO object.
     Returns
     -------
-    neocc_lst : *pandas.DataFrame*
-        Data frame with impacted objects list data parsed.
+    neocc_table : *astropy.table.table.Table*
+        Astropy table with impacted objects list data parsed.
     """
-    # Read data as csv
-    neocc_lst = pd.read_csv(data_byte_d, header=None,
-                            delim_whitespace=True)
-
-    # Convert column with date to datetime variable
-    neocc_lst[1] = pd.to_datetime(neocc_lst[1])
-
-    return neocc_lst
+    # Read data as csv using astropy.table
+    neocc_table = Table.read(data_byte_d, format='pandas.csv',
+                             delimiter=r'\s+\|\s+|\s+\|',
+                             engine='python', header=1,
+                             dtype={'Object designator': str,
+                                    'Diameter in m': str,
+                                    'Impact date/time in UTC': str,
+                                    'Impact Velocity in km/s': float,
+                                    'Estimated energy in Mt': float,
+                                    'Measured energy in Mt': float})
+    neocc_table.remove_column('Unnamed: 6')
+    # Convert column with date to astropy.time ISO format variable
+    neocc_table['Impact date/time in UTC'] =\
+         Time(neocc_table['Impact date/time in UTC'], scale='utc')
+
+    return neocc_table
 
 
 def parse_neo_catalogue(data_byte_d):

astroquery/esa/neocc/tabs.py

@@ -10,8 +10,8 @@
 * Property: European Space Agency (ESA)
 * Developed by: Elecnor Deimos
 * Author: C. Álvaro Arroyo Parejo
-* Issue: 2.1.0
-* Date: 01-03-2021
+* Issue: 2.2.0
+* Date: 19-08-2022
 * Purpose: Module which request and parse list data from ESA NEOCC
 * Module: tabs.py
 * History:
@@ -50,6 +50,7 @@
                          Adding redundancy for tab *summary* parsing.
 2.0.0      21-01-2022    Prepare module for Astroquery integration
 2.1.0      01-03-2022    Remove *parse* dependency
+2.2.0      19-08-2022    Minor corrections
 ========   ===========   =====================================================
 
 © Copyright [European Space Agency][2022]
@@ -300,6 +301,7 @@ def _get_footer(data_obj):
 
         # Drop NaN values if necessary
         df_txt = df_txt.dropna(how='all')
+
         # Template for observations data:
         # Based on {total} optical observations (of which {rejected}
         # are rejected as outliers)
@@ -620,7 +622,6 @@ def _phys_prop_parser(self, data_obj):
         # Initialize index
         index = 0
         if len(df_check.columns) > 4:
-            # rest = len(df_check.columns) - 4
             # Iterate over each element in last col to find
             # rows with additional elements separated by commas
             for element in df_check.iloc[:, -1]:
@@ -753,7 +754,6 @@ def _get_head_obs(df_d):
         else:
             mag = float(df_head.iloc[3][0].split('=')[1].strip())
 
-
         return ver, err, ast, mag
 
     @staticmethod
@@ -1829,7 +1829,6 @@ def _get_head_ephem(data_obj):
         # Template for initial date: Time step: {step}
         tstep = head_ephe.iloc[4][0].split(':')[1].strip()
 
-
         return obs, idate, fdate, tstep
 
     def _ephem_parser(self, name, observatory, start, stop, step, step_unit):

astroquery/esa/neocc/test/data/esa_special_risk_list

@@ -1,4 +1,6 @@
-Last Update: 2021-10-04 05:49 UTC
+Last Update: 2022-08-19 08:03 UTC
             Object         |    Diameter    |             VI Max                                   |
  Num/des.       Name       |   m  |   *=Y   |      Date/Time   |  IP max  | PS max |TS  | Vel km/s |
 AAAAAAAAA AAAAAAAAAAAAAAAA | NNNN |    A    | YYYY-MM-DD HH:MM | EEEEEEEE | NNN.NN | NN |  NNN.NN  |
+101955               Bennu |  484 |         | 2182-09-24 20:24 |  3.70E-4 |  -1.59 |    |   12.68  |
+29075               1950DA | 1300 |         | 2880-03-16 23:48 |  1.96E-5 |  -2.13 |    |   17.99  |

astroquery/esa/neocc/test/data/past_impactors_list

@@ -0,0 +1,7 @@
+Last Update: 2022-04-04 10:00 UTC
+  Object designator  |  Diameter in m  |  Impact date/time in UTC  |  Impact Velocity in km/s  |  Estimated energy in Mt  |  Measured energy in Mt  |
+       2022EB5       |      1.9*       |    2022-03-11 21:22:00    |           18.53           |         2.96E-4          |        4.00E-3          |
+       2019MO        |       5*        |    2019-06-22 21:30:00    |           16.34           |         3.82E-3          |        6.00E-3          |
+       2018LA        |      2.8*       |    2018-06-02 16:44:00    |           16.98           |         8.90E-4          |        9.80E-4          |
+       2014AA        |      2.3*       |    2014-01-02 02:30:00    |           11.97           |         2.44E-4          |           n/a           |
+       2008TC3       |       3*        |    2008-10-07 02:45:00    |           11.77           |         6.77E-4          |        1.00E-3          |