From 2e453a71f3c313a6a603377b269be639836a88d4 Mon Sep 17 00:00:00 2001 From: Francia Csaba Date: Mon, 22 Jan 2024 12:39:25 +0100 Subject: [PATCH] #19 Added driver and additional ridesharing info to gtfs.py --- amarillo/app/models/gtfs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amarillo/app/models/gtfs.py b/amarillo/app/models/gtfs.py index 0fbd2f2..77026b1 100644 --- a/amarillo/app/models/gtfs.py +++ b/amarillo/app/models/gtfs.py @@ -1,18 +1,18 @@ from collections import namedtuple from datetime import timedelta -# TODO: create namedtuples for driver.txt and additional_ridesharing_info.txt -# TODO: add driver_id to GtfsTrip GtfsFeedInfo = namedtuple('GtfsFeedInfo', 'feed_id feed_publisher_name feed_publisher_url feed_lang feed_version') GtfsAgency = namedtuple('GtfsAgency', 'agency_id agency_name agency_url agency_timezone agency_lang agency_email') GtfsRoute = namedtuple('GtfsRoute', 'agency_id route_id route_long_name route_type route_short_name') GtfsStop = namedtuple('GtfsStop', 'stop_id stop_lat stop_lon stop_name') GtfsStopTime = namedtuple('GtfsStopTime', 'trip_id departure_time arrival_time stop_id stop_sequence pickup_type drop_off_type timepoint') -GtfsTrip = namedtuple('GtfsTrip', 'route_id trip_id service_id shape_id trip_headsign bikes_allowed trip_url') +GtfsTrip = namedtuple('GtfsTrip', 'route_id trip_id driver_id service_id shape_id trip_headsign bikes_allowed trip_url') GtfsCalendar = namedtuple('GtfsCalendar', 'service_id start_date end_date monday tuesday wednesday thursday friday saturday sunday') GtfsCalendarDate = namedtuple('GtfsCalendarDate', 'service_id date exception_type') GtfsShape = namedtuple('GtfsShape','shape_id shape_pt_lon shape_pt_lat shape_pt_sequence') +GtfsDriver = namedtuple('GtfsDriver','driver_id profile_picture rating') +GtfsAdditionalRidesharingInfo = namedtuple('GtfsAdditionalRidesharingInfo','trip_id number_free_seats same_gender luggage_size animal_car car_model car_brand creation_date smoking payment_method') # TODO Move to utils class GtfsTimeDelta(timedelta):