diff --git a/project/api/views/linea.py b/project/api/views/linea.py index f0678b2..bae44af 100755 --- a/project/api/views/linea.py +++ b/project/api/views/linea.py @@ -49,16 +49,28 @@ class LineaViewSet(viewsets.ModelViewSet): l.route_text_color, \ gp.vehicle_license_plate as Patente_vehiculo, \ speed::numeric(5,2) as speed, \ - gp.latitude \ + gp.longitude::numeric, \ + gp.latitude::numeric \ from gtfs_posiciones gp \ - inner join linea l on gp.route_id = l.id_linea \ - where route_id = %s" + inner join linea l on (trim(gp.route_id)||'-'||trim(gp.direction_id::varchar)) = l.id_linea \ + where l.id_linea = %s" with connection.cursor() as cursor: cursor.execute(query, [ pk ]) rows = cursor.fetchall() - return JsonResponse(rows, safe=False) + buses = [] + for row in rows: + buses.append({ + 'route_color': row[0], + 'route_text_color': row[1], + 'Patente_vehiculo': row[2], + 'speed': row[3], + 'longitude': row[4], + 'latitude': row[5], + }) + + return JsonResponse(buses, safe=False)