Mercurial > bus-service / changeset

--- a/busroute.py	Sun Jul 02 16:18:29 2017 +0300
+++ b/busroute.py	Sun Jul 02 16:38:37 2017 +0300
@@ -52,7 +52,7 @@
 		'Kauppakeskus Mylly': 200,
 		'Kuninkoja': 80,
 		'Moikoinen': 60,
-		'Raision keskusta': 100,
+		'Raision keskusta': 150,
 		'Friskala': 20,
 		'Kukola': 50,
 		'Kaistarniemi': 50,
@@ -109,6 +109,7 @@
 		'Rymättylä': 50,
 		"Sauvo": 500,
 		"Kemiönsaari": 500,
+		'Suovuori': 300,
 	}
 
 	if 'Kauppatori' not in reitti:
@@ -140,7 +141,7 @@
 	weights = weights[:3]
 	# jos kolmas kylttiarvo ei ole tarpeeksi merkittävä suhteessa reitin pituuteen niin otetaan se pois
 	try:
-		if weights[2][0] != destination and weights[2][1] < (1200 / length ** 0.9):
+		if weights[2][0] != destination and weights[2][1] < (900 / length ** 0.8):
 			del weights[2]
 	except IndexError:
 		pass

--- a/region-representatives.json	Sun Jul 02 16:18:29 2017 +0300
+++ b/region-representatives.json	Sun Jul 02 16:38:37 2017 +0300
@@ -62,6 +62,7 @@
 	"Ylttinen": "3192",
 	"Tamminiemi": "3279",
 	"Kaivopuisto": "3120",
+	"Suovuori": "3109",
 	
 	"Artukainen": "1513",
 	"Asikko": "3036",

--- a/regions.gmp	Sun Jul 02 16:18:29 2017 +0300
+++ b/regions.gmp	Sun Jul 02 16:38:37 2017 +0300
@@ -1,9 +1,9 @@
-roadmap^60.37820391301176, 22.37610302499832^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
+roadmap^60.48418064631306, 22.048111777821195^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
@@ -240,4 +240,5 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.39145,22.28499~60.39729,22.32338~60.3877,22.33006~60.38116,22.28354
 undefined^#FF0000,5,1,#ff8800,0.4^^60.39168,22.28482~60.39768,22.32306~60.4032,22.30824~60.3984,22.28282
 undefined^#FF0000,5,1,#ff8800,0.4^^60.38299,22.30276~60.36143,22.31478~60.37985,22.45382~60.41216,22.49107
+undefined^#FF0000,5,1,#ff8800,0.4^^60.47968,22.04209~60.48397,22.0563~60.49138,22.0521~60.49029,22.03671
 @@@@@@