update deprecated functions

Author: betaBison

gnss_lib_py/parsers/nmea.py

@@ -139,19 +139,19 @@ def __init__(self, input_path, msg_types=None,
         # As per `gnss_lib_py` standards, convert the heading from degrees
         # to radians
         pd_df['true_course_rad'] = (np.pi/180.)*pd_df['true_course']\
-                                                .replace("",np.nan)\
-                                                .fillna(method='bfill')\
-                                                .fillna(method='ffill')\
+                                                .replace("",pd.NA)\
+                                                .bfill()\
+                                                .ffill()\
                                                 .astype(float)
         # Convert the given altitude value to float based on the given units
 
         # Assuming that altitude units are always meters
-        pd_df['altitude'] = pd_df['altitude'].replace("",np.nan)\
-                                             .fillna(method='bfill')\
-                                             .fillna(method='ffill')\
+        pd_df['altitude'] = pd_df['altitude'].replace("",pd.NA)\
+                                             .bfill()\
+                                             .ffill()\
                                              .astype(float)
         pd_df["num_sats"] = pd_df["num_sats"].fillna(value=0).astype('int64')
-        pd_df = pd_df.fillna(value=np.nan).replace("",np.nan)
+        pd_df = pd_df.fillna(value=np.nan).replace("",pd.NA)
         convert_dict={
                'num_sats' : np.int64,
                'gps_qual' : np.int64,

gnss_lib_py/utils/coordinates.py

@@ -143,7 +143,7 @@ def ecef_to_geodetic(ecef, radians=False):
     # stack the new columns and return to the original shape
     geodetic = np.column_stack((lat, lon, h))
     if input_shape[0]==3:
-        geodetic = np.row_stack((lat, lon, h))
+        geodetic = np.vstack((lat, lon, h))
     return geodetic
 
 class LocalCoord(object):
@@ -575,29 +575,27 @@ def wrap_0_to_2pi(angles):
 def el_az_to_enu_unit_vector(el_deg, az_deg):
     """
     Convert elevation and azimuth to ENU unit vectors.
-    
+
     Parameters
     ----------
     el_deg : np.ndarray
         Elevation angle in degrees.
-        
+
     az_deg : np.ndarray
         Azimuth angle in degrees.
-        
+
     Returns
     -------
     unit_dir_mat : np.ndarray
         ENU unit vectors.
     """
     el_rad = np.deg2rad(el_deg)
     az_rad = np.deg2rad(az_deg)
-    
+
     unit_dir_mat = np.vstack(
         (np.atleast_2d(np.cos(el_rad) * np.sin(az_rad)),
          np.atleast_2d(np.cos(el_rad) * np.cos(az_rad)),
          np.atleast_2d(np.sin(el_rad))
          )).T
-    
-    return unit_dir_mat
-
 
+    return unit_dir_mat

gnss_lib_py/utils/ephemeris_downloader.py

@@ -122,7 +122,7 @@
 import gzip
 import ftplib
 from ftplib import FTP_TLS, FTP
-from datetime import datetime, timezone, timedelta, time
+from datetime import datetime, timezone, timedelta, time, UTC
 
 import unlzw3
 import numpy as np
@@ -280,7 +280,7 @@ def _verify_ephemeris(file_type, gps_millis, constellations=None,
                 raise RuntimeError("gnss_lib_py cannot automatically " \
                                  + "download rinex nav files for "\
                                  + "times before Jan 1, 2013")
-            if datetime.utcnow().date() == date:
+            if datetime.now(UTC).date() == date:
                 possible_types = ["rinex_nav_today"]
             else:
                 if constellations is not None and list(constellations) == ["gps"]:
@@ -290,8 +290,8 @@ def _verify_ephemeris(file_type, gps_millis, constellations=None,
 
                 # download from day's stream if too early in the day
                 # that combined file is not yet uploaded to CDDIS.
-                if datetime.utcnow() < datetime.combine(date+timedelta(days=1),
-                                                        time(12)): # pragma: no cover
+                if datetime.now(UTC) < datetime.combine(date+timedelta(days=1),
+                                                        time(12)).astimezone(timezone.utc): # pragma: no cover
                     possible_types += ["rinex_nav_today"]
                 else:
                     if date < datetime(2019, 11, 25).date():
@@ -304,9 +304,9 @@ def _verify_ephemeris(file_type, gps_millis, constellations=None,
                 raise RuntimeError("gnss_lib_py cannot automatically " \
                                  + "download sp3 files for "\
                                  + "times before May 25, 2012")
-            if datetime.utcnow().date() - timedelta(days=3) < date:
+            if datetime.now(UTC).date() - timedelta(days=3) < date:
                 possible_types += ["sp3_rapid_CODE"]
-            elif datetime.utcnow().date() - timedelta(days=14) < date:
+            elif datetime.now(UTC).date() - timedelta(days=14) < date:
                 possible_types += ["sp3_rapid_GFZ"]
             elif date >= datetime(2017, 8, 13).date():
                 possible_types += ["sp3_final_CODE"]
@@ -318,9 +318,9 @@ def _verify_ephemeris(file_type, gps_millis, constellations=None,
                 raise RuntimeError("gnss_lib_py cannot automatically " \
                                  + "download clk files for "\
                                  + "times before Oct 14, 2012")
-            if datetime.utcnow().date() - timedelta(days=3) < date:
+            if datetime.now(UTC).date() - timedelta(days=3) < date:
                 possible_types += ["clk_rapid_CODE"]
-            elif datetime.utcnow().date() - timedelta(days=14) < date:
+            elif datetime.now(UTC).date() - timedelta(days=14) < date:
                 possible_types += ["clk_rapid_GFZ"]
             elif date >= datetime(2020, 7, 5).date():
                 possible_types += ["clk_final_CODE"]
@@ -430,7 +430,7 @@ def _extract_ephemeris_dates(file_type, dt_timestamps):
         needed_dates.update({dt.date() + timedelta(days=1) for dt in dt_timestamps
                         if ((dt >= datetime.combine(dt.date(),
                                         time(22,tzinfo=timezone.utc))) &
-                             (dt.date() != datetime.utcnow().date()))
+                             (dt.date() != datetime.now(UTC).date()))
                         })
 
     else:

tests/parsers/test_google_decimeter.py

@@ -135,11 +135,11 @@ def test_derived_df_equivalence(derived_path_2021, pd_df, derived_row_map):
     derived = google_decimeter.AndroidDerived2021(derived_path_2021,
                                remove_timing_outliers=False)
     measure_df = derived.pandas_df()
-    gnss_id_map = {"gps":1,
-                   "glonass":3,
-                   "galileo":6,
+    gnss_id_map = {"gps":"1",
+                   "glonass":"3",
+                   "galileo":"6",
                    }
-    measure_df['gnss_id'] = measure_df['gnss_id'].replace(gnss_id_map)
+    measure_df['gnss_id'] = measure_df['gnss_id'].replace(gnss_id_map).astype(int)
     signal_map = {"GPS_L1" : "l1",
                   "GPS_L5" : "l5",
                   "GAL_E1" : "e1",
@@ -158,7 +158,7 @@ def test_derived_df_equivalence(derived_path_2021, pd_df, derived_row_map):
     derived_timestamps = pd_df['millisSinceGpsEpoch'].unique()
     mapper = dict(zip(derived_timestamps[1:],derived_timestamps[:-1]))
     pd_df = pd_df[pd_df['millisSinceGpsEpoch'] != pd_df.loc[0,'millisSinceGpsEpoch']]
-    pd_df["millisSinceGpsEpoch"] = pd_df["millisSinceGpsEpoch"].replace(mapper)
+    pd_df.loc[:,"millisSinceGpsEpoch"] = pd_df["millisSinceGpsEpoch"].replace(mapper)
     pd_df.reset_index(drop=True, inplace=True)
     pd.testing.assert_frame_equal(pd_df.sort_index(axis=1),
                                   measure_df.sort_index(axis=1),

tests/utils/test_ephemeris_downloader.py

@@ -7,7 +7,7 @@
 
 import os
 import ftplib
-from datetime import datetime, timezone, timedelta, time
+from datetime import datetime, timezone, timedelta, time, UTC
 
 import pytest
 import requests
@@ -347,10 +347,10 @@ def test_extract_ephemeris_dates():
                          datetime(2023, 7, 27).date()]
 
     # check don't add next day if after 10pm on current day
-    ten_pm_utc_today = datetime.combine(datetime.utcnow().date(),
+    ten_pm_utc_today = datetime.combine(datetime.now(UTC).date(),
                                         time(22,tzinfo=timezone.utc))
     dates = ed._extract_ephemeris_dates("rinex_nav", np.array([ten_pm_utc_today]))
-    assert dates == [datetime.utcnow().date()]
+    assert dates == [datetime.now(UTC).date()]
 
     # check that across multiple days there aren't duplicates
     dates = ed._extract_ephemeris_dates("rinex_nav", np.array([noon_utc,