Thu, 20 Dec 2018 23:11:07 +0200
added Yli-maarian koulu
0 | 1 | #!/usr/bin/env python3 |
48
428cfdf64ccc
Lisätty uudelleenohjauksia
Teemu Piippo <teemu@hecknology.net>
parents:
42
diff
changeset
|
2 | from flask import Flask, render_template, abort, send_from_directory, redirect |
0 | 3 | from datetime import datetime, date, time, timedelta |
87 | 4 | from os import path, listdir, environ |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
5 | from configparser import ConfigParser |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
6 | import locale |
87 | 7 | app = Flask(__name__) |
4 | 8 | from misc import * |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
9 | from busroute import reduce_schedule |
30 | 10 | import buses |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
11 | regions = {} |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
12 | |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
13 | def reset_locale(): |
127 | 14 | ''' |
15 | Resets the locale to system so that the system language settings | |
16 | do not mess with the formatting. | |
17 | ''' | |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
18 | locale.setlocale(locale.LC_ALL, locale.getdefaultlocale()) |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
19 | |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
20 | def activate_locale(language = None): |
127 | 21 | ''' |
22 | Activates either the locale for the provided language, or the default locale. | |
23 | Returns such an object that resets the locale upon function exit. | |
24 | ''' | |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
25 | language = language or language_for_page() |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
26 | class result: |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
27 | def __enter__(self): |
127 | 28 | if language: |
29 | locale.setlocale(locale.LC_ALL, tr('locale', 'other', language = language)) | |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
30 | def __exit__(self, *args): |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
31 | reset_locale() |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
32 | return result() |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
33 | |
127 | 34 | def simplify_name(region_name, replace = False): |
35 | region = regions.get(region_name) | |
36 | if region: | |
37 | if replace and 'replacement' in region: | |
38 | return simplify_name(region['replacement']) | |
39 | return tr(region.get('name', region_name), 'region_short_name', default = region.get('short_name', region_name)) | |
40 | else: | |
41 | return tr(region_name, 'region_short_name') | |
42 | ||
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
43 | reset_locale() |
0 | 44 | |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
45 | # Load translations |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
46 | class Translator: |
127 | 47 | def __init__(self, languages = None): |
48 | self.languages = languages or dict() | |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
49 | def load_language(self, file_path): |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
50 | language_name = path.splitext(path.basename(file_path))[0] |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
51 | ini = ConfigParser() |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
52 | ini.read(path.join(file_path)) |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
53 | self.languages[language_name] = ini |
127 | 54 | def __call__(self, name, *sections, language = None, default = None): |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
55 | language = language or language_for_page() |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
56 | for section in sections: |
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
57 | try: |
127 | 58 | print('Trying:', repr(language), repr(section), repr(name)) |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
59 | return self.languages[language][section][name] |
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
60 | except KeyError: |
72 | 61 | try: |
62 | return profile['tr:' + language + ':' + section][name] | |
63 | except KeyError: | |
64 | pass | |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
65 | else: |
127 | 66 | return default or (name[:1].upper() + name[1:]) |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
67 | def load_region(self, region): |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
68 | for key, value in region.items(): |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
69 | if ':' in key: |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
70 | name_type, language = key.split(':', 1) |
127 | 71 | if name_type.endswith('name') and language != '': |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
72 | section = 'region_' + name_type |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
73 | if section not in self.languages[language]: |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
74 | self.languages[language][section] = {} |
127 | 75 | print(repr(language), repr(section), repr(region['name']), '=', repr(value)) |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
76 | self.languages[language][section][region['name']] = value |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
77 | def load_regions(self, regions): |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
78 | for region in regions.values(): |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
79 | self.load_region(region) |
127 | 80 | def __repr__(self): |
81 | return 'Translator(languages = ' + repr(self.languages) + ')' | |
5 | 82 | |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
83 | tr = Translator() |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
84 | for file in listdir('tr'): |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
85 | tr.load_language(path.join('tr', file)) |
5 | 86 | |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
87 | def language_for_page(): |
127 | 88 | ''' |
89 | Returns the code of which language to use for the page. | |
90 | ''' | |
5 | 91 | from flask import request |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
92 | if request.args.get('untranslated') is not None: |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
93 | return None |
5 | 94 | else: |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
95 | for language_name in tr.languages: |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
96 | if request.args.get(language_name) is not None: |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
97 | return language_name |
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
98 | else: |
61
0c9b09f694f3
Kielituki käyttöön. Kauhean monimutkaista koodia tähänkin vaadittiin viime kädessä
Teemu Piippo <teemu@hecknology.net>
parents:
55
diff
changeset
|
99 | return request.accept_languages.best_match(tr.languages) |
5 | 100 | |
87 | 101 | def sign_elements(schedule_entry, format = 'medium'): |
127 | 102 | ''' |
103 | For an entry in a bus stop schedule, find out where the connection is leading to. | |
104 | Returns a list of places, possibly empty. | |
105 | ''' | |
19
16fa9fb20b32
Lisätty pysäkkiryhmän aikataulunäkymä
Teemu Piippo <teemu@hecknology.net>
parents:
18
diff
changeset
|
106 | from math import ceil |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
107 | trip_length = schedule_entry['trip'].length - schedule_entry['stop'].traveled_distance |
87 | 108 | regions = schedule_entry['trip'].concise_schedule(schedule_entry['stop']) |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
109 | return [ |
90 | 110 | name |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
111 | for name in reduce_schedule( |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
112 | regions, |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
113 | trip_length = trip_length, |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
114 | format = format |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
115 | ) |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
116 | ] |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
117 | |
87 | 118 | def sign(schedule_entry, format = 'medium'): |
127 | 119 | ''' |
120 | For an entry in a bus stop schedule, find out where the connection is leading to. | |
121 | Returns a string. | |
122 | ''' | |
87 | 123 | sign = sign_elements(schedule_entry, format = format) |
29 | 124 | if sign: |
127 | 125 | return ' - '.join(tr(simplify_name(place), 'region_name', 'region_short_name') for place in sign) |
29 | 126 | else: |
127 | return schedule_entry['trip'].schedule[-1].stop.name | |
19
16fa9fb20b32
Lisätty pysäkkiryhmän aikataulunäkymä
Teemu Piippo <teemu@hecknology.net>
parents:
18
diff
changeset
|
128 | |
87 | 129 | def long_form_sign(schedule_entry, format = 'long'): |
68 | 130 | from math import ceil |
131 | trip_length = schedule_entry['trip'].length - schedule_entry['stop'].traveled_distance | |
87 | 132 | sign = reduce_schedule(schedule_entry['trip'].concise_schedule(schedule_entry['stop']), trip_length = trip_length, format = format) |
68 | 133 | if sign: |
134 | return { | |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
135 | 'destination': tr(sign[-1], 'region_short_name'), |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
136 | 'via': [tr(place, 'region_short_name') for place in sign[:-1]], |
68 | 137 | } |
138 | else: | |
139 | return { | |
140 | 'destination': schedule_entry['trip'].schedule[-1].stop.name, | |
141 | 'via': [], | |
142 | } | |
143 | ||
144 | ||
38
d0ae1996abdd
Lisätty vilkkuvat merkit hetken päästä lähteville
Teemu Piippo <teemu@hecknology.net>
parents:
31
diff
changeset
|
145 | def imminent(schedule_entry): |
d0ae1996abdd
Lisätty vilkkuvat merkit hetken päästä lähteville
Teemu Piippo <teemu@hecknology.net>
parents:
31
diff
changeset
|
146 | return (schedule_entry['time'] - now()) <= timedelta(minutes = 3) |
d0ae1996abdd
Lisätty vilkkuvat merkit hetken päästä lähteville
Teemu Piippo <teemu@hecknology.net>
parents:
31
diff
changeset
|
147 | |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
148 | def first_halt_in_trip_in_place(trip, place): |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
149 | for halt in trip.schedule: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
150 | if halt.stop.region == place: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
151 | return halt |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
152 | else: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
153 | return None |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
154 | |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
155 | place_abbreviations = ConfigParser() |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
156 | place_abbreviations.read('abbreviations.ini') |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
157 | |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
158 | def place_abbreviation(place): |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
159 | try: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
160 | return place_abbreviations['abbreviations'][place] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
161 | except KeyError: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
162 | return place |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
163 | |
94
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
164 | def trip_description(trip): |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
165 | entries = [trip.from_place] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
166 | old_places = None |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
167 | starting_halt = None |
98
c07a77c8a070
fixes, updates, new regions + priorities
Teemu Piippo <teemu@hecknology.net>
parents:
94
diff
changeset
|
168 | while len(entries) < 3: |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
169 | remaining_length = trip.length |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
170 | if starting_halt: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
171 | remaining_length -= starting_halt.traveled_distance |
98
c07a77c8a070
fixes, updates, new regions + priorities
Teemu Piippo <teemu@hecknology.net>
parents:
94
diff
changeset
|
172 | places = reduce_schedule(trip.concise_schedule(starting_stop = starting_halt), trip_length = remaining_length, format = 'short') |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
173 | new_places = set(places) - set(entries) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
174 | if not new_places or places == old_places: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
175 | break |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
176 | for place in places: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
177 | if place in new_places: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
178 | starting_halt = first_halt_in_trip_in_place(trip, place) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
179 | entries += [place] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
180 | break |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
181 | old_places = places |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
182 | if trip.to_place not in entries: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
183 | entries += [trip.to_place] |
94
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
184 | return entries |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
185 | |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
186 | def trip_abbreviation(trip): |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
187 | return trip.route.reference + ':' + '-'.join(map(place_abbreviation, trip_description(trip))) |
68 | 188 | |
77 | 189 | def split_route_ref(route_ref): |
190 | try: | |
191 | return list(parse_route_ref(route_ref)) | |
192 | except ValueError: | |
193 | return ['', route_ref, ''] | |
194 | ||
48
428cfdf64ccc
Lisätty uudelleenohjauksia
Teemu Piippo <teemu@hecknology.net>
parents:
42
diff
changeset
|
195 | @app.route('/stop/<reference>') |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
196 | def bus_stop_schedule(reference): |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
197 | from buses import bus_stops |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
198 | schedule = [] |
3 | 199 | try: |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
200 | bus_stop = bus_stops[reference] |
3 | 201 | except KeyError: |
202 | abort(404) | |
127 | 203 | for schedule_entry in bus_stop.schedule(max_amount = 100, max_past = 4, arrivals = True): |
77 | 204 | route_ref = schedule_entry['trip'].route.reference |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
205 | schedule.append({ |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
206 | 'time': time_representation(schedule_entry['time']), |
127 | 207 | 'timestamp': int(schedule_entry['time'].timestamp()), |
77 | 208 | 'route': route_ref, |
209 | 'route-splice': split_route_ref(route_ref), | |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
210 | 'sign': sign(schedule_entry), |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
211 | 'trip': schedule_entry['stop'].trip.name, |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
212 | 'night': is_night_time(schedule_entry['time']), |
38
d0ae1996abdd
Lisätty vilkkuvat merkit hetken päästä lähteville
Teemu Piippo <teemu@hecknology.net>
parents:
31
diff
changeset
|
213 | 'imminent': imminent(schedule_entry), |
134 | 214 | 'id': str(schedule_entry['stop'].primary_key), |
127 | 215 | 'gone': schedule_entry['gone'], |
0 | 216 | }) |
5 | 217 | return render_template( |
25
cb423946cf33
Uudelleennimetty templaatit
Teemu Piippo <teemu@hecknology.net>
parents:
24
diff
changeset
|
218 | 'stop.html', |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
219 | schedule = schedule, |
109 | 220 | ref = bus_stop.code, |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
221 | name = bus_stop.code + ' ' + tr(bus_stop.name, 'bus-stops'), |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
222 | link_to_map = bus_stop.location.link_to_map, |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
223 | region = hasattr(bus_stop, 'region_name') and bus_stop.region or None, |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
224 | location = bus_stop.location, |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
225 | cluster = bus_stop.cluster.url_name if len(bus_stop.cluster.stops) > 1 else None, |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
226 | tr = tr, |
90 | 227 | typename = bus_stop.typename, |
93 | 228 | service = min(bus_stop.services), |
19
16fa9fb20b32
Lisätty pysäkkiryhmän aikataulunäkymä
Teemu Piippo <teemu@hecknology.net>
parents:
18
diff
changeset
|
229 | ) |
16fa9fb20b32
Lisätty pysäkkiryhmän aikataulunäkymä
Teemu Piippo <teemu@hecknology.net>
parents:
18
diff
changeset
|
230 | |
105 | 231 | def week_schedule(bus_stop, start_date = today(), **kwargs): |
109 | 232 | for i in range(7): |
90 | 233 | try: |
105 | 234 | yield from bus_stop.schedule_for_day(start_date + timedelta(i), **kwargs) |
90 | 235 | except ValueError: |
236 | # went outside bounds | |
237 | return | |
74 | 238 | |
239 | def route_key(route): | |
240 | match = re.search(r'^([a-zA-Z]*)(\d+)(.*)$', route) | |
241 | if match: | |
242 | groups = match.groups() | |
243 | return (groups[0], int(groups[1]), groups[2]) | |
244 | else: | |
245 | return (route,) | |
246 | ||
77 | 247 | def parse_route_ref(route_ref): |
248 | from re import search | |
249 | match = search(r'^([^0-9]*)([0-9]+)(.*)$', route_ref) | |
250 | try: | |
251 | return match.group(1), int(match.group(2)), match.group(3) | |
252 | except AttributeError: | |
253 | raise ValueError(route_ref) | |
254 | ||
87 | 255 | def condense_route_list(route_list): |
256 | def prepare_range_pool(range_pool): | |
257 | if len(range_pool) < 3: | |
258 | yield from map(str, range_pool) | |
259 | else: | |
260 | yield str(min(range_pool)) + '-' + str(max(range_pool)) | |
261 | range_pool = [] | |
262 | for route in route_list: | |
263 | try: | |
264 | route_int = int(route) | |
265 | except ValueError: | |
266 | yield from prepare_range_pool(range_pool) | |
267 | range_pool = [] | |
268 | yield route | |
269 | else: | |
270 | if not range_pool or route_int - 1 in range_pool: | |
271 | range_pool.append(route_int) | |
272 | else: | |
273 | yield from prepare_range_pool(range_pool) | |
274 | range_pool = [route_int] | |
275 | if range_pool: | |
276 | yield from prepare_range_pool(range_pool) | |
277 | ||
278 | def is_weekend_night(time): | |
279 | from datetime import timedelta | |
280 | adjusted_time = time - timedelta(hours = 4, minutes = 30) | |
281 | return adjusted_time.weekday() in [4, 5] and is_night_time(time) | |
282 | ||
127 | 283 | encircled = '⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵' |
284 | #encircled = 'ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ' | |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
285 | |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
286 | def encircle(char): |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
287 | from string import ascii_uppercase |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
288 | try: |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
289 | return encircled[ascii_uppercase.index(char.upper())] |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
290 | except IndexError: |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
291 | return char |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
292 | |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
293 | def variant_abbreviations(variants): |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
294 | '''Makes a mapping of route destination variants to letter abbreviations''' |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
295 | suggestion = [variant[-1][0].upper() for variant in variants] |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
296 | if len(set(suggestion)) != len(suggestion): |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
297 | from string import ascii_uppercase |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
298 | suggestion = ascii_uppercase |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
299 | return dict(zip(variants, suggestion)) |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
300 | |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
301 | def schedule_entry_hash(schedule_entry): |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
302 | return schedule_entry['trip'].name, schedule_entry['time'] |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
303 | |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
304 | def describe(bus_stop, week_schedule): |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
305 | schedule = [] |
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
306 | from collections import defaultdict, Counter |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
307 | from busroute import simplify_name |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
308 | destinations_per_route = defaultdict(Counter) |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
309 | counts_per_variant = {} |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
310 | def route_key(route_ref): |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
311 | from math import log |
77 | 312 | try: |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
313 | return () + parse_route_ref(route_ref) |
77 | 314 | except ValueError: |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
315 | return () |
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
316 | def filter_names(names): |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
317 | if len(names) == 1 and names[0] == (bus_stop.region and simplify_name(bus_stop.region)): |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
318 | return type(names)() |
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
319 | else: |
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
320 | return names |
74 | 321 | data = [] |
322 | names = [] | |
323 | from collections import defaultdict | |
324 | night_routes = defaultdict(lambda: True) | |
325 | num_leaves = 0 | |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
326 | trip_mapping = {} |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
327 | for schedule_entry in week_schedule: |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
328 | from busroute import greatly_simplify_name |
87 | 329 | sign_tuple = tuple(sign_elements(schedule_entry, format = 'short')) |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
330 | sign_tuple = tuple(greatly_simplify_name(k) for k in sign_tuple) |
87 | 331 | route = schedule_entry['trip'].route.reference |
109 | 332 | night_routes[route] &= is_night_time(schedule_entry['time']) |
87 | 333 | destinations_per_route[route][sign_tuple] += 1 |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
334 | trip_mapping[schedule_entry_hash(schedule_entry)] = (route, sign_tuple) |
74 | 335 | num_leaves += 1 |
336 | night_routes = {key for key, value in night_routes.items() if value} | |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
337 | routes_per_destination = defaultdict(set) |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
338 | all_variants = [] |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
339 | variant_names = {} |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
340 | # Collect all variants |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
341 | for route, tally in destinations_per_route.items(): |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
342 | variants = variant_abbreviations(tally.keys()) |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
343 | winner, count = tally.most_common()[0] |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
344 | for destination, count in tally.items(): |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
345 | route_name = route |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
346 | if destination != winner: |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
347 | route_name += encircle(variants[destination]) |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
348 | if route in night_routes: |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
349 | night_routes.add(route_name) |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
350 | variant_names[route, destination] = route_name |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
351 | all_variants.append({ |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
352 | 'name': route_name, |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
353 | 'destination': filter_names(destination), |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
354 | 'count': count |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
355 | }) |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
356 | counts_per_variant[route_name] = count |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
357 | all_variants.sort(key = lambda k: k['count']) |
127 | 358 | def route_limit(route): |
359 | return (route in night_routes) and 6 or 20 | |
360 | rare_variants = {variant['name'] for variant in all_variants if variant['count'] < route_limit(variant['name'])} | |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
361 | route_variant_count = len(all_variants) |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
362 | for variant in all_variants: |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
363 | routes_per_destination[variant['destination']].add(variant['name']) |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
364 | for key in routes_per_destination: |
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
365 | routes_per_destination[key] = sorted(routes_per_destination[key], key = route_key) |
87 | 366 | def route_len(route): |
367 | length = 0 | |
368 | for char in route: | |
369 | if char.isdigit(): | |
370 | length += 1 | |
371 | else: | |
372 | break | |
373 | return length or len(route) | |
374 | from math import inf | |
375 | def route_key(route): | |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
376 | from math import log |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
377 | return ( |
127 | 378 | counts_per_variant.get(route, 0) < route_limit(route), |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
379 | route in night_routes, |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
380 | route_len(route), |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
381 | str(route) |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
382 | ) |
87 | 383 | def routes_key(routes): |
384 | return min(route_key(route) for route in routes) | |
127 | 385 | # Convert routes per destination to item pairs so that we can split it into rare and non-rare |
386 | route_destination_pairs = list() | |
387 | for regions, routes in routes_per_destination.items(): | |
388 | common_routes = set(route for route in routes if counts_per_variant[route] >= route_limit(route)) | |
389 | rare_routes = set(routes) - common_routes | |
390 | if common_routes: | |
391 | route_destination_pairs.append((regions, common_routes)) | |
392 | if rare_routes: | |
393 | route_destination_pairs.append((regions, rare_routes)) | |
87 | 394 | result = [] |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
395 | rare_variant_groups = set() |
127 | 396 | for regions, routes in sorted(route_destination_pairs, key = lambda pair: routes_key(pair[1])): |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
397 | routes_tuple = tuple(condense_route_list(sorted(routes, key = route_key))) |
87 | 398 | result.append(( |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
399 | routes_tuple, |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
400 | ' - '.join(tr(region, 'region_short_name') for region in regions) |
87 | 401 | )) |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
402 | if all(variant in rare_variants for variant in routes): |
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
403 | rare_variant_groups.add(routes_tuple) |
87 | 404 | return { |
405 | 'night-routes': night_routes, | |
406 | 'all-night-routes': lambda entry, description: all(route in description['night-routes'] for route in entry[0]), | |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
407 | 'simple': route_variant_count <= 1, |
87 | 408 | 'description': result, |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
409 | 'variant-map': {k:variant_names[v] for k, v in trip_mapping.items()}, |
92
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
410 | 'rare-variants': rare_variants, |
16a5c37e4e67
stop_week now shows rare variants with less emphasis
Teemu Piippo <teemu@hecknology.net>
parents:
91
diff
changeset
|
411 | 'rare-variant-groups': rare_variant_groups, |
87 | 412 | } |
413 | ||
414 | @app.route('/stop_description/<reference>') | |
415 | def bus_stop_description(reference): | |
416 | from buses import bus_stops | |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
417 | from pprint import pformat |
87 | 418 | try: |
419 | bus_stop = bus_stops[reference] | |
420 | except KeyError: | |
421 | abort(404) | |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
422 | return '<pre>' + pformat(describe(bus_stop, week_schedule(bus_stop, arrivals = True))) + '</pre>' |
73
c56b0ef96514
stop_description ja muuta roinaa
Teemu Piippo <teemu@hecknology.net>
parents:
72
diff
changeset
|
423 | |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
424 | @app.route('/api/describe_destination/<trip_reference>/<stop_reference>/<int:index>') |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
425 | def describe_destination(trip_reference, stop_reference, index): |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
426 | from buses import bus_stops, all_trips |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
427 | from busroute import simplify_name |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
428 | from flask import jsonify |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
429 | try: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
430 | trip = all_trips[trip_reference] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
431 | bus_stop = bus_stops[stop] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
432 | schedule_entry = [schedule_entry for schedule_entry in trip.schedule if schedule_entry.stop.reference == stop_reference][index] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
433 | except KeyError: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
434 | abort(404) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
435 | except ValueError: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
436 | abort(404) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
437 | return jsonify(long_form_sign({'trip': trip, 'stop': schedule_entry})) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
438 | |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
439 | @app.route('/api/trip_abbreviation/<block_id>/<int:arrival_time_offset>') |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
440 | def api_trip_abbreviation(block_id, arrival_time_offset): |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
441 | from buses import trips_by_vehicle_info |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
442 | from flask import jsonify |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
443 | from datetime import timedelta |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
444 | try: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
445 | trip = trips_by_vehicle_info[block_id, timedelta(seconds = arrival_time_offset)] |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
446 | except KeyError: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
447 | abort(404) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
448 | return jsonify({ |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
449 | 'abbreviation': trip_abbreviation(trip), |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
450 | }) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
451 | |
127 | 452 | def service_start_time(): |
453 | from datetime import date, datetime, timedelta | |
454 | result = datetime.now().replace(hour = 0, minute = 0, second = 0, microsecond = 0) | |
455 | if datetime.now().hour < 4: | |
456 | result -= timedelta(1) | |
457 | return result | |
458 | ||
85 | 459 | def current_bus_day(): |
460 | from datetime import date, datetime, timedelta | |
461 | day = date.today() | |
462 | if datetime.now().hour < 5: | |
463 | day -= timedelta(1) | |
464 | return day | |
465 | ||
68 | 466 | @app.route('/stop_display/<reference>') |
467 | def stop_display(reference): | |
468 | from buses import bus_stops | |
469 | schedule = [] | |
470 | try: | |
471 | bus_stop = bus_stops[reference] | |
472 | except KeyError: | |
473 | abort(404) | |
85 | 474 | for i, schedule_entry in enumerate(bus_stop.schedule_for_day(current_bus_day(), arrivals = False)): |
68 | 475 | schedule.append({ |
476 | 'time_data': schedule_entry['time'], | |
477 | 'time': time_representation(schedule_entry['time']), | |
127 | 478 | 'timestamp': int(schedule_entry['time'].timestamp()), |
68 | 479 | 'route': schedule_entry['trip'].route.reference, |
87 | 480 | 'sign': long_form_sign(schedule_entry, format = 'medium'), |
68 | 481 | 'trip': schedule_entry['stop'].trip.name, |
482 | 'night': is_night_time(schedule_entry['time']), | |
483 | 'imminent': imminent(schedule_entry), | |
484 | 'index': i, | |
485 | }) | |
486 | from pprint import pprint | |
487 | pprint(schedule) | |
76 | 488 | def destination_key(schedule_entry): |
489 | sign = schedule_entry['sign'] | |
490 | return (sign['destination'],) + tuple(sign['via']) | |
491 | def filter_schedule(schedule, *, key): | |
492 | used = set() | |
493 | for schedule_entry in schedule: | |
494 | key_value = key(schedule_entry) | |
495 | if key_value not in used: | |
496 | used.add(key_value) | |
497 | yield schedule_entry | |
498 | schedule = list(filter_schedule(schedule, key = destination_key))[:6] | |
68 | 499 | if schedule: |
500 | num_imminent_leaves = max(1, len([schedule_entry for schedule_entry in schedule if schedule_entry['time_data'] - schedule[0]['time_data'] < timedelta(minutes = 3)])) | |
501 | else: | |
502 | num_imminent_leaves = 1 | |
503 | return render_template( | |
504 | 'stop_display.html', | |
505 | schedule = schedule, | |
506 | ref = bus_stop.code, | |
507 | name = tr(bus_stop.name, 'bus-stops'), | |
508 | link_to_map = bus_stop.location.link_to_map, | |
509 | region = bus_stop.region, | |
510 | location = bus_stop.location, | |
511 | cluster = bus_stop.cluster.url_name if len(bus_stop.cluster.stops) > 1 else None, | |
512 | num_imminent_leaves = num_imminent_leaves, | |
513 | tr = tr, | |
514 | ) | |
515 | ||
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
516 | def time_representation(time, relative = True): |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
517 | time_difference = time - now() |
127 | 518 | #if relative and timedelta(minutes = -1) < time_difference < timedelta(minutes = 1): |
519 | # return tr('right-now', 'misc-text') | |
520 | #elif relative and time_difference > timedelta(0) and time_difference < timedelta(minutes = 10): | |
521 | # return '%dm' % round(time_difference.seconds / 60) | |
522 | if time.date() == today(): | |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
523 | return '%d:%02d' % (time.hour, time.minute) |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
524 | elif time_difference < timedelta(7): |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
525 | with activate_locale(): |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
526 | return time.strftime('%-a %H:%M').replace(' ', '\xa0') |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
527 | else: |
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
528 | with activate_locale(): |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
529 | return time.strftime('%-d.%-m. %H:%M').replace(' ', '\xa0') |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
530 | |
109 | 531 | def make_cluster(cluster): |
532 | schedule = list({ | |
533 | 'time': time_representation(schedule_entry['time']), | |
534 | 'route': schedule_entry['trip'].route.reference, | |
535 | 'route-splice': split_route_ref(schedule_entry['trip'].route.reference), | |
536 | 'sign': sign(schedule_entry), | |
537 | 'trip': schedule_entry['stop'].trip.name, | |
538 | 'night': is_night_time(schedule_entry['time']), | |
539 | 'stop': schedule_entry['stop'].stop, | |
540 | 'stop_id': schedule_entry['stop'].stop.reference, | |
541 | 'stop_code': schedule_entry['stop'].stop.code, | |
542 | 'stop_name': tr(schedule_entry['stop'].stop.name, 'bus-stops', 'places'), | |
543 | 'imminent': imminent(schedule_entry), | |
544 | 'typename': schedule_entry['stop'].stop.typename, | |
545 | } for schedule_entry in cluster.schedule(max_amount = 100)) | |
27 | 546 | stops_in_cluster = sorted( |
547 | ({ | |
548 | 'id': stop.reference, | |
29 | 549 | 'code': stop.code, |
63 | 550 | 'name': tr(stop.name, 'bus-stops'), |
27 | 551 | } for stop in cluster.stops), |
552 | key = lambda stop: (len(stop['id']), stop['id']) | |
553 | ) | |
19
16fa9fb20b32
Lisätty pysäkkiryhmän aikataulunäkymä
Teemu Piippo <teemu@hecknology.net>
parents:
18
diff
changeset
|
554 | return render_template( |
16fa9fb20b32
Lisätty pysäkkiryhmän aikataulunäkymä
Teemu Piippo <teemu@hecknology.net>
parents:
18
diff
changeset
|
555 | 'cluster.html', |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
556 | schedule = schedule, |
72 | 557 | name = tr(cluster.name, 'places', 'place-clusters', 'bus-stops'), |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
558 | link_to_map = cluster.center.link_to_map, |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
559 | location = cluster.center, |
27 | 560 | stops_in_cluster = stops_in_cluster, |
561 | amount_of_stops_in_cluster = len(stops_in_cluster), | |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
562 | tr = tr, |
93 | 563 | service = min(set.union(*[bus_stop.services for bus_stop in cluster.stops])), |
5 | 564 | ) |
0 | 565 | |
109 | 566 | @app.route('/stop_cluster/<cluster_name>') |
567 | def cluster_schedule(cluster_name): | |
568 | from buses import bus_stops, clusters_by_name | |
569 | try: | |
570 | cluster = clusters_by_name[cluster_name] | |
571 | except KeyError: | |
572 | abort(404) | |
573 | else: | |
574 | return make_cluster(cluster) | |
575 | ||
127 | 576 | @app.route('/cluster') |
109 | 577 | def custom_cluster(): |
578 | from flask import request | |
579 | from buses import bus_stops, CustomBusStopCluster | |
580 | if 'stops' in request.args: | |
581 | cluster = CustomBusStopCluster( | |
582 | name = request.args.get('name', 'Aikataulu'), | |
583 | stops = {bus_stops[stop_code] for stop_code in str.split(request.args['stops'], ';')}, | |
584 | ) | |
585 | return make_cluster(cluster) | |
586 | else: | |
587 | return render_template('custom_cluster.html') | |
588 | ||
77 | 589 | def day_class(weekday): |
590 | if weekday < 5: | |
591 | return 'working-day' | |
592 | elif weekday == 5: | |
593 | return 'saturday' | |
594 | else: | |
595 | assert weekday == 6 | |
596 | return 'sunday' | |
597 | ||
105 | 598 | class Week: |
599 | def __init__(self, year, weeknumber): | |
109 | 600 | self.year, self.weeknumber = int(year), int(weeknumber) |
105 | 601 | def normalize(self): |
602 | while self.weeknumber > 52: | |
603 | self.weeknumber -= 52 | |
604 | self.year += 1 | |
605 | while self.weeknumber < 1: | |
606 | self.weeknumber += 52 | |
607 | self.year -= 1 | |
608 | def __repr__(self): | |
609 | return str.format( | |
610 | 'Week({year}, {weeknumber})', | |
611 | year = self.year, | |
612 | weeknumber = self.weeknumber | |
613 | ) | |
614 | def __add__(self, numweeks): | |
615 | newweek = Week(year = self.year, weeknumber = self.weeknumber + numweeks) | |
616 | newweek.normalize() | |
617 | return newweek | |
618 | def __sub__(self, numweeks): | |
619 | newweek = Week(year = self.year, weeknumber = self.weeknumber - numweeks) | |
620 | newweek.normalize() | |
621 | return newweek | |
622 | def monday(self): | |
623 | from datetime import datetime | |
624 | datestring = str.format( | |
625 | '{year}-W{weeknumber}-1', | |
626 | year = self.year, | |
627 | weeknumber = self.weeknumber, | |
628 | ) | |
629 | return datetime.strptime(datestring, "%Y-W%W-%w").date() | |
630 | @staticmethod | |
631 | def fromstring(string): | |
632 | try: | |
633 | year, weeknumber = string.split('W', 1) | |
634 | return Week(year = int(year), weeknumber = int(weeknumber)) | |
635 | except ValueError: | |
636 | raise ValueError('bad week string: ' + repr(string)) | |
109 | 637 | def __str__(self): |
638 | return str(self.year) + 'W' + str(self.weeknumber) | |
105 | 639 | @staticmethod |
640 | def now(): | |
641 | from datetime import date | |
642 | cal = date.today().isocalendar() | |
643 | return Week(year = cal[0], weeknumber = cal[1]) | |
644 | ||
77 | 645 | @app.route('/stop_week/<stop_reference>') |
646 | def stop_week(stop_reference): | |
647 | from buses import bus_stops | |
648 | from flask import request | |
105 | 649 | from datetime import date |
650 | if 'week' in request.args: | |
651 | try: | |
652 | week = Week.fromstring(request.args['week']) | |
653 | except ValueError: | |
654 | abort(400) | |
655 | else: | |
656 | week = Week.now() | |
77 | 657 | if 'routes' in request.args: |
658 | filtered_routes = set(request.args['routes'].split(';')) | |
659 | route_filter = lambda route: route in filtered_routes | |
660 | else: | |
661 | route_filter = lambda route: True | |
662 | if 'dest' in request.args: | |
663 | dests = {bus_stops.get(dest, None) for dest in request.args['dest'].split(';')} | |
664 | dests.discard(None) | |
665 | dest_filter = lambda trip: any(trip.contains_stop(dest) for dest in dests) | |
666 | else: | |
667 | dest_filter = lambda trip: True | |
668 | schedule = [] | |
669 | try: | |
670 | bus_stop = bus_stops[stop_reference] | |
671 | except KeyError: | |
672 | abort(404) | |
673 | week_model = {} | |
109 | 674 | bus_stop_schedule = list(week_schedule(bus_stop, start_date = week.monday(), arrivals = True, allow_gone = True)) |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
675 | description = describe(bus_stop, bus_stop_schedule) |
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
676 | for schedule_entry in bus_stop_schedule: |
77 | 677 | route_ref = schedule_entry['trip'].route.reference |
678 | if route_filter(route_ref) and dest_filter(schedule_entry['trip']): | |
679 | time = schedule_entry['time'] | |
680 | date = schedule_entry['date'] | |
681 | if date not in week_model: | |
109 | 682 | week_model[date] = dict() |
77 | 683 | day_model = week_model[date] |
684 | if time.hour not in day_model: | |
109 | 685 | day_model[time.hour] = list() |
77 | 686 | hour_model = day_model[time.hour] |
109 | 687 | list.append(hour_model, { |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
688 | 'route': description['variant-map'][schedule_entry_hash(schedule_entry)], |
77 | 689 | 'route-splice': split_route_ref(route_ref), |
690 | 'trip': schedule_entry['stop'].trip.name, | |
691 | 'night': is_night_time(schedule_entry['time']), | |
692 | 'minute': time.minute, | |
693 | }) | |
79
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
694 | for day_offset in range(7): |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
695 | from datetime import date, datetime, timedelta |
105 | 696 | day = week.monday() + timedelta(day_offset) |
79
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
697 | try: |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
698 | day_model = week_model[day] |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
699 | except KeyError: |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
700 | week_model[day] = {} |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
701 | else: |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
702 | def hour_key(x): |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
703 | return (x - 5) % 24 |
109 | 704 | # Fill in missing hours |
705 | hours = set(dict.keys(day_model)) | |
79
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
706 | sorted_hours = sorted(hours, key = hour_key) |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
707 | start_hour = sorted_hours[0] |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
708 | end_hour = sorted_hours[-1] + 1 |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
709 | for hour in range(start_hour, end_hour): |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
710 | hour_start = datetime(day.year, day.month, day.day, hour, 0) |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
711 | if hour not in day_model and hour_start >= datetime.now(): |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
712 | day_model[hour] = [] |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
713 | # Sort the hours, so that 5am is first and 4am is last. |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
714 | from collections import OrderedDict |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
715 | week_model[day] = OrderedDict( |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
716 | sorted( |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
717 | day_model.items(), |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
718 | key = lambda pair: hour_key(pair[0]), |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
719 | ) |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
720 | ) |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
721 | week_model = [ |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
722 | { |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
723 | 'day': day, |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
724 | 'schedule': schedule, |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
725 | 'day-class': day_class(day.weekday()) |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
726 | } for day, schedule in week_model.items() |
ba854da8c424
stop_week: järjestä tunnit ja paikkaa tyhjät tunnit
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
727 | ] |
77 | 728 | week_model = sorted(week_model, key = lambda day: day['day']) |
729 | return render_template( | |
730 | 'stop_week.html', | |
731 | ref = bus_stop.code, | |
732 | name = tr(bus_stop.name, 'bus-stops'), | |
733 | tr = tr, | |
734 | week = week_model, | |
91
209f5930d038
show variants in week schedules
Teemu Piippo <teemu@hecknology.net>
parents:
90
diff
changeset
|
735 | description = description, |
90 | 736 | typename = bus_stop.typename, |
105 | 737 | curweek = week, |
109 | 738 | next_week = week + 1, |
739 | previous_week = week - 1, | |
77 | 740 | ) |
741 | ||
48
428cfdf64ccc
Lisätty uudelleenohjauksia
Teemu Piippo <teemu@hecknology.net>
parents:
42
diff
changeset
|
742 | @app.route('/trip/<trip_reference>') |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
743 | def trip(trip_reference): |
2 | 744 | from flask import request |
114 | 745 | from buses import all_trips, shapes |
746 | from busroute import simplify_name,greatly_simplify_name | |
3 | 747 | try: |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
748 | trip = all_trips[trip_reference] |
3 | 749 | except KeyError: |
750 | abort(404) | |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
751 | schedule = [] |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
752 | region = '' |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
753 | for halt in trip.schedule: |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
754 | stop_time = datetime.combine(today(), time()) + halt.arrival_time |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
755 | formatted_time = time_representation(stop_time) |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
756 | if profile['regions']['use-regions']: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
757 | if halt.stop.region != region and not (region and not halt.stop.region): |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
758 | if len(schedule) and not schedule[-1]['name']: |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
759 | schedule[-1]['name'] = tr(halt.stop.region or '', 'region_name') |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
760 | else: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
761 | schedule.append({ |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
762 | 'name': tr(halt.stop.region or '', 'region_name'), |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
763 | 'time': formatted_time, |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
764 | 'stops': [], |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
765 | 'index': len(schedule), |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
766 | }) |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
767 | region = halt.stop.region |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
768 | else: |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
769 | schedule.append({ |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
770 | 'name': tr(halt.stop.name or '', 'bus-stops'), |
71
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
771 | 'time': formatted_time, |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
772 | 'stops': [], |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
773 | 'index': len(schedule), |
d2e19670b772
Remove assumptions and added some api stuff
Teemu Piippo <teemu@hecknology.net>
parents:
68
diff
changeset
|
774 | }) |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
775 | schedule[-1]['stops'].append({ |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
776 | 'time': formatted_time, |
29 | 777 | 'id': halt.stop.reference, |
778 | 'code': halt.stop.code, | |
114 | 779 | 'ref': halt.stop.code or halt.stop.reference, |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
780 | 'name': tr(halt.stop.name, 'bus-stops'), |
90 | 781 | 'typename': halt.stop.typename, |
114 | 782 | 'arrival_time': time_representation(datetime.combine(today(), time()) + halt.arrival_time), |
783 | 'departure_time': time_representation(datetime.combine(today(), time()) + halt.departure_time), | |
784 | 'location': str(halt.stop.location), | |
0 | 785 | }) |
31
60045b362d71
- Ajovuoroa ei enää esitetä kahdessa välilehdessä vaan puukuvaimessa
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
786 | sign = trip.concise_schedule() |
29 | 787 | try: |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
788 | sign = [sign[0], sign[-1]] |
29 | 789 | except IndexError: |
790 | sign = [trip.schedule[0].stop.name, trip.schedule[-1].stop.name] | |
25
cb423946cf33
Uudelleennimetty templaatit
Teemu Piippo <teemu@hecknology.net>
parents:
24
diff
changeset
|
791 | return render_template('trip.html', |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
792 | schedule = schedule, |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
793 | trip_reference = trip_reference, |
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
794 | route = trip.route.reference, |
114 | 795 | #description = ' - '.join(tr(place, 'region_name') for place in sign), |
796 | description = greatly_simplify_name(sign[-1]), | |
24
e6bdb9c54096
Yhtenäistetty ohjelmakoodin kieli englanniksi
Teemu Piippo <teemu@hecknology.net>
parents:
22
diff
changeset
|
797 | night = is_night_time(datetime.combine(today(), time()) + trip.schedule[-1].arrival_time), |
20
3199e289ae62
- Sivusto hieman edustuksellisempi
Teemu Piippo <teemu@hecknology.net>
parents:
19
diff
changeset
|
798 | tr = tr, |
27 | 799 | length = trip.length / 1000, |
93 | 800 | service = trip.route.service, |
114 | 801 | shape = ','.join(str.format('[{}, {}]', point[0], point[1]) for point in shapes[trip.shape]), |
802 | stops = list( | |
803 | dict( | |
804 | ref = halt.stop.reference, | |
805 | name = halt.stop.name, | |
806 | position = str.format('[{}]', str(halt.stop.location)), | |
807 | ) for halt in trip.schedule | |
808 | ), | |
27 | 809 | ) |
810 | ||
109 | 811 | @app.route('/route/<names>') |
812 | def route_page(names): | |
813 | from buses import routes | |
814 | from collections import defaultdict | |
815 | from busroute import greatly_simplify_name | |
816 | routes = {routes[name.upper()] for name in names.split(';')} | |
817 | schedules = defaultdict(list) | |
818 | for route in routes: | |
819 | for trip in route.trips: | |
820 | if trip.is_served_at(today()): | |
821 | schedules[trip.schedule[0].stop].append({ | |
822 | 'name': trip.reference, | |
823 | 'from': trip.from_place, | |
824 | 'to': trip.to_place, | |
825 | 'description': ' - '.join( | |
826 | greatly_simplify_name(place) | |
827 | for place in trip_description(trip) | |
828 | ), | |
829 | 'gone': datetime.combine(today(), time()) + trip.schedule[-1].arrival_time < now(), | |
830 | 'time': time_representation(datetime.combine(today(), time()) + trip.schedule[0].departure_time), | |
831 | 'route': route.reference, | |
832 | }) | |
833 | return render_template('route.html', | |
834 | name = route.reference + ' ' + route.description, | |
835 | tr = tr, | |
836 | schedules = schedules, | |
837 | ) | |
0 | 838 | |
94
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
839 | @app.route('/interesting') |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
840 | def interesting(): |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
841 | from buses import all_trips, services_for_day |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
842 | from busroute import simplify_name |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
843 | from collections import Counter, defaultdict |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
844 | from datetime import datetime |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
845 | trip_counts = Counter() |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
846 | interesting_trips = defaultdict(list) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
847 | for trip_reference, trip in all_trips.items(): |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
848 | if len(trip.service.dates) <= 3: |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
849 | for date in trip.service.dates: |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
850 | moment = trip.schedule[0].departure_datetime(date) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
851 | if moment > datetime.now(): |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
852 | interesting_trips[date].append((trip, moment)) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
853 | for date in interesting_trips: |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
854 | interesting_trips[date].sort(key = lambda tuple: tuple[1]) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
855 | interesting_trips = [(date, interesting_trips[date]) for date in sorted(interesting_trips.keys())] |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
856 | data = [ |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
857 | { |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
858 | 'date': date, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
859 | 'leaves': [{ |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
860 | 'route': trip.route.reference, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
861 | 'departure': moment, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
862 | 'trip': trip.reference, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
863 | 'stop': trip.schedule[0].stop, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
864 | 'description': ' - '.join( |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
865 | simplify_name(place, replace = True) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
866 | for place in trip_description(trip) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
867 | ), |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
868 | } for trip, moment in leaves] |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
869 | } |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
870 | for date, leaves in interesting_trips |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
871 | ] |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
872 | return render_template( |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
873 | 'interesting.html', |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
874 | data = data, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
875 | tr = tr, |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
876 | ) |
e27c18f080d1
added an interesting trip portal
Teemu Piippo <teemu@hecknology.net>
parents:
93
diff
changeset
|
877 | |
11
e18ad36fbbf5
Lisätty favicon, korjattu tr()-funktio joka ei olettunut suomen kieleen (vaan kääntämättömään)
Teemu Piippo <teemu@hecknology.net>
parents:
10
diff
changeset
|
878 | @app.route('/static/<path:path>') |
e18ad36fbbf5
Lisätty favicon, korjattu tr()-funktio joka ei olettunut suomen kieleen (vaan kääntämättömään)
Teemu Piippo <teemu@hecknology.net>
parents:
10
diff
changeset
|
879 | def static_file(path): |
e18ad36fbbf5
Lisätty favicon, korjattu tr()-funktio joka ei olettunut suomen kieleen (vaan kääntämättömään)
Teemu Piippo <teemu@hecknology.net>
parents:
10
diff
changeset
|
880 | return send_from_directory(path.join('static', path)) |
e18ad36fbbf5
Lisätty favicon, korjattu tr()-funktio joka ei olettunut suomen kieleen (vaan kääntämättömään)
Teemu Piippo <teemu@hecknology.net>
parents:
10
diff
changeset
|
881 | |
30 | 882 | from argparse import ArgumentParser |
883 | parser = ArgumentParser() | |
884 | parser.add_argument('gtfs_zip_path') | |
885 | parser.add_argument('profile_path') | |
886 | ||
0 | 887 | if __name__ == '__main__': |
2 | 888 | parser.add_argument('-p', '--port', type = int, default = 5000) |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
889 | parser.add_argument('-d', '--debug', action = 'store_true') |
30 | 890 | |
891 | args = parser.parse_args() | |
892 | profile.read(args.profile_path) | |
88
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
893 | if profile['regions']['use-regions']: |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
894 | from regions import parse_regions |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
895 | regions = parse_regions(profile['regions']['osm-path']) |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
896 | tr.load_regions(regions) |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
897 | import busroute |
3b86597c5a88
major update, moved the map to an osm patch
Teemu Piippo <teemu@hecknology.net>
parents:
87
diff
changeset
|
898 | busroute.regions = regions |
93 | 899 | buses.load_buses(args.gtfs_zip_path) |
30 | 900 | |
901 | if __name__ == '__main__': | |
10
843c6ee340e7
Refaktoroitu käännä-funktio, kaikki kielet luetaan automaattisesti
Teemu Piippo <teemu@hecknology.net>
parents:
9
diff
changeset
|
902 | app.run(debug = args.debug, port = args.port) |