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