fix sv_models tests

Author: betaBison

gnss_lib_py/utils/sv_models.py

@@ -9,14 +9,15 @@
 import warnings
 
 import numpy as np
-from datetime import datetime, timezone, timedelta
 
 import gnss_lib_py.utils.constants as consts
 from gnss_lib_py.utils.coordinates import ecef_to_el_az
 from gnss_lib_py.parsers.navdata import NavData
-from gnss_lib_py.parsers.rinex_nav import get_time_cropped_rinex
-from gnss_lib_py.utils.ephemeris_downloader import DEFAULT_EPHEM_PATH
-from gnss_lib_py.utils.time_conversions import gps_millis_to_tow, gps_millis_to_datetime
+from gnss_lib_py.parsers.rinex_nav import get_time_cropped_rinex, RinexNav
+from gnss_lib_py.parsers.rinex_nav import _compute_eccentric_anomaly
+from gnss_lib_py.parsers.rinex_nav import _estimate_sv_clock_corr
+from gnss_lib_py.utils.ephemeris_downloader import DEFAULT_EPHEM_PATH, load_ephemeris
+from gnss_lib_py.utils.time_conversions import gps_millis_to_tow
 from gnss_lib_py.parsers.sp3 import Sp3
 from gnss_lib_py.parsers.clk import Clk
 
@@ -169,8 +170,10 @@ def add_visible_svs_for_trajectory(rx_states,
     start_millis = gps_millis[0]
 
     # Initialize file with broadcast ephemeris parameters
-    ephem_all_sats = get_time_cropped_rinex(start_millis, constellations,
-                                            ephemeris_path)
+    rinex_paths = load_ephemeris("rinex_nav",start_millis,constellations,
+                                 download_directory=ephemeris_path,
+                                 )
+    ephem_all_sats = RinexNav(rinex_paths)
 
     # Find rows that correspond to receiver positions
     rx_rows_to_find = ['x_rx*_m', 'y_rx*_m', 'z_rx*_m']

tests/utils/test_sv_models.py

@@ -324,13 +324,15 @@ def test_add_visible_svs_for_trajectory(android_gps_l1, ephemeris_path,
     # Create list of times and states from android_gps_l1 into an estimate
     state_estimate = NavData()
     unique_svs = np.unique(android_gps_l1['sv_id'])
+    unique_gnss_id = list(np.unique(android_gps_l1['gnss_id']))
     android_sv = android_gps_l1.where("sv_id", unique_svs[0])
     state_estimate['gps_millis'] = android_sv['gps_millis']
     state_estimate['x_rx_m'] = android_sv['x_rx_m']
     state_estimate['y_rx_m'] = android_sv['y_rx_m']
     state_estimate['z_rx_m'] = android_sv['z_rx_m']
     sv_posvel_traj = sv_models.add_visible_svs_for_trajectory(state_estimate,
-                                                             ephemeris_path)
+                                                             ephemeris_path,
+                                                             constellations=unique_gnss_id)
     # assert that actually received SVs in the given times are a
     # subset of those considered visible
     true_rows = ['x_sv_m', 'y_sv_m', 'z_sv_m', 'vx_sv_mps', 'vy_sv_mps',
@@ -355,13 +357,6 @@ def test_add_visible_svs_for_trajectory(android_gps_l1, ephemeris_path,
                                                 measure_frame_sv[row],
                                                 decimal=error_tol_dec['brd_eph'])
 
-    # Test same function with None for satellites. No support for non-GPS
-    # constellations currently and should raise an error
-    with pytest.warns(RuntimeWarning):
-        _ = sv_models.add_visible_svs_for_trajectory(state_estimate,
-                                                    ephemeris_path,
-                                                    constellations=None)
-
 @pytest.fixture(name="root_path")
 def fixture_root_path():
     """Location of measurements for unit test
@@ -581,7 +576,7 @@ def fixture_load_navdata_glonassg1(navdata):
 
     return navdata_glonassg1
 
-def test_compute_gps_precise_eph(navdata_gps, sp3data, clkdata):
+def test_compute_gps_precise_eph(navdata_gps, sp3data, clkdata,root_path):
     """Tests that sv_models.single_gnss_from_precise_eph does not fail for GPS
 
     Notes
@@ -604,6 +599,8 @@ def test_compute_gps_precise_eph(navdata_gps, sp3data, clkdata):
                                                         clkdata,
                                                         verbose=True)
 
+    np.testing.assert_array_equal(navdata_gps["sv_id"],navdata_prcs_gps["sv_id"])
+
 
     # Check if the resulting derived is NavData class
     assert isinstance( navdata_prcs_gps, type(NavData()) )