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

fix

main
ifiguero 2025-02-03 03:17:12 -03:00
parent ede439e013
commit f5002f012d
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tpmcqr_service/models/gtfs.py
View File

@ -7,27 +7,27 @@ from zoneinfo import ZoneInfo
class Lineas(db.Model): class Lineas(db.Model):
__tablename__ = 'linea' __tablename__ = 'linea'
__table_args__ = { 'schema': 'public' } __table_args__ = { 'schema': 'public' }
id_linea = db.Column(db.String(150), primary_key=True ) id_linea = db.Column(db.String(150), primary_key=True )
id_operador = db.Column(db.String(150)) id_operador = db.Column(db.String(150))
route_short_name = db.Column(db.String(150)) route_short_name = db.Column(db.String(150))
route_long_name = db.Column(db.String(150)) route_long_name = db.Column(db.String(150))
route_color = db.Column(db.String(150)) route_color = db.Column(db.String(150))
route_text_color = db.Column(db.String(150)) route_text_color = db.Column(db.String(150))
vigente = db.Column(db.Boolean) vigente = db.Column(db.Boolean)
class QRDev(db.Model): class QRDev(db.Model):
__tablename__ = 'device' __tablename__ = 'device'
__table_args__ = { 'schema': 'public' } __table_args__ = { 'schema': 'public' }
id_dispositivo = db.Column(db.String(100), primary_key=True ) id_dispositivo = db.Column(db.String(100), primary_key=True )
id_paradero = db.Column(db.String(50)) id_paradero = db.Column(db.String(50))
class Paradero(db.Model): class Paradero(db.Model):
__tablename__ = 'paredero' __tablename__ = 'paredero'
__table_args__ = { 'schema': 'public' } __table_args__ = { 'schema': 'public' }
id_paradero = db.Column(db.String(50), primary_key=True ) id_paradero = db.Column(db.String(50), primary_key=True )
stop_name = db.Column(db.String(50)) stop_name = db.Column(db.String(50))
@ -35,24 +35,24 @@ class Paradero(db.Model):
stop_lon = db.Column(db.Float) stop_lon = db.Column(db.Float)
class Shapes(db.Model): class Shapes(db.Model):
__tablename__ = 'gtfs_shape' __tablename__ = 'gtfs_shape'
__table_args__ = { 'schema': 'public' } __table_args__ = { 'schema': 'public' }
id_gtfs_pk = db.Column(db.Integer, primary_key=True ) id_gtfs_pk = db.Column(db.Integer, primary_key=True )
id_shape = db.Column(db.String(150)) id_shape = db.Column(db.String(150))
shape_pt_lat = db.Column(db.Float) shape_pt_lat = db.Column(db.Float)
shape_pt_lon = db.Column(db.Float) shape_pt_lon = db.Column(db.Float)
shape_pt_sequence = db.Column(db.Integer) shape_pt_sequence = db.Column(db.Integer)
shape_dist_traveled = db.Column(db.Float) shape_dist_traveled = db.Column(db.Float)
class Trips(Base): class Trips(Base):
__tablename__ = 'gtfs_trips' __tablename__ = 'gtfs_trips'
__table_args__ = { 'schema': 'public' } __table_args__ = { 'schema': 'public' }
id_trip = Column(String(150), primary_key=True) id_trip = Column(String(150), primary_key=True)
id_linea = Column(String(150)) id_linea = Column(String(150))
id_shape = Column(String(150)) id_shape = Column(String(150))
service_id = Column(String(50)) service_id = Column(String(50))
def find_shape_position(shape_id, lat, lng): def find_shape_position(shape_id, lat, lng):
@ -63,7 +63,7 @@ def find_shape_position(shape_id, lat, lng):
segmento = db.query( segmento = db.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"),
Shape2.shape_dist_traveled.label("traveled_end"), Shape2.shape_dist_traveled.label("traveled_end"),
func.ST_Distance( func.ST_Distance(