# HG changeset patch # User Teemu Piippo # Date 1512593265 -7200 # Node ID 4f8a67d5d79e45d8fa2cb0ec8e8077752b33fb8b # Parent 3bd33720f1e37a00407efafd5295b28b3ad78346 Käytä lähtöaikoja diff -r 3bd33720f1e3 -r 4f8a67d5d79e buses.py --- a/buses.py Fri Dec 01 08:04:57 2017 +0200 +++ b/buses.py Wed Dec 06 22:47:45 2017 +0200 @@ -114,7 +114,7 @@ stop = trip.contains_stop(self) if stop and (arrivals or not stop.is_arrival) and stop is not trip.schedule[-1]: # ja jos tämä halt on tulevaisuudessa, - stop_time = datetime.combine(date, time()) + stop.arrival_time + stop_time = datetime.combine(date, time()) + stop.departure_time if stop_time + timedelta(minutes = 1) >= now(): # lisää halt listaan. result.append({ diff -r 3bd33720f1e3 -r 4f8a67d5d79e busroute.py --- a/busroute.py Fri Dec 01 08:04:57 2017 +0200 +++ b/busroute.py Wed Dec 06 22:47:45 2017 +0200 @@ -25,10 +25,6 @@ else: have_already.add(route[i]) i += 1 - -# if 'kauppatori' not in route: -# priorities['länsikeskus'] = priorities['skanssi'] = priorities['kauppatori'] - from_place = route[0] destination = route[-1] reitti_arvot = {}