|
|
@@ -65,16 +65,16 @@ class ZipCSVProcessor:
|
|
|
|
|
|
# Define column mappings more clearly
|
|
|
EGO_COLS_NEW = [
|
|
|
- "simTime", "simFrame", "playerId", "v", "speedX", "speedY",
|
|
|
+ "simTime", "simFrame", "playerId", "v", "speedX", "speedY", "speedZ",
|
|
|
"posH", "pitch", "roll", "roll_rate", "pitch_rate", "speedH", "posX", "posY", "accelX", "accelY", "accelZ",
|
|
|
"travelDist", "composite_v", "relative_dist", "x_relative_dist", "y_relative_dist", "type" # Added type
|
|
|
]
|
|
|
OBJ_COLS_OLD_SUFFIXED = [
|
|
|
- "v_obj", "speedX_obj", "speedY_obj", "posH_obj", "pitch_obj", "roll_obj", "roll_rate_obj", "pitch_rate_obj", "speedH_obj",
|
|
|
+ "v_obj", "speedX_obj", "speedY_obj", "speedZ_obj", "posH_obj", "pitch_obj", "roll_obj", "roll_rate_obj", "pitch_rate_obj", "speedH_obj",
|
|
|
"posX_obj", "posY_obj", "accelX_obj", "accelY_obj", "accelZ_obj", "travelDist_obj"
|
|
|
]
|
|
|
OBJ_COLS_MAPPING = {old: new for old, new in
|
|
|
- zip(OBJ_COLS_OLD_SUFFIXED, EGO_COLS_NEW[3:18])} # Map suffixed cols to standard names
|
|
|
+ zip(OBJ_COLS_OLD_SUFFIXED, EGO_COLS_NEW[3:19])} # Map suffixed cols to standard names
|
|
|
|
|
|
def __init__(self, config: Config):
|
|
|
self.config = config
|
|
|
@@ -110,6 +110,7 @@ class ZipCSVProcessor:
|
|
|
"v": "speed",
|
|
|
"speedY": "y_speed",
|
|
|
"speedX": "x_speed",
|
|
|
+ "speedZ": "z_speed",
|
|
|
"posH": "yaw",
|
|
|
"pitch": "tilt",
|
|
|
"roll": "roll",
|
|
|
@@ -129,7 +130,7 @@ class ZipCSVProcessor:
|
|
|
"y_relative_dist": "y_distance",
|
|
|
"type": None # Will be set later
|
|
|
},
|
|
|
- "db_columns": ["ID", "second", "usecond", "speed", "y_speed", "x_speed", "tilt_rate", "z_acceleration",
|
|
|
+ "db_columns": ["ID", "second", "usecond", "speed", "y_speed", "x_speed", "z_speed", "tilt_rate", "z_acceleration",
|
|
|
"yaw", "tilt", "roll", "yaw_rate", "latitude_dd", "longitude_dd", "roll_rate", "total_distance",
|
|
|
"x_acceleration", "y_acceleration", "total_distance", "distance", "x_distance", "y_distance"] # Actual cols to SELECT
|
|
|
}
|
|
|
@@ -142,6 +143,7 @@ class ZipCSVProcessor:
|
|
|
"v": "VUT_Speed_mps",
|
|
|
"speedX": "VUT_Speed_x_mps",
|
|
|
"speedY": "VUT_Speed_y_mps",
|
|
|
+ "speedZ": "VUT_Speed_z_mps",
|
|
|
"speedH": "VUT_Yaw_Rate",
|
|
|
"posX": "VUT_GPS_Latitude", # Source before projection
|
|
|
"posY": "VUT_GPS_Longitude", # Source before projection
|
|
|
@@ -157,6 +159,7 @@ class ZipCSVProcessor:
|
|
|
"v_obj": "Speed_mps",
|
|
|
"speedX_obj": "UFO_Speed_x_mps",
|
|
|
"speedY_obj": "UFO_Speed_y_mps",
|
|
|
+ "speedZ_obj": "UFO_Speed_z_mps",
|
|
|
"speedH_obj": "Yaw_Rate",
|
|
|
"posX_obj": "GPS_Latitude", # Source before projection
|
|
|
"posY_obj": "GPS_Longitude", # Source before projection
|
