# HG changeset patch # User Teemu Piippo # Date 1497943970 -10800 # Node ID 69cc75506d4fa2547908c8da23be3bc4c54652a5 # Parent cb423946cf3314ad8062b31465ba0bb8cc9bf1be - diff -r cb423946cf33 -r 69cc75506d4f buses.py --- a/buses.py Tue Jun 20 10:30:47 2017 +0300 +++ b/buses.py Tue Jun 20 10:32:50 2017 +0300 @@ -358,7 +358,7 @@ print('Ladataan aikataulut... ', end = '', flush = True, file = stderr) with open('gtfs/stop_times.txt') as file: - rivimäärä = sum(line.count('\n') for line in file) + row_count = sum(line.count('\n') for line in file) progress = 0 file.seek(0) for row in read_csv(file): @@ -370,5 +370,5 @@ trip.schedule.append(BusHalt(arrival_time, departure_time, stop, trip, traveled_distance)) progress += 1 if progress % 1000 == 0: - print('\rLadataan aikataulut... %.1f%%' % (progress * 100 / rivimäärä), end = ' ', file = stderr) + print('\rLadataan aikataulut... %.1f%%' % (progress * 100 / row_count), end = ' ', file = stderr) print('\rLadataan aikataulut... ladattu', file = stderr) diff -r cb423946cf33 -r 69cc75506d4f templates/cluster.html --- a/templates/cluster.html Tue Jun 20 10:30:47 2017 +0300 +++ b/templates/cluster.html Tue Jun 20 10:32:50 2017 +0300 @@ -3,7 +3,7 @@ - {{nimi}} + {{name}}