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