Mercurial > bus-service / changeset

--- a/busroute.py	Tue Jul 11 09:10:31 2017 +0300
+++ b/busroute.py	Tue Jul 11 10:36:59 2017 +0300
@@ -13,6 +13,7 @@
 	'Kahari': 'Ruskon keskusta',
 	'Kemiö': 'Kemiönsaari',
 	'Kasnäs': 'Kemiönsaari',
+	'Pernon telakka': 'Perno',
 }
 
 # nimiä joista voidaan joustaa tarvittaessa
@@ -105,6 +106,7 @@
 		'Moisio': 25,
 		'Pääskyvuori': 100,
 		'Rautatieasema': 50,
+		'Logomo': 100,
 		'Rymättylä': 50,
 		"Sauvo": 500,
 		"Kemiönsaari": 500,

--- a/region-representatives.json	Tue Jul 11 09:10:31 2017 +0300
+++ b/region-representatives.json	Tue Jul 11 10:36:59 2017 +0300
@@ -124,6 +124,7 @@
 	"Linja-autoasema": "41",
 	"Linnavuori": "3122",
 	"Littoinen": "6085",
+	"Logomo": "1017",
 	"Luolavuori": "1721",
 	"Luostarinmäki": "864",
 	"Länsinummi": "818",
@@ -139,6 +140,7 @@
 	"Muhkuri": "899",
 	"Munittula": "4012",
 	"Mälikkälä": "781",
+	"Naantalin pikatie": "1542",
 	"Nuorikkala": "2079",
 	"Nummenmäki": "62",
 	"Nummen koulu": "1826",
@@ -159,7 +161,7 @@
 	"Piispanristi": "6282",
 	"Pikisaari": "124",
 	"Pläkkikaupunki": "780",
-	"Pohjola": "1017",
+	"Pohjola": "1806",
 	"Porhonkallio": "3037",
 	"Port Arthur": "9",
 	"Puutori": "286",

--- a/regions.gmp	Tue Jul 11 09:10:31 2017 +0300
+++ b/regions.gmp	Tue Jul 11 10:36:59 2017 +0300
@@ -1,9 +1,9 @@
-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
+roadmap^60.45568477029873, 22.16861806444229^16@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
-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
+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.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
@@ -23,14 +23,14 @@
 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.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.4697,22.22131~60.46693,22.21517~60.46532,22.20544~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
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4457,22.19908~60.44249,22.20603~60.43554,22.20629~60.43394,22.19696~60.44188,22.18918
 undefined^#FF0000,5,1,#ff8800,0.4^^60.4219,22.10621~60.4208,22.13539~60.40461,22.11823~60.40554,22.10579
 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.45366,22.15796~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.45942,22.15127~60.45429,22.15401~60.45399,22.1588~60.4517,22.16222~60.45006,22.17728~60.45513,22.17316~60.4602,22.17171
+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.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
@@ -198,7 +198,6 @@
 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
@@ -241,4 +240,7 @@
 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
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45732,22.24006~60.45442,22.24632~60.45666,22.25307~60.45759,22.25321~60.45928,22.25848~60.45959,22.26538~60.46236,22.26235~60.45799,22.24479
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45757,22.25328~60.45645,22.25334~60.45614,22.25654~60.4572,22.26027~60.45916,22.25863
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48146,22.18101~60.47916,22.18333~60.47609,22.18837~60.47351,22.19223~60.47222,22.19401~60.46783,22.20032~60.463,22.20689~60.46074,22.20953~60.4594,22.21127~60.45874,22.21588~60.4563,22.23555~60.4549,22.24193~60.4545,22.24388~60.45421,22.24468~60.4544,22.24516~60.45482,22.24415~60.45674,22.23579~60.4602,22.21273~60.4663,22.2036~60.47311,22.1943~60.47718,22.18974
 @@@@@@