ynerant/trainvel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ynerant:28faf5ad10b301aa7d2f88897d5b0ef2de405bd1
Branches Tags
ynerant:main
..
compare: ynerant:2803cfe06281a535d9ab0ae217cd210983d8b437
Branches Tags
ynerant:main

3 Commits
28faf5ad10 ... 2803cfe062

Author SHA1 Message Date
Emmy D'Anello
2803cfe062
Fix error message 2024-02-10 20:35:55 +01:00
Emmy D'Anello
347f1dfa60
Remove debug code 2024-02-10 20:35:18 +01:00
Emmy D'Anello
72e00ae781
Take delay into account in the next departures/arrivals tables 2024-02-10 20:35:00 +01:00
2 changed files with 5 additions and 8 deletions
Show Stats Expand all files Collapse all files

8
sncf/api/views.py
View File

@ -177,14 +177,14 @@ class NextDeparturesViewSet(viewsets.ReadOnlyModelViewSet):
~Q(update__departure_time=datetime.fromtimestamp(0))) ~Q(update__departure_time=datetime.fromtimestamp(0)))
qs_today = StopTime.objects.filter(stop_filter) \ qs_today = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=query_time)) \ .filter(Q(departure_time__gte=query_time - F('update__departure_delay'))) \
.filter(Q(pickup_type=0) | canceled_filter(query_date)) \ .filter(Q(pickup_type=0) | canceled_filter(query_date)) \
.filter(calendar_filter(query_date)) \ .filter(calendar_filter(query_date)) \
.annotate(departure_date=Value(query_date)) \ .annotate(departure_date=Value(query_date)) \
.annotate(departure_time_24h=F('departure_time')) .annotate(departure_time_24h=F('departure_time'))
qs_yesterday = StopTime.objects.filter(stop_filter) \ qs_yesterday = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=time_yesterday)) \ .filter(Q(departure_time__gte=time_yesterday - F('update__departure_delay'))) \
.filter(Q(pickup_type=0) | canceled_filter(yesterday)) \ .filter(Q(pickup_type=0) | canceled_filter(yesterday)) \
.filter(calendar_filter(yesterday)) \ .filter(calendar_filter(yesterday)) \
.annotate(departure_date=Value(yesterday)) \ .annotate(departure_date=Value(yesterday)) \
@ -249,14 +249,14 @@ class NextArrivalsViewSet(viewsets.ReadOnlyModelViewSet):
~Q(update__arrival_time=datetime.fromtimestamp(0))) ~Q(update__arrival_time=datetime.fromtimestamp(0)))
qs_today = StopTime.objects.filter(stop_filter) \ qs_today = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=query_time)) \ .filter(Q(departure_time__gte=query_time - F('update__arrival_delay'))) \
.filter(Q(drop_off_type=0) | canceled_filter(query_date)) \ .filter(Q(drop_off_type=0) | canceled_filter(query_date)) \
.filter(calendar_filter(query_date)) \ .filter(calendar_filter(query_date)) \
.annotate(arrival_date=Value(query_date)) \ .annotate(arrival_date=Value(query_date)) \
.annotate(arrival_time_24h=F('arrival_time')) .annotate(arrival_time_24h=F('arrival_time'))
qs_yesterday = StopTime.objects.filter(stop_filter) \ qs_yesterday = StopTime.objects.filter(stop_filter) \
.filter(Q(departure_time__gte=time_yesterday)) \ .filter(Q(departure_time__gte=time_yesterday - F('update__arrival_delay'))) \
.filter(Q(drop_off_type=0) | canceled_filter(yesterday)) \ .filter(Q(drop_off_type=0) | canceled_filter(yesterday)) \
.filter(calendar_filter(yesterday)) \ .filter(calendar_filter(yesterday)) \
.annotate(arrival_date=Value(yesterday)) \ .annotate(arrival_date=Value(yesterday)) \

5
sncfgtfs/management/commands/update_sncf_gtfs_rt.py
View File

@ -27,9 +27,6 @@ class Command(BaseCommand):
feed_message = FeedMessage() feed_message = FeedMessage()
feed_message.ParseFromString(requests.get(feed_url).content) feed_message.ParseFromString(requests.get(feed_url).content)
with open("toto.txt", "w") as f:
f.write(str(feed_message))
stop_times_updates = [] stop_times_updates = []
for entity in feed_message.entity: for entity in feed_message.entity:
@ -75,7 +72,7 @@ class Command(BaseCommand):
continue continue
elif len(route_ids) > 1: elif len(route_ids) > 1:
self.stdout.write(f"Multiple routes found for trip {trip_id}.") self.stdout.write(f"Multiple routes found for trip {trip_id}.")
self.stderr.write(", ".join(route_ids)) self.stdout.write(", ".join(route_ids))
route_id = route_ids.pop() route_id = route_ids.pop()
Calendar.objects.update_or_create( Calendar.objects.update_or_create(