Minimap: read ticks.parquet instead of world.preview.jsonl

src/lib/api/world.ts

@@ -1,5 +1,6 @@
 import type { PreviewChunk } from '$lib/types';
 import type { FetchOpts } from '$lib/api/hub';
+import { fetchParquetRows } from '$lib/api/parquet';
 
 // One player's pose at one sampled tick. Round-relative `t` (seconds).
 export type WorldFrame = {
@@ -29,67 +30,55 @@ export type RoundWorld = {
 
 const cache = new Map<string, Promise<RoundWorld>>();
 
-// preview_video.src is ".../player=N/previews/chunk_NNN/preview.mp4" — strip
-// the filename to get the chunk dir we'll resolve sibling assets against.
+// preview_video.src is ".../round=R/player=N/video.preview.mp4" — strip the
+// filename to get the per-POV dir we'll resolve sibling assets against.
 function chunkBaseUrl(chunk: PreviewChunk): string {
 	return chunk.preview_video.src.replace(/\/[^/]+$/, '');
 }
 
-type WorldColumns = {
-	t: number[];
-	steamid: (number | string)[];
-	name: string[];
-	team_num: number[];
-	is_alive: boolean[];
-	health: number[];
-	armor_value: number[];
-	X: number[];
-	Y: number[];
-	Z: number[];
-};
+// CS2 team_num values — matches the demo schema convention.
+const TEAM_T = 2;
+const TEAM_CT = 3;
 
-type InputsJson = {
-	t: number[];
-	view?: { yaw?: number[] };
+type TickRow = {
+	t: number;
+	position_x: number;
+	position_y: number;
+	position_z: number;
+	view_yaw?: number;
+	health: number;
+	armor?: number;
+	is_alive: boolean;
 };
 
 async function loadChunkFrames(
 	chunk: PreviewChunk,
-	chunkStartT: number,
 	player: number,
 	opts: FetchOpts
 ): Promise<WorldFrame[]> {
 	const base = chunkBaseUrl(chunk);
-	const fetchFn = opts.fetch ?? fetch;
-	const [worldR, inputsR] = await Promise.all([
-		fetchFn(`${base}/world.preview.jsonl`, { signal: opts.signal }),
-		fetchFn(`${base}/inputs.preview.json`, { signal: opts.signal })
-	]);
-	if (!worldR.ok) return [];
-	const worldText = await worldR.text();
-	// JSONL with one columnar object on the first line.
-	const firstLine = worldText.split('\n').find((l) => l.trim().length > 0);
-	if (!firstLine) return [];
-	const world = JSON.parse(firstLine) as WorldColumns;
-	const inputs: InputsJson | null = inputsR.ok ? await inputsR.json() : null;
-	const yawArr = inputs?.view?.yaw;
-
-	const n = world.t.length;
-	const frames: WorldFrame[] = new Array(n);
-	for (let i = 0; i < n; i++) {
+	const rows = await fetchParquetRows<TickRow>(`${base}/ticks.parquet`, opts);
+
+	const steamid = `slot-${player}`;
+	const name = `Player ${player}`;
+	const team_num = chunk.player_side === 'CT' ? TEAM_CT : TEAM_T;
+
+	const frames: WorldFrame[] = new Array(rows.length);
+	for (let i = 0; i < rows.length; i++) {
+		const r = rows[i];
 		frames[i] = {
-			t: chunkStartT + world.t[i],
+			t: r.t,
 			player,
-			steamid: String(world.steamid[i]),
-			name: world.name[i],
-			team_num: world.team_num[i],
-			is_alive: world.is_alive[i],
-			health: world.health[i],
-			armor_value: world.armor_value[i],
-			X: world.X[i],
-			Y: world.Y[i],
-			Z: world.Z[i],
-			yaw: yawArr?.[i]
+			steamid,
+			name,
+			team_num,
+			is_alive: r.is_alive,
+			health: r.health,
+			armor_value: r.armor ?? 0,
+			X: r.position_x,
+			Y: r.position_y,
+			Z: r.position_z,
+			yaw: r.view_yaw
 		};
 	}
 	return frames;
@@ -124,14 +113,11 @@ export async function loadRoundWorld(
 
 		const players: PlayerSeries[] = await Promise.all(
 			Array.from(byPlayer.entries()).map(async ([player, list]) => {
+				// opencs2_dataset has one ticks.parquet per (round, player); pick
+				// the lowest-chunk-index row defensively in case an upstream still
+				// emits multiple.
 				list.sort((a, b) => a.chunk_index - b.chunk_index);
-				let startT = 0;
-				const frames: WorldFrame[] = [];
-				for (const c of list) {
-					const f = await loadChunkFrames(c, startT, player, opts);
-					frames.push(...f);
-					startT += c.duration_s || 0;
-				}
+				const frames = await loadChunkFrames(list[0], player, opts);
 				return { player, frames };
 			})
 		);