|
|
@@ -172,15 +172,15 @@ class DBManager():
|
|
|
@staticmethod
|
|
|
def _convert_to_dataframe_gps(data, mode=0):
|
|
|
if mode == 0:
|
|
|
- if data['info']['subType'] == 1:
|
|
|
+ # if data['info']['subType'] == 1:
|
|
|
data_block = np.array([data['info'].get('obdTime',None),data['ffGps'].get('locationType',None), data['ffGps'].get('satellites',None),
|
|
|
data['ffGps'].get('latitude',None),data['ffGps'].get('longitude',None),data['ffGps'].get('speed',None),
|
|
|
data['ffGps'].get('altitude',None), data['ffGps'].get('direction', None), data['ffGps'].get('mileage',None)]).reshape(1,9)
|
|
|
df = pd.DataFrame(
|
|
|
columns=['时间戳','定位类型', '卫星数','纬度','经度','速度[km/h]','海拔','航向', '里程/m'],data=data_block)
|
|
|
- elif data['info']['subType'] == 2:
|
|
|
- df = pd.DataFrame(
|
|
|
- columns=['时间戳','定位类型', '卫星数','纬度','经度','速度[km/h]','海拔','航向'])
|
|
|
+ # elif data['info']['subType'] == 2:
|
|
|
+ # df = pd.DataFrame(
|
|
|
+ # columns=['时间戳','定位类型', '卫星数','纬度','经度','速度[km/h]','海拔','航向'])
|
|
|
if mode == 1:
|
|
|
data_block = np.array([data['info']['obdTime'],data['ffGps']['locationType'],data['ffGps']['latitude'],data['ffGps']['longitude']
|
|
|
,data['ffGps']['speed'], data['ffGps']['isValid']]).reshape(1,6)
|
