Mercurial > bus-service / changeset

--- a/Makefile	Tue Aug 29 21:01:57 2017 +0300
+++ b/Makefile	Thu Aug 31 21:28:22 2017 +0300
@@ -1,6 +1,6 @@
 all: gtfs.zip regions-per-stop.json
 
-regions-per-stop.json: region-representatives.json regions.gmp gtfs.zip
+regions-per-stop.json: regions.ini regions.gmp gtfs.zip
 	./compute-regions.py > regions-per-stop.json || rm -f regions-per-stop.json
 
 gtfs.zip:

--- a/busroute.py	Tue Aug 29 21:01:57 2017 +0300
+++ b/busroute.py	Thu Aug 31 21:28:22 2017 +0300
@@ -114,7 +114,7 @@
 		'räntämäki': 50,
 		'moisio': 25,
 		'pääskyvuori': 100,
-		'rautatieasema': 50,
+		#'rautatieasema': 50,
 		'logomo': 100,
 		'rymättylä': 50,
 		"sauvo": 500,
@@ -126,6 +126,8 @@
 		'aura': 100,
 		'friskala': -1,
 		'merimasku': 50,
+		'turkuhalli': 100,
+		'messukeskus': 100,
 	}
 
 	if 'kauppatori' not in reitti:

--- a/regions.gmp	Tue Aug 29 21:01:57 2017 +0300
+++ b/regions.gmp	Thu Aug 31 21:28:22 2017 +0300
@@ -1,9 +1,9 @@
-roadmap^60.49699199716986, 21.805157285252225^14@undefined^#FF0000,5,1,#ff8800,0.4^^60.3977,22.24465~60.40772,22.24046~60.40792,22.26057~60.40076,22.27409~60.3952,22.25642
+roadmap^60.45418756605041, 22.175387959995877^15@undefined^#FF0000,5,1,#ff8800,0.4^^60.3977,22.24465~60.40772,22.24046~60.40792,22.26057~60.40076,22.27409~60.3952,22.25642
 polygon^#FF0000,5,1,#ff8800,0.4^^60.3977,22.22706~60.38719,22.23676~60.38341,22.22466~60.38518,22.21205~60.39359,22.20706~60.39816,22.21341
 polygon^#FF0000,5,1,#ff8800,0.4^^60.39868,22.21599~60.39804,22.22852~60.38876,22.23916~60.38952,22.24843~60.39329,22.25135~60.40217,22.23474~60.4019,22.21689
-polygon^#FF0000,5,1,#ff8800,0.4^^60.38871,22.16432~60.39236,22.18483~60.39972,22.188~60.40171,22.1823~60.39919,22.15413~60.39151,22.15633
-polygon^#FF0000,5,1,#ff8800,0.4^^60.42123,22.17264~60.41472,22.15422~60.40622,22.14277~60.40003,22.15599~60.40577,22.17143~60.41357,22.18174
-polygon^#FF0000,5,1,#ff8800,0.4^^60.43275,22.20869~60.4239,22.21632~60.41889,22.19831~60.42495,22.19216~60.43033,22.19648
+undefined^#FF0000,5,1,#ff8800,0.4^^60.38871,22.16432~60.39236,22.18483~60.39972,22.188~60.40171,22.1823~60.39919,22.15413~60.39151,22.15633
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42123,22.17264~60.41472,22.15422~60.40622,22.14277~60.40003,22.15599~60.40577,22.17143~60.41357,22.18174
+undefined^#FF0000,5,1,#ff8800,0.4^^60.43275,22.20869~60.4239,22.21632~60.41889,22.19831~60.42495,22.19216~60.43033,22.19648
 undefined^#FF0000,5,1,#ff8800,0.4^^60.42148,22.17333~60.42584,22.18964~60.41902,22.1971~60.41534,22.18056
 undefined^#FF0000,5,1,#ff8800,0.4^^60.49702,22.21496~60.49936,22.22028~60.50048,22.23744~60.49676,22.2392~60.49373,22.23435~60.49306,22.23554~60.49178,22.23402~60.48872,22.22903~60.48729,22.2221~60.49085,22.21505
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45331,22.2865~60.45033,22.29068~60.45113,22.29322~60.45198,22.29413~60.45225,22.29741~60.45399,22.29853~60.45529,22.2975~60.45495,22.29585~60.45446,22.2915~60.45386,22.28832~60.45369,22.28748
@@ -31,7 +31,7 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46255,22.1208~60.46094,22.14792~60.45392,22.15324~60.45116,22.13868~60.44198,22.1196~60.4466,22.10751
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4533,22.15139~60.45129,22.1614~60.45049,22.16689~60.44892,22.17899~60.4424,22.18543~60.43899,22.15149~60.43804,22.12393~60.44149,22.1198~60.45079,22.13974
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45943,22.1494~60.45408,22.15343~60.45301,22.15429~60.45194,22.15877~60.45006,22.17728~60.45513,22.17316~60.4602,22.17171
-undefined^#FF0000,5,1,#ff8800,0.4^^60.46014,22.17238~60.4603,22.18908~60.45502,22.18972~60.45112,22.19633~60.44625,22.19779~60.44274,22.18699~60.4505,22.17996
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46014,22.17238~60.4603,22.18908~60.45773,22.18912~60.45789,22.18193~60.45188,22.1817~60.45125,22.18339~60.45265,22.18662~60.45364,22.19244~60.45041,22.19823~60.44625,22.19779~60.44274,22.18699~60.4505,22.17996
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45066,22.24616~60.44458,22.25495~60.44369,22.25247~60.43624,22.23858~60.4444,22.23654~60.44471,22.23537~60.4478,22.2407
 undefined^#FF0000,5,1,#ff8800,0.4^^60.48504,22.23244~60.48575,22.24697~60.49033,22.24506~60.49114,22.24283~60.49107,22.24098~60.49086,22.24005~60.49023,22.23753~60.49002,22.23558~60.48981,22.23345~60.491,22.23294~60.48865,22.22914~60.48714,22.22952~60.48611,22.23257
 undefined^#FF0000,5,1,#ff8800,0.4^^60.48987,22.23356~60.49103,22.23309~60.49175,22.23427~60.49312,22.23579~60.49373,22.2346~60.49673,22.23947~60.49728,22.2393~60.49751,22.24406~60.49696,22.24764~60.49359,22.24392~60.49128,22.24289~60.49117,22.24067~60.49032,22.23748
@@ -247,4 +247,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4914,21.85867~60.47795,21.88854~60.46416,21.88168~60.46255,21.86331~60.47169,21.84992~60.48239,21.84906
 undefined^#FF0000,5,1,#ff8800,0.4^^60.51591,21.87249~60.50674,21.85773~60.50167,21.86408~60.50746,21.88889
 undefined^#FF0000,5,1,#ff8800,0.4^^60.50991,21.79688~60.50553,21.82198~60.49879,21.82486~60.48869,21.81559~60.48873,21.80606~60.50384,21.79046
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45598,22.18232~60.45588,22.18356~60.4531,22.18826~60.45288,22.18644~60.45144,22.18341~60.45199,22.18199
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45617,22.1823~60.45768,22.18238~60.45749,22.18878~60.45545,22.18951~60.45384,22.19146~60.45318,22.18846~60.45605,22.18388
 @@@@@@

--- a/service.py	Tue Aug 29 21:01:57 2017 +0300
+++ b/service.py	Thu Aug 31 21:28:22 2017 +0300
@@ -43,7 +43,7 @@
 			except KeyError:
 				pass
 		else:
-			return name
+			return name[0:1].upper() + name[1:]
 
 tr = Translator()
 for file in listdir('tr'):

--- a/templates/trip.html	Tue Aug 29 21:01:57 2017 +0300
+++ b/templates/trip.html	Thu Aug 31 21:28:22 2017 +0300
@@ -33,6 +33,16 @@
 		border-radius: 10px;
 		margin-top: 10px;
 	}
+	
+	.sarake-matkapituus
+	{
+		text-align: right;
+	}
+	
+	.aikataulu
+	{
+		margin-top: 30pt;
+	}
 	</style>
 	<script>
 	function toggle_fold(id)
@@ -52,16 +62,16 @@
 	&#127769;&nbsp;
 	{% endif %}
 	🚍 {{route}} {{description}}</h1>
-	<p style="text-align: center">Ajomatka: {{'%.1f' % length}}km</p>
 	<table class='aikataulu' cellspacing='0'>
 		<tr>
 			<th class='sarake-aika'>Aika</th>
 			<th class='sarake-alue'>Alue</th>
+			<th class='sarake-matkapituus'>{{'%.1f' % length}}km</th>
 		</tr>
 		{% for entry in schedule %}
 		<tr>
 			<td class='sarake-aika' style='vertical-align: top'>{{entry['time']}}</td>
-			<td class='sarake-alue folded' id="region-schedule-{{entry['index']}}">
+			<td class='sarake-alue folded' id="region-schedule-{{entry['index']}}" colspan='2'>
 				<a class="region-name" href="javascript:toggle_fold('region-schedule-{{entry['index']}}')">{{entry['name']}}</a>
 				<table class="nested-schedule" cellspacing="0">
 				{% for halt in entry['stops'] %}

--- a/tr/sv.ini	Tue Aug 29 21:01:57 2017 +0300
+++ b/tr/sv.ini	Thu Aug 31 21:28:22 2017 +0300
@@ -1728,6 +1728,7 @@
 kemiö = Kimito
 kemiönsaari = Kimitoön
 sauvo = Sagu
+turkuhalli = Åbohallen
 
 [headings]
 time = Tid