Mercurial > bus-service / changeset

--- a/busroute.py	Fri Sep 15 18:29:23 2017 +0300
+++ b/busroute.py	Fri Sep 15 22:43:33 2017 +0300
@@ -46,7 +46,7 @@
 	return name
 
 def reduce_schedule(reitti, trip_length, whole = False):
-	length = ((trip_length / 600) + len(reitti)) / 2
+	length = ((trip_length / 600) * 3 + len(reitti) * 2) / 5
 	if not reitti:
 		return ''
 	have_already = set()
@@ -92,9 +92,10 @@
 		'ilmarinen': 50,
 		'vahto': 50,
 		'ruskon keskusta': 200,
-		'oriketo': 50,
+		'oriketo': 60,
 		'harittu': 40,
-		'jäkärlä': 50,
+		'jäkärlä': 80,
+		'moisio': 100,
 		'paattinen': 100,
 		'kaarinan keskusta': 200,
 		'naantalin keskusta': 200,
@@ -103,7 +104,7 @@
 		'paimio': 100,
 		'pargas': 100,
 		'nagu': 100,
-		'yli-maaria': 70,
+		'yli-maaria': 60,
 		'saramäki': 50,
 		'tarvasjoki': 100,
 		'marttila': 100,

--- a/regions.gmp	Fri Sep 15 18:29:23 2017 +0300
+++ b/regions.gmp	Fri Sep 15 22:43:33 2017 +0300
@@ -1,7 +1,7 @@
-roadmap^60.45028683967225, 22.292619269409787^17@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.54013045837747, 22.367943745175015^13@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
-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
+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
 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
@@ -202,7 +202,7 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46454,22.27109~60.47194,22.28216~60.47447,22.2786~60.47493,22.26699~60.47301,22.26558~60.46881,22.26787
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44633,22.27881~60.44291,22.28361~60.43985,22.28621~60.44384,22.30489~60.44693,22.29655~60.44807,22.28946~60.44718,22.28422~60.44777,22.28313
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46486,22.29223~60.46296,22.29501~60.46267,22.29761~60.46128,22.2971~60.46032,22.29738~60.46069,22.30326~60.46243,22.30332~60.46421,22.3033~60.46594,22.29844~60.46581,22.29539
-undefined^#FF0000,5,1,#ff8800,0.4^^60.57752,22.31255~60.56217,22.37125~60.59623,22.42342~60.63292,22.45499~60.65058,22.46426~60.65584,22.36526~60.63174,22.35328~60.59817,22.33307~60.58865,22.32559
+undefined^#FF0000,5,1,#ff8800,0.4^^60.59362,22.32869~60.5814,22.38927~60.59623,22.42342~60.63292,22.45499~60.65058,22.46426~60.65584,22.36526~60.63174,22.35328~60.61553,22.34354~60.59615,22.33143
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44566,22.32894~60.44287,22.33761~60.44321,22.34782~60.44984,22.34589~60.45284,22.34048~60.45192,22.3356~60.44968,22.33216
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44342,22.35014~60.44365,22.36593~60.45433,22.36259~60.4541,22.34633
 undefined^#FF0000,5,1,#ff8800,0.4^^59.98508,22.40559~59.96861,22.46199~59.90874,22.41863~59.91541,22.38107
@@ -248,7 +248,10 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.43436,22.32058~60.43439,22.32183~60.43321,22.32286~60.43207,22.32394~60.43124,22.3248~60.43008,22.32702~60.4292,22.32844~60.42856,22.32923~60.42741,22.33048~60.42576,22.33362~60.42437,22.33808~60.42352,22.34186~60.42279,22.34868~60.42235,22.35496~60.42233,22.36175~60.42285,22.36895~60.4238,22.37793~60.42438,22.38664~60.4246,22.39398~60.42425,22.40649~60.42464,22.42052~60.4258,22.42968~60.42737,22.43592~60.43075,22.44551~60.43544,22.45807~60.43798,22.46386~60.4401,22.47229~60.44153,22.48229~60.44484,22.49588~60.44721,22.51468~60.4474,22.5242~60.44547,22.54412~60.44581,22.5598~60.44596,22.56922~60.44384,22.57978~60.44321,22.58862~60.44287,22.60699~60.44183,22.61746~60.43726,22.63527~60.43535,22.64608~60.42779,22.66312~60.4261,22.67222~60.42447,22.67829~60.42382,22.68591~60.42422,22.69638~60.42824,22.71893~60.42838,22.72384~60.42741,22.72839~60.42671,22.72444~60.42682,22.71627~60.42488,22.70509~60.42352,22.69706~60.42302,22.68542~60.42353,22.67789~60.42438,22.67115~60.43058,22.6542~60.43428,22.64493~60.43859,22.6252~60.44178,22.60719~60.44291,22.57907~60.44441,22.56282~60.44428,22.5444~60.44597,22.52369~60.4463,22.51513~60.44392,22.49678~60.44103,22.4841~60.4393,22.47249~60.43715,22.46483~60.43517,22.45975~60.42683,22.437~60.42511,22.4297~60.42377,22.42051~60.42343,22.40694~60.42392,22.39391~60.42351,22.38226~60.42159,22.36168~60.42299,22.34173~60.42516,22.3333~60.42731,22.32928~60.42832,22.32754~60.42946,22.32621
 undefined^#FF0000,5,1,#ff8800,0.4^^60.49531,22.25345~60.49046,22.27886~60.48335,22.27249~60.48353,22.24978
 undefined^#FF0000,5,1,#ff8800,0.4^^60.47545,22.26723~60.48539,22.27615~60.49287,22.28323~60.49262,22.28757~60.4907,22.29787~60.48645,22.297~60.48369,22.29494~60.47769,22.28517~60.47541,22.28491
-undefined^#FF0000,5,1,#ff8800,0.4^^60.49235,22.32769~60.5015,22.34155~60.49406,22.36911~60.48475,22.34869
+undefined^#FF0000,5,1,#ff8800,0.4^^60.49647,22.33471~60.5015,22.34155~60.49406,22.36911~60.48475,22.34869~60.4904,22.33324~60.49375,22.33852
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44783,22.28333~60.44728,22.28426~60.44814,22.28945~60.44698,22.29669~60.44388,22.30504~60.44451,22.30853~60.44911,22.30057~60.44837,22.2984~60.44967,22.29512~60.45097,22.29296
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45103,22.29307~60.45194,22.29418~60.45214,22.29715~60.45136,22.29699~60.44916,22.30051~60.44841,22.2984~60.44968,22.29516
+undefined^#FF0000,5,1,#ff8800,0.4^^60.57936,22.33671~60.57533,22.3661~60.56055,22.34237~60.56665,22.3174
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46446,22.27107~60.46302,22.27036~60.47198,22.28431~60.47193,22.28227
+undefined^#FF0000,5,1,#ff8800,0.4^^60.54736,22.38027~60.54874,22.392~60.548,22.40833~60.53136,22.40816~60.53035,22.38348~60.53702,22.37821~60.53801,22.38301
 @@@@@@

--- a/regions.ini	Fri Sep 15 18:29:23 2017 +0300
+++ b/regions.ini	Fri Sep 15 22:43:33 2017 +0300
@@ -37,6 +37,7 @@
 Lieto as = 5112
 Tarvasjoki = 5423
 Avanti = 5470
+Rauhakylä = 5131
 
 [Kemiönsaari]
 Kemiö = 8930
@@ -146,6 +147,7 @@
 
 [Turku]
 Artukainen = 1513
+auvaismäki = 1102
 Eerikvalla = 395
 Friskala = 394
 Jyrkkälä = 758
@@ -211,7 +213,7 @@
 Nättinummi = 30
 Oriniemi = 316
 Oriketo = 1435
-Paattinen = 1170
+Paattinen = 1127
 Pansio = 1506
 Papinsaari = 352
 Patterinhaka = 578
@@ -225,6 +227,7 @@
 Puutori = 286
 Pääskyvuori = 1964
 Raunistula = 224
+Raunistulan puistotie = 177
 Rautatieasema = 144
 Ruissalo = 666
 Runosmäki = 1015

--- a/tr/fi.ini	Fri Sep 15 18:29:23 2017 +0300
+++ b/tr/fi.ini	Fri Sep 15 22:43:33 2017 +0300
@@ -9,7 +9,7 @@
 kaarinan keskusta = Kaarina
 naantalin keskusta = Naantali
 raision keskusta = Raisio
-rautatieasema = Rautatieasema
+yli-maaria = Yli-Maaria
 
 [headings]
 time = Aika

--- a/tr/sv.ini	Fri Sep 15 18:29:23 2017 +0300
+++ b/tr/sv.ini	Fri Sep 15 22:43:33 2017 +0300
@@ -1738,7 +1738,7 @@
 destination = Destination
 
 [misc-text]
-right-now = just nu
+right-now = nu
 stops-in-cluster = Hållplatser runt här
 nearby-area-schedule = Schema för närliggande hållplatser