feat: motor de calculo real de llegadas de buses por parada - reemplaza datos mock con logica usando travel_time_minutes + horarios del dia, con soporte GPS para tiempos de espera en tiempo real
This commit is contained in:
@ -2,6 +2,41 @@
|
||||
import { supabase } from '@/supabase'
|
||||
import type { BusStop, Route } from '@/types'
|
||||
|
||||
// Map JS getDay() (0=Sun,6=Sat) to Spanish day names used in dias_operacion
|
||||
const DAY_MAP: Record<number, string> = {
|
||||
0: 'domingo',
|
||||
1: 'lunes',
|
||||
2: 'martes',
|
||||
3: 'miercoles',
|
||||
4: 'jueves',
|
||||
5: 'viernes',
|
||||
6: 'sabado'
|
||||
}
|
||||
|
||||
/** Convert "HH:MM:SS" time string to total minutes since midnight */
|
||||
function timeToMinutes(t: string): number {
|
||||
const parts = t.split(':')
|
||||
return parseInt(parts[0] || '0') * 60 + parseInt(parts[1] || '0')
|
||||
}
|
||||
|
||||
/** Convert total minutes since midnight back to "HH:MM" string */
|
||||
function minutesToTime(m: number): string {
|
||||
const safeM = ((m % 1440) + 1440) % 1440 // wrap around midnight
|
||||
const h = Math.floor(safeM / 60)
|
||||
const min = safeM % 60
|
||||
return `${h.toString().padStart(2, '0')}:${min.toString().padStart(2, '0')}`
|
||||
}
|
||||
|
||||
export interface BusArrival {
|
||||
routeName: string
|
||||
routeId: string
|
||||
arrivalTime: string // "HH:MM" when bus arrives at this stop
|
||||
waitMinutes: number | null // null = no GPS, raw schedule shown
|
||||
hasGps: boolean
|
||||
departureTime: string // "HH:MM" when bus departs origin
|
||||
alreadyPassed: boolean // true if bus has already passed this stop
|
||||
}
|
||||
|
||||
export const busStopsService = {
|
||||
/** Get all bus stops */
|
||||
async getAllBusStops(): Promise<BusStop[]> {
|
||||
@ -29,20 +64,121 @@ export const busStopsService = {
|
||||
return (data || []).map((row: any) => row.routes) as Route[]
|
||||
},
|
||||
|
||||
/** Get estimated next bus arrivals (Mock Data) */
|
||||
async getNextBusArrivals(_stopId: string): Promise<{ routeName: string; arrivalTime: string }[]> {
|
||||
// Mock delay to simulate network request
|
||||
await new Promise(resolve => setTimeout(resolve, 500));
|
||||
/**
|
||||
* Real-time bus arrival calculator for a specific stop.
|
||||
*
|
||||
* Logic:
|
||||
* 1. Get all routes passing through this stop + their travel_time_minutes to the stop
|
||||
* 2. Get today's published schedules for those routes
|
||||
* 3. For each schedule: arrivalAtStop = departure_time + travel_time_minutes
|
||||
* 4. With GPS: filter to buses not yet passed, calculate wait minutes
|
||||
* Without GPS: show all future arrivals as raw times for today (option A)
|
||||
* 5. Return sorted by arrivalTime asc, max 8 results within next 2 hours
|
||||
*/
|
||||
async getNextBusesForStop(stopId: string, userLat?: number, userLng?: number): Promise<BusArrival[]> {
|
||||
const hasGps = userLat !== undefined && userLng !== undefined
|
||||
|
||||
// Generate some random mock arrivals
|
||||
const mockArrivals = [
|
||||
{ routeName: "Ruta Boquete - David", arrivalTime: "5 min" },
|
||||
{ routeName: "Ruta David - Boquete", arrivalTime: "12 min" },
|
||||
{ routeName: "Ruta Circular", arrivalTime: "25 min" }
|
||||
];
|
||||
// ── STEP 1: Get route_stops entries for this stop (includes travel_time_minutes) ──
|
||||
const { data: routeStopsData, error: rsError } = await supabase
|
||||
.from('route_stops')
|
||||
.select('route_id, travel_time_minutes, stop_delay_minutes')
|
||||
.eq('stop_id', stopId)
|
||||
|
||||
// Randomly return 1-3 arrivals
|
||||
return mockArrivals.slice(0, Math.floor(Math.random() * 3) + 1);
|
||||
if (rsError) throw new Error(rsError.message)
|
||||
if (!routeStopsData || routeStopsData.length === 0) return []
|
||||
|
||||
const routeIds = routeStopsData.map((rs: any) => rs.route_id)
|
||||
|
||||
// Build a lookup: routeId → travel_time_minutes to THIS stop
|
||||
const travelTimeMap: Record<string, number> = {}
|
||||
for (const rs of routeStopsData as any[]) {
|
||||
travelTimeMap[rs.route_id] = (rs.travel_time_minutes || 0) + (rs.stop_delay_minutes || 0)
|
||||
}
|
||||
|
||||
// ── STEP 2: Get routes metadata (name) ──
|
||||
const { data: routesData, error: routesError } = await supabase
|
||||
.from('routes')
|
||||
.select('id, name')
|
||||
.in('id', routeIds)
|
||||
|
||||
if (routesError) throw new Error(routesError.message)
|
||||
const routeNameMap: Record<string, string> = {}
|
||||
for (const r of (routesData || []) as any[]) {
|
||||
routeNameMap[r.id] = r.name
|
||||
}
|
||||
|
||||
// ── STEP 3: Get today's schedules ──
|
||||
const now = new Date()
|
||||
const todayDay = DAY_MAP[now.getDay()]
|
||||
const nowMinutes = now.getHours() * 60 + now.getMinutes()
|
||||
|
||||
const { data: schedulesData, error: schError } = await supabase
|
||||
.from('bus_schedules')
|
||||
.select('route_id, departure_time, dias_operacion')
|
||||
.in('route_id', routeIds)
|
||||
.eq('is_published', true)
|
||||
.order('departure_time', { ascending: true })
|
||||
|
||||
if (schError) throw new Error(schError.message)
|
||||
if (!schedulesData || schedulesData.length === 0) return []
|
||||
|
||||
// ── STEP 4: Calculate arrival time for each schedule at THIS stop ──
|
||||
const arrivals: BusArrival[] = []
|
||||
|
||||
for (const sched of schedulesData as any[]) {
|
||||
// Check if this schedule runs today
|
||||
const diasOp: string[] = sched.dias_operacion || []
|
||||
if (!todayDay || !diasOp.includes(todayDay)) continue
|
||||
|
||||
|
||||
const depMinutes = timeToMinutes(sched.departure_time)
|
||||
const travelMins = travelTimeMap[sched.route_id] ?? 0
|
||||
const arrivalMinutes = depMinutes + travelMins
|
||||
|
||||
// Handle midnight crossover (e.g. departure 23:50 + 20min travel = 00:10 next day)
|
||||
const arrivalMinutesNormalized = arrivalMinutes % 1440
|
||||
|
||||
const alreadyPassed = arrivalMinutesNormalized < nowMinutes
|
||||
const waitMinutes = hasGps ? (arrivalMinutesNormalized - nowMinutes) : null
|
||||
|
||||
// Without GPS (option A): show all future arrivals as raw times
|
||||
// With GPS: only show buses that haven't passed yet
|
||||
if (hasGps && alreadyPassed) continue
|
||||
|
||||
// Skip buses more than 3 hours in the future to avoid showing the whole day
|
||||
if (hasGps && waitMinutes !== null && waitMinutes > 180) continue
|
||||
|
||||
// Without GPS: skip past arrivals but show up to next 3 hours anyway
|
||||
if (!hasGps && alreadyPassed && Math.abs(arrivalMinutesNormalized - nowMinutes) > 10) continue
|
||||
|
||||
arrivals.push({
|
||||
routeName: routeNameMap[sched.route_id] || 'Ruta desconocida',
|
||||
routeId: sched.route_id,
|
||||
arrivalTime: minutesToTime(arrivalMinutesNormalized),
|
||||
departureTime: minutesToTime(depMinutes),
|
||||
waitMinutes,
|
||||
hasGps,
|
||||
alreadyPassed
|
||||
})
|
||||
}
|
||||
|
||||
// Sort by arrival time ascending, return first 8
|
||||
arrivals.sort((a, b) => {
|
||||
const aMin = timeToMinutes(a.arrivalTime)
|
||||
const bMin = timeToMinutes(b.arrivalTime)
|
||||
return aMin - bMin
|
||||
})
|
||||
|
||||
return arrivals.slice(0, 8)
|
||||
},
|
||||
|
||||
/**
|
||||
* @deprecated Use getNextBusesForStop instead.
|
||||
* Kept for compatibility — calls the real engine without GPS context.
|
||||
*/
|
||||
async getNextBusArrivals(stopId: string): Promise<{ routeName: string; arrivalTime: string }[]> {
|
||||
const real = await this.getNextBusesForStop(stopId)
|
||||
return real.map(a => ({ routeName: a.routeName, arrivalTime: a.arrivalTime }))
|
||||
},
|
||||
|
||||
/** Create a new bus stop (Admin) */
|
||||
|
||||
Reference in New Issue
Block a user