update impacted objects parse list and bug fix in risk special list

Author: Alvaro Arroyo Parejo

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):
@@ -540,4 +552,3 @@ def parse_neo_catalogue(data_byte_d):
 
 
     return neocc_lst
-