sp3, clk in gps time not utc time

Author: betaBison

gnss_lib_py/parsers/clk.py

@@ -13,8 +13,8 @@
 
 from gnss_lib_py.parsers.navdata import NavData
 from gnss_lib_py.utils.constants import CONSTELLATION_CHARS, C
-from gnss_lib_py.utils.time_conversions import datetime_to_gps_millis
-from gnss_lib_py.utils.time_conversions import datetime_to_unix_millis
+from gnss_lib_py.utils.time_conversions import gps_to_unix_millis
+from gnss_lib_py.utils.time_conversions import gps_datetime_to_gps_millis
 
 class Clk(NavData):
     """Clk specific loading and preprocessing for any GNSS constellation
@@ -81,8 +81,8 @@ def __init__(self, input_path):
                                  minute = int(timelist_val[6]), \
                                  second = int(float(timelist_val[7])), \
                                  tzinfo=timezone.utc)
-            gps_millis_timestep = datetime_to_gps_millis(curr_time)
-            unix_millis_timestep = datetime_to_unix_millis(curr_time)
+            gps_millis_timestep = gps_datetime_to_gps_millis(curr_time)
+            unix_millis_timestep = gps_to_unix_millis(gps_millis_timestep)
             gnss_sv_ids.append(gnss_sv_id)
             gnss_id.append(CONSTELLATION_CHARS[gnss_sv_id[0]])
             sv_id.append(int(gnss_sv_id[1:]))

gnss_lib_py/parsers/sp3.py

@@ -13,8 +13,9 @@
 
 from gnss_lib_py.parsers.navdata import NavData
 from gnss_lib_py.utils.constants import CONSTELLATION_CHARS
-from gnss_lib_py.utils.time_conversions import datetime_to_gps_millis
-from gnss_lib_py.utils.time_conversions import datetime_to_unix_millis
+from gnss_lib_py.utils.time_conversions import gps_to_unix_millis
+from gnss_lib_py.utils.time_conversions import gps_datetime_to_gps_millis
+
 
 class Sp3(NavData):
     """sp3 specific loading and preprocessing for any GNSS constellation
@@ -74,8 +75,8 @@ def __init__(self, input_path):
                                       int(temp[3]), int(temp[4]), \
                                       int(temp[5]),int(float(temp[6])),\
                                       tzinfo=timezone.utc )
-                gps_millis_timestep = datetime_to_gps_millis(curr_time)
-                unix_millis_timestep = datetime_to_unix_millis(curr_time)
+                gps_millis_timestep = gps_datetime_to_gps_millis(curr_time)
+                unix_millis_timestep = gps_to_unix_millis(gps_millis_timestep)
 
             if 'P' in dval[0]:
                 # A satellite record.  Get the satellite number, and coordinate (X,Y,Z) info

tests/parsers/test_clk.py

@@ -137,9 +137,9 @@ def test_load_clkdata_nodata(clk_path_nodata):
 
 @pytest.mark.parametrize('row_name, prn, index, exp_value',
                         [('b_sv_m', 'G15', 0, -0.00015303409205*consts.C),
-                         ('gps_millis', 'G05', 5, 1303668168000.0),
+                         ('gps_millis', 'G05', 5, 1303668150000.0),
                          ('b_sv_m', 'R08', 16, -5.87550990462e-05*consts.C),
-                         ('gps_millis', 'R14', 10, 1303668318000.0),
+                         ('gps_millis', 'R14', 10, 1303668300000.0),
                         ]
                         )
 def test_clkgps_value_check(clkdata, prn, row_name, index, exp_value):