@@ -197,18 +197,22 @@ def test_derived_df_equivalence(derived_path, pd_df, derived_row_map):
197197 derived = android .AndroidDerived2021 (derived_path ,
198198 remove_timing_outliers = False )
199199 measure_df = derived .pandas_df ()
200- constellation_map = {0. :"unkown" ,
201- 1. :"gps" ,
202- 2. :"sbas" ,
203- 3. :"glonass" ,
204- 4. :"qzss" ,
205- 5. :"beidou" ,
206- 6. :"galileo" ,
207- 7. :"irnss" ,
208- }
209200 measure_df .replace ({'gnss_id' ,"gps" },1 ,inplace = True )
210201 measure_df .replace ({'gnss_id' ,"glonass" },3 ,inplace = True )
211202 measure_df .replace ({'gnss_id' ,"galileo" },6 ,inplace = True )
203+ signal_map = {"GPS_L1" : "l1" ,
204+ "GPS_L5" : "l5" ,
205+ "GAL_E1" : "e1" ,
206+ "GAL_E5A" : "e5a" ,
207+ "GLO_G1" : "g1" ,
208+ "QZS_J1" : "j1" ,
209+ "QZS_J5" : "j5" ,
210+ "BDS_B1I" : "b1i" ,
211+ "BDS_B1C" : "b1c" ,
212+ "BDS_B2A" : "b2a" ,
213+ }
214+ for s_key , s_value in signal_map .items ():
215+ measure_df .replace ({'signal_type' ,s_value },s_key ,inplace = True )
212216 measure_df .rename (columns = derived_row_map , inplace = True )
213217 measure_df = measure_df .drop (columns = 'corr_pr_m' )
214218 pd .testing .assert_frame_equal (pd_df .sort_index (axis = 1 ),
@@ -225,7 +229,7 @@ def test_derived_df_equivalence(derived_path, pd_df, derived_row_map):
225229 ('vz_sv_mps' , 0 , 3559.812 ),
226230 ('b_dot_sv_mps' , 0 , 0.001 ),
227231 ('signal_type' , 0 ,
228- np .asarray ([['GLO_G1 ' ]], dtype = object ))]
232+ np .asarray ([['g1 ' ]], dtype = object ))]
229233 )
230234def test_derived_value_check (derived , row_name , index , value ):
231235 """Check AndroidDerived2021 entries against known values.
0 commit comments