Mercurial > bus-service / changeset

--- a/alue-edustajat.json	Thu May 25 16:41:21 2017 +0300
+++ b/alue-edustajat.json	Sat Jun 10 16:36:36 2017 +0300
@@ -20,7 +20,7 @@
 	"Hakkinen": "5004",
 	"Loukinainen": "5009",
 	"Sillilä": "5011",
-	"Piispala": "5029",
+	"Piispala": "5030",
 	"Jokila": "5035",
 	"Vieru": "5018",
 	"Ilmarinen": "5070",
@@ -50,7 +50,7 @@
 	"Ajola": "3282",
 	"Ylttinen": "3192",
 	"Tamminiemi": "3279",
-	"Artukainen": "1516",
+	"Artukainen": "1513",
 	"Asikko": "3036",
 	"Hämölä": "3270",
 	"Eerikvalla": "395",
@@ -70,7 +70,7 @@
 	"Illoinen": "324",
 	"Ilpoinen": "456",
 	"Impivaara": "1564",
-	"Itäharju": "1672",
+	"Itäharju": "1805",
 	"Itäranta": "332",
 	"Ispoinen": "647",
 	"Jäkärlä": "1366",
@@ -91,7 +91,8 @@
 	"Kuivalahti": "3237",
 	"Kukola": "1732",
 	"Kuninkoja": "2129",
-	"Kupittaa": "1972",
+	"Kupittaa": "870",
+	"Kupittaanpuisto": "1972",
 	"Kurala": "1660",
 	"Kurjenmäki": "1688",
 	"Kuuvuori": "218",
@@ -99,7 +100,6 @@
 	"Kärsämäki": "192",
 	"Käkölä": "3236",
 	"Iso-Heikkilä": "768",
-	"Isokylä": "3243",
 	"Lauste": "708",
 	"Lauttaranta": "128",
 	"Lentoasema": "1586",

--- a/alueet.gmp	Thu May 25 16:41:21 2017 +0300
+++ b/alueet.gmp	Sat Jun 10 16:36:36 2017 +0300
@@ -1,15 +1,12 @@
-roadmap^60.40918767732357, 22.258026819744718^14@undefined^#FF0000,5,1,#ff8800,0.4^^60.39482,22.2577~60.40037,22.27521~60.39147,22.28456~60.38851,22.27179
+roadmap^60.6155412106049, 22.400419931927335^12@undefined^#FF0000,5,1,#ff8800,0.4^^60.39482,22.2577~60.40037,22.27521~60.39147,22.28456~60.38851,22.27179
 polygon^#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
-undefined^#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.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
 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.47182,22.29006~60.47585,22.29014~60.48198,22.29898~60.4786,22.30708~60.47647,22.31503~60.4748,22.31928~60.47057,22.30316~60.47158,22.29897
-undefined^#FF0000,5,1,#ff8800,0.4^^60.46443,22.27208~60.47176,22.2828~60.47215,22.28351~60.47295,22.28976~60.47586,22.28966~60.47505,22.27803~60.47529,22.26612~60.47341,22.26482~60.47244,22.26502~60.47,22.26609~60.46873,22.26701~60.46674,22.26877~60.46574,22.26934~60.46434,22.27049~60.46395,22.27063~60.46343,22.27033~60.46395,22.27112
-undefined^#FF0000,5,1,#ff8800,0.4^^60.45901,22.268~60.45994,22.26648~60.46324,22.27012~60.46392,22.27117~60.46441,22.2721~60.47172,22.28286~60.4721,22.28353~60.47232,22.2854~60.46842,22.28529~60.4655,22.28372~60.46387,22.28141~60.46168,22.27527
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45775,22.29049~60.4599,22.29787~60.45951,22.29945~60.45688,22.3026~60.45537,22.29751~60.45501,22.29585~60.45465,22.29285~60.45619,22.29141
 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
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4445,22.25538~60.44359,22.25256~60.44121,22.24824~60.43617,22.25517~60.43897,22.26358
@@ -30,7 +27,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45811,22.27231~60.4578,22.27506~60.45618,22.27427~60.45707,22.27271
 undefined^#FF0000,5,1,#ff8800,0.4^^60.49152,22.24869~60.49397,22.26783~60.48683,22.27238~60.48425,22.26869~60.48425,22.2544
 undefined^#FF0000,5,1,#ff8800,0.4^^60.48328,22.24959~60.48059,22.25139~60.47672,22.25169~60.47522,22.26525~60.4831,22.2707
-undefined^#FF0000,5,1,#ff8800,0.4^^60.45857,22.22045~60.46175,22.23684~60.46635,22.24233~60.46999,22.22342~60.46663,22.21524~60.4656,22.21092~60.46162,22.21221
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4697,22.22131~60.46693,22.21517~60.46528,22.20514~60.47272,22.19522~60.47605,22.20406~60.47122,22.21328
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4705,22.21951~60.48023,22.22414~60.48044,22.21169~60.47626,22.20483~60.47169,22.21384
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45191,22.2745~60.44999,22.27746~60.44796,22.2706~60.44837,22.26998~60.44934,22.272
@@ -66,8 +62,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45853,22.19019~60.45508,22.19054~60.45053,22.19882~60.44925,22.21523~60.45314,22.22142~60.45383,22.22435
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46113,22.19127~60.46132,22.19824~60.46001,22.2073~60.45919,22.21152~60.45652,22.2088~60.45931,22.19073
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46139,22.19131~60.46428,22.19195~60.46767,22.194~60.47022,22.19663~60.46369,22.20573~60.45959,22.21049~60.46167,22.19811
-undefined^#FF0000,5,1,#ff8800,0.4^^60.45675,22.24015~60.45438,22.2495~60.45887,22.26658~60.45998,22.26577~60.46269,22.26488
-undefined^#FF0000,5,1,#ff8800,0.4^^60.45876,22.22345~60.45709,22.23877~60.46232,22.2613~60.46574,22.24292~60.46138,22.23705
 undefined^#FF0000,5,1,#ff8800,0.4^^60.47602,22.25242~60.47484,22.26457~60.47306,22.26336~60.46917,22.26521~60.46496,22.26894~60.46259,22.26148~60.46492,22.24917~60.47087,22.25384~60.47163,22.25338
 undefined^#FF0000,5,1,#ff8800,0.4^^60.48884,22.18543~60.48132,22.18556~60.47867,22.1974~60.47689,22.20328~60.48104,22.21122~60.48704,22.20809~60.48823,22.19436
 undefined^#FF0000,5,1,#ff8800,0.4^^60.48122,22.18547~60.47853,22.19719~60.47645,22.20365~60.47299,22.19482
@@ -91,7 +85,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.47143,22.30907~60.46766,22.3065~60.46638,22.30976~60.46627,22.32465~60.46868,22.33113~60.47168,22.33288~60.47388,22.329~60.47425,22.32349~60.47351,22.31668
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46155,22.29103~60.46086,22.29293~60.45902,22.28974~60.45965,22.28794~60.46039,22.28656~60.46118,22.28815~60.46077,22.28918
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4604,22.28644~60.46128,22.28815~60.46084,22.28915~60.4616,22.29102~60.46318,22.29159~60.46421,22.29127~60.46459,22.2903~60.46406,22.28743~60.46227,22.28269~60.46082,22.28075~60.46038,22.28315~60.46058,22.28521
-undefined^#FF0000,5,1,#ff8800,0.4^^60.46518,22.29401~60.46378,22.29377~60.46284,22.29493~60.46134,22.29667~60.46087,22.29758~60.46069,22.30078~60.46103,22.30275~60.46139,22.3055~60.46205,22.3058~60.46276,22.30523~60.46384,22.30423~60.46496,22.2996~60.46541,22.29606
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46037,22.28649~60.4595,22.28811~60.45894,22.28975~60.45835,22.29101~60.45731,22.2896~60.45527,22.2912~60.45464,22.29024~60.45344,22.28649~60.45281,22.28577~60.45162,22.28202~60.45278,22.28007~60.45487,22.27889~60.45787,22.27826~60.45933,22.27867~60.46069,22.28068~60.46024,22.2831~60.46048,22.28519
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45199,22.27478~60.45005,22.27763~60.45144,22.28188~60.45277,22.27968~60.45313,22.27621
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44999,22.27767~60.45277,22.28687~60.45026,22.29051~60.44722,22.2813
@@ -100,7 +93,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.43793,22.35164~60.43952,22.36344~60.43178,22.37284~60.42969,22.35957~60.43502,22.35297
 undefined^#FF0000,5,1,#ff8800,0.4^^60.43777,22.35091~60.43508,22.35207~60.4293,22.35903~60.42704,22.34468~60.43318,22.33569~60.43753,22.33349
 undefined^#FF0000,5,1,#ff8800,0.4^^60.43002,22.32731~60.43303,22.33487~60.4259,22.34668~60.42359,22.34244~60.42658,22.33374
-undefined^#FF0000,5,1,#ff8800,0.4^^60.43981,22.2862~60.44301,22.28325~60.4434,22.28229~60.44633,22.27877~60.451,22.29349~60.45189,22.29426~60.45209,22.29716~60.45134,22.29686~60.44468,22.30815~60.44241,22.29835
 undefined^#FF0000,5,1,#ff8800,0.4^^60.43107,22.29598~60.43256,22.30139~60.42946,22.30611~60.42796,22.30954~60.42544,22.30964~60.42451,22.30518~60.42191,22.30171~60.42346,22.29444~60.42401,22.29166~60.42781,22.29229~60.42907,22.29398
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4247,22.27686~60.42481,22.27978~60.42649,22.28607~60.42571,22.29051~60.42375,22.29105~60.42174,22.30152~60.41947,22.29918~60.41873,22.29367~60.41824,22.29177~60.41723,22.28889~60.41632,22.27951~60.42068,22.27894
 undefined^#FF0000,5,1,#ff8800,0.4^^60.41822,22.29268~60.41866,22.29452~60.41929,22.29923~60.42414,22.30531~60.42625,22.31349~60.41981,22.32087~60.41902,22.31332~60.41824,22.30827~60.41482,22.29424
@@ -109,7 +101,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.53067,22.28298~60.53473,22.28328~60.53746,22.28761~60.53782,22.29628~60.53611,22.30546~60.53301,22.31246~60.52963,22.31031~60.52767,22.30177~60.52746,22.29008~60.5278,22.28504
 undefined^#FF0000,5,1,#ff8800,0.4^^60.54416,22.33589~60.53523,22.3407~60.5348,22.35709~60.53816,22.38258~60.5504,22.37649~60.55019,22.35541
 undefined^#FF0000,5,1,#ff8800,0.4^^60.53831,22.28826~60.53831,22.29639~60.5366,22.30597~60.53508,22.31491~60.53941,22.33053~60.54105,22.3343~60.54776,22.32782~60.55521,22.31581~60.555,22.30319~60.5488,22.29272~60.54211,22.28673
-undefined^#FF0000,5,1,#ff8800,0.4^^60.57449,22.29795~60.55749,22.38016~60.57845,22.42464~60.59454,22.44524~60.61483,22.45415~60.6504,22.46633~60.65552,22.36542~60.61688,22.34851
 undefined^#FF0000,5,1,#ff8800,0.4^^60.73911,22.40833~60.65804,22.36507~60.65297,22.46585~60.69574,22.47177~60.72608,22.44863
 undefined^#FF0000,5,1,#ff8800,0.4^^60.63228,22.25193~60.63841,22.25663~60.63974,22.26757~60.63789,22.27982~60.63179,22.28508~60.62939,22.28474~60.62591,22.27817~60.62497,22.26963~60.62585,22.26294~60.62816,22.25642
 undefined^#FF0000,5,1,#ff8800,0.4^^60.61701,22.29598~60.61844,22.29997~60.62151,22.30392~60.62177,22.31443~60.61989,22.32263~60.61751,22.32744~60.61309,22.32727~60.6105,22.32349~60.60898,22.3134~60.60578,22.30641~60.60473,22.29837~60.60846,22.29452~60.61393,22.29362
@@ -223,4 +214,14 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.46224,22.29508~60.46122,22.29679~60.4604,22.29517~60.46062,22.29415~60.46164,22.29403~60.46233,22.29434
 undefined^#FF0000,5,1,#ff8800,0.4^^60.6386,23.48019~60.64036,23.54104~60.61247,23.55108~60.60559,23.51006~60.61444,23.45856~60.62842,23.45907
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4222,22.23671~60.41807,22.23096~60.41564,22.23169~60.4083,22.23886~60.40847,22.26201~60.42222,22.24487
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46242,22.26276~60.45908,22.26551~60.45339,22.24715~60.45678,22.24115
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46904,22.2353~60.46183,22.25873~60.45824,22.24483~60.46736,22.23274
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46354,22.21109~60.46532,22.23178~60.45828,22.24375~60.45807,22.22897~60.46028,22.21318
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48002,22.29883~60.47485,22.29218~60.47239,22.29136~60.47177,22.30714~60.47418,22.31576~60.47621,22.31538~60.48083,22.3011
+undefined^#FF0000,5,1,#ff8800,0.4^^60.47194,22.28444~60.46773,22.27778~60.46291,22.27042~60.46123,22.27052~60.46067,22.27275~60.46331,22.28014~60.46655,22.28452~60.47039,22.28564
+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.44779,22.28316~60.451,22.29353~60.45184,22.29422~60.45213,22.29714~60.45129,22.29688~60.44466,22.30842~60.44396,22.30501~60.44706,22.29681~60.44823,22.28947~60.44727,22.28423
+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
 @@@@@@

--- a/alueet.py	Thu May 25 16:41:21 2017 +0300
+++ b/alueet.py	Sat Jun 10 16:36:36 2017 +0300
@@ -32,15 +32,18 @@
 for name, stop_id in representatives.items():
 	if stop_id is None:
 		continue
-	for district_shape in district_shapes:
-		if district_shape.sisältää_pisteen(pysäkit[stop_id]):
-			assert name not in districts
-			districts[name] = district_shape
-			district_shapes.remove(district_shape)
-			bus_stop_districts[stop_id] = name
-			break
+	if stop_id not in pysäkit:
+		print('Alueen %r edustaja %r ei löydy aikatauluista' % (name, stop_id), file = sys.stderr)
 	else:
-		print('cannot find a shape for %r' % name, file = sys.stderr)
+		for district_shape in district_shapes:
+			if district_shape.sisältää_pisteen(pysäkit[stop_id]):
+				assert name not in districts
+				districts[name] = district_shape
+				district_shapes.remove(district_shape)
+				bus_stop_districts[stop_id] = name
+				break
+		else:
+			print('cannot find a shape for %r' % name, file = sys.stderr)
 
 for stop_id, stop_position in pysäkit.items():
 	for district, shape in districts.items():

--- a/bussireitti.py	Thu May 25 16:41:21 2017 +0300
+++ b/bussireitti.py	Sat Jun 10 16:36:36 2017 +0300
@@ -31,7 +31,7 @@
 		'Kuninkoja': 80,
 		'Moikoinen': 50,
 		'Raision keskusta': 100,
-		'Friskala': 30,
+		'Friskala': 20,
 		'Kukola': 50,
 		'Kaistarniemi': 50,
 		'Papinsaari': 50,
@@ -55,18 +55,18 @@
 		'Runosmäki': 50,
 		'Lieto': 100,
 		'Liedon asemanseutu': 200,
-		'Ilmarinen': 100,
+		'Ilmarinen': 50,
 		'Vahto': 50,
 		'Ruskon keskusta': 200,
-		'Oriketo': 50,
+		'Oriketo': 30,
 		'Harittu': 40,
 		'Jäkärlä': 50,
 		'Paattinen': 100,
 		'Kaarinan keskusta': 200,
 		'Naantalin keskusta': 200,
 		'Uittamo': 50,
-		'Piikkiö': 40,
-		'Paimio': 50,
+		'Piikkiö': 100,
+		'Paimio': 100,
 		'Pargas': 50,
 		'Yli-Maaria': 50,
 		'Saramäki': 50,
@@ -77,6 +77,10 @@
 		'Länsikeskus': 50,
 		'Kaanaa': 100,
 		'Satava': 50,
+		'Suikkila': 50,
+		'Raunistula': 50,
+		'Räntämäki': 50,
+		'Moisio': 25,
 	}
 
 	if 'Kauppatori' not in reitti:

--- a/en.ini	Thu May 25 16:41:21 2017 +0300
+++ b/en.ini	Sat Jun 10 16:36:36 2017 +0300
@@ -8,3 +8,4 @@
 naantalin keskusta = Naantali Centrum
 linja-autoasema = Bus Station
 rautatieasema = Central Railway Station
+kaarinan keskusta = Kaarina

--- a/fi.ini	Thu May 25 16:41:21 2017 +0300
+++ b/fi.ini	Sat Jun 10 16:36:36 2017 +0300
@@ -4,3 +4,4 @@
 lentoasema = ✈ Lentoasema
 satama = ⚓ Satama
 kauppakeskus mylly = Mylly
+kaarinan keskusta = Kaarina

--- a/sv.ini	Thu May 25 16:41:21 2017 +0300
+++ b/sv.ini	Sat Jun 10 16:36:36 2017 +0300
@@ -6,7 +6,7 @@
 sähkölaitos = Elverket
 pihlajaniemi = Rönnudden
 pikisaari = Beckholmen
-vaala = Svala
+vaala = Svalas
 puutori = Trätorget
 panimo = Bryggeri
 piikkiö, 110-tie = Pikis, 110-vägen
@@ -1647,7 +1647,7 @@
 itäranta = Öststranden
 ispoinen = Ispois
 kaarina = S:t Karins
-kaarinan keskusta = S:t Karins centrum
+kaarinan keskusta = S:t Karins
 kaistarniemi = Kaistarudden
 katariina = Katarina
 kauppatori = Salutorget