TDTP
/
tdtp_parada_v2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database reference

main
ifiguero 2025-02-03 03:46:09 -03:00
parent 9412bf0247
commit ebd3ee4edc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tpmcqr_service/api/utils.py
View File

@ -1,5 +1,5 @@
from tpmcqr_service import redis_client, db from tpmcqr_service import redis_client
from tpmcqr_service.models.gtfs import QRDev, Shapes, find_shape_position from tpmcqr_service.models.gtfs import QRDev, Shapes, find_shape_position
import time import time
@ -10,7 +10,7 @@ def calcula_distancias_parada(redis_id, parada_id):
salida_parada = dict() salida_parada = dict()
devdb = db.query(QRDev).filter(QRDev.id_dispositivo==parada_id).one_or_none() devdb = QRDev.query.filter(QRDev.id_dispositivo==parada_id).one_or_none()
if not devdb: if not devdb:
salida_parada['debug'] = 'Invalid Request' salida_parada['debug'] = 'Invalid Request'
return 400, salida_parada return 400, salida_parada
@ -94,13 +94,13 @@ def estima_llegada(parada_distance, expedicion):
def obtiene_datos_parada(id_paradero): def obtiene_datos_parada(id_paradero):
parada = db.query(Paradero).filter(Paradero.id_paradero==id_paradero).one_or_none() parada = Paradero.query.filter(Paradero.id_paradero==id_paradero).one_or_none()
if parada is None: if parada is None:
return None return None
return parada return parada
def obtiene_lineas_parada(id_paradero): def obtiene_lineas_parada(id_paradero):
lineas = [] lineas = []
for linea in db.query(Trip).filter(Trip.id_paradero == id_paradero).distict(Trip.id_linea).all(): for linea in Trip.query.filter(Trip.id_paradero == id_paradero).distict(Trip.id_linea).all():
lineas.append(linea.id_linea) lineas.append(linea.id_linea)
return lineas return lineas

2
tpmcqr_service/models/gtfs.py
View File

@ -61,7 +61,7 @@ def find_shape_position(shape_id, lat, lng):
point = func.ST_SetSRID(func.ST_MakePoint(lng, lat), 4326) # Create PostGIS point point = func.ST_SetSRID(func.ST_MakePoint(lng, lat), 4326) # Create PostGIS point
segmento = db.query( segmento = db.session.query(
Shape1.shape_pt_sequence.label("start_sequence"), Shape1.shape_pt_sequence.label("start_sequence"),
# Shape2.shape_pt_sequence.label("end_sequence"), # Shape2.shape_pt_sequence.label("end_sequence"),
Shape1.shape_dist_traveled.label("traveled_start"), Shape1.shape_dist_traveled.label("traveled_start"),