Mercurial > bus-service / changeset

--- a/alue-edustajat.json	Sun Apr 23 11:01:51 2017 +0300
+++ b/alue-edustajat.json	Fri May 19 21:15:12 2017 +0300
@@ -1,12 +1,39 @@
 {
+	"Piikkiö": "6175",
+	"Hadvala": "6171",
+	"Puosta": "6351",
+	"Runko": "6156",
+	"Tuorla": "6149",
+	"Raadelma": "6153",
+	"Sipilänmäki": "6227",
+	
+	"Paimio": "6619",
+	"Paimion sairaala": "6664",
+	"Moisio": "6757",
+	"Hanhijoki": "6657",
+	"Naskarla": "6638",
+	
+
+	"Ahteentaka": "3290",
+	"Kurala (Naantali)": "3196",
+	"Haapala": "3283",
+	"Ajola": "3282",
+	"Ylttinen": "3192",
+	"Tamminiemi": "3279",
 	"Artukainen": "1516",
+	"Asikko": "3036",
+	"Hämölä": "3270",
 	"Eerikvalla": "395",
 	"Friskala": "394",
 	"Jyrkkälä": "758",
 	"Haarla": "364",
+	"Haijainen": "3231",
 	"Halinen": "1628",
 	"Harittu": "1489",
+	"Hemmola": "4077",
 	"Hepokulta": "26",
+	"Herttula": "3235",
+	"Hyrköinen": "4060",
 	"Häppilä": "409",
 	"Härkämäki": "761",
 	"Ihala": "2098",
@@ -16,16 +43,22 @@
 	"Itäharju": "1672",
 	"Itäranta": "332",
 	"Ispoinen": "647",
+	"Jäkärlä": "1366",
 	"Jänessaari": "437",
+	"Kahari": "4093",
+	"Karvetti": "3202",
 	"Kaistarniemi": "1747",
+	"Kaivola": "3229",
 	"Kakskerta": "1764",
 	"Kastu": "627",
 	"Katariina": "1708",
 	"Kauppatori": "T1",
 	"Kerttuli": "867",
+	"Kultaranta": "3027",
 	"Koivula": "788",
 	"Kohmo": "1651",
 	"Konserttitalo": "18",
+	"Kuivalahti": "3237",
 	"Kukola": "1732",
 	"Kuninkoja": "2129",
 	"Kupittaa": "1972",
@@ -34,34 +67,46 @@
 	"Kuuvuori": "218",
 	"Kähäri": "1022",
 	"Kärsämäki": "192",
+	"Käkölä": "3236",
 	"Iso-Heikkilä": "768",
+	"Isokylä": "3243",
 	"Lauste": "708",
 	"Lauttaranta": "128",
 	"Lentoasema": "1586",
 	"Liljalaakso": "592",
 	"Linja-autoasema": "41",
+	"Linnavuori": "3122",
 	"Littoinen": "6085",
 	"Luolavuori": "1721",
 	"Luostarinmäki": "864",
 	"Länsinummi": "818",
 	"Maanpää": "1729",
 	"Majakkaranta": "81",
+	"Maksla": "2150",
 	"Marjaniemi": "534",
 	"Martti": "74",
 	"Metsäaro": "2089",
 	"Mäntymäki": "1800",
 	"Moikoinen": "90",
+	"Moisio": "1066",
 	"Muhkuri": "899",
+	"Munittula": "4012",
 	"Mylly": "2117",
 	"Mälikkälä": "781",
+	"Naantali": "3016",
 	"Nuorikkala": "2079",
 	"Nummenmäki": "62",
 	"Nättinummi": "30",
+	"Ojanto": "4004",
 	"Oriniemi": "316",
 	"Oriketo": "1435",
+	"Paasniittu": "4036",
+	"Paattinen": "1170",
+	"Paikkari": "2048",
 	"Pansio": "1506",
 	"Papinsaari": "352",
 	"Patterinhaka": "578",
+	"Peijerlä": "4058",
 	"Peltola": "1455",
 	"Perno": "745",
 	"Pernon telakka": "775",
@@ -69,37 +114,74 @@
 	"Pikisaari": "124",
 	"Pläkkikaupunki": "780",
 	"Pohjola": "1017",
+	"Porhonkallio": "3037",
 	"Port Arthur": "9",
 	"Puutori": "286",
+	"Pyöli": "3247",
 	"Pääskyvuori": "879",
 	"Raision keskusta": "2010",
 	"Raunistula": "224",
 	"Rautatieasema": "144",
 	"Ruissalo": "666",
+	"Ruona": "3220",
 	"Runosmäki": "1015",
+	"Ruskon keskusta": "4017",
+	"Rymättylä": "3151",
 	"Räntämäki": "1441",
+	"Röölä": "3166",
 	"Saaro": "556",
+	"Salonkylä": "3301",
+	"Saramäki": "250",
+	"Okala": "3297",
 	"Satama": "1",
 	"Satava": "373",
+	"Montola": "3157",
+	"Silvola": "4086",
 	"Skanssi": "349",
+	"Airismaa": "3171",
 	"Suikkila": "485",
+	"Suutarla": "3286",
 	"Särkilahti": "404",
+	"Aaslaluoto": "3308",
 	"Teräsrautela": "476",
+	"Tikanmaa": "2136",
 	"Toijainen": "424",
+	"Tortinmäki": "1149",
 	"Tuomiokirkkotori": "131",
 	"TYKS": "1030",
 	"Uittamo": "920",
+	"Urusvuori": "1587",
 	"Vaala": "1500",
+	"Vahto": "4069",
 	"Vaisaari": "2103",
 	"Vanha Suurtori": "219",
 	"Vasaramäki": "1967",
 	"Varissuo": "828",
 	"Verkahovi": "1601",
 	"Vienola": "1020",
+	"Viiala": "3024",
+	"Viluluoto": "3010",
 	"VII kaupunginosa": "109",
+	"Velusmaa": "3287",
 	"Vähä-Heikkilä": "944",
+	"Yli-Maaria": "396",
 	"Yliopistonmäki": "1797",
 	"Ylioppilaskylä-Länsi": "445",
 	"Ylioppilaskylä-Itä": "448",
-	"Caribia": "1643"
+	"Caribia": "1643",
+	"Meripirtti": "3179",
+
+	"Pargas": "8137",
+	"Björkhagen": "8125",
+	"Storäng": "8121",
+	"Norrby": "8142",
+	"Österby": "8140",
+	"Munkviken": "8129",
+	"Tennby": "8127",
+	"Kårkulla": "8105",
+	"Kyrkäng": "8109",
+	"Kirjala": "8102",
+
+
+	"Poikko": "3184"
 }

--- a/alueet.gmp	Sun Apr 23 11:01:51 2017 +0300
+++ b/alueet.gmp	Fri May 19 21:15:12 2017 +0300
@@ -1,4 +1,4 @@
-roadmap^60.42561636788555, 22.308023195782315^16@polygon^#FF0000,5,1,#ff8800,0.4^^60.39482,22.2577~60.40037,22.27521~60.39147,22.28456~60.38851,22.27179
+roadmap^60.430274530422295, 22.693504910984647^15@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
 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
@@ -7,7 +7,6 @@
 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
 polygon^#FF0000,5,1,#ff8800,0.4^^60.42148,22.17333~60.42584,22.18964~60.41902,22.1971~60.41534,22.18056
 polygon^#FF0000,5,1,#ff8800,0.4^^60.51616,22.23289~60.50782,22.23676~60.50492,22.27787~60.50936,22.29718~60.51901,22.29847~60.51961,22.26218
-polygon^#FF0000,5,1,#ff8800,0.4^^60.49144,22.19414~60.4885,22.19573~60.48964,22.20822~60.49153,22.20901~60.49295,22.20801
 polygon^#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
 polygon^#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
 polygon^#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
@@ -20,15 +19,15 @@
 polygon^#FF0000,5,1,#ff8800,0.4^^60.45224,22.29757~60.4499,22.32448~60.4569,22.32432~60.4621,22.31703~60.45992,22.29862~60.45961,22.29964~60.45684,22.30304~60.45528,22.29775~60.45402,22.29882
 polygon^#FF0000,5,1,#ff8800,0.4^^60.45206,22.29738~60.45137,22.2971~60.44687,22.30439~60.44232,22.3131~60.43895,22.31757~60.44625,22.3267~60.44913,22.32902
 polygon^#FF0000,5,1,#ff8800,0.4^^60.35447,22.12646~60.34122,22.13676~60.33714,22.17865~60.35634,22.30671~60.36475,22.31056~60.38221,22.2982~60.37208,22.22194~60.3631,22.16082
-polygon^#FF0000,5,1,#ff8800,0.4^^60.36483,22.11222~60.35498,22.12595~60.34539,22.09816~60.35061,22.08758
-polygon^#FF0000,5,1,#ff8800,0.4^^60.35557,22.12732~60.36614,22.11211~60.37617,22.11563~60.38197,22.13505~60.38392,22.1608~60.38367,22.21058~60.38265,22.23049~60.37467,22.23427~60.36377,22.15899
-polygon^#FF0000,5,1,#ff8800,0.4^^60.44513,22.32739~60.4509,22.33176~60.45303,22.33709~60.45193,22.34516~60.44766,22.34725~60.44482,22.35053~60.44204,22.35147~60.44187,22.33875~60.44334,22.33174
-polygon^#FF0000,5,1,#ff8800,0.4^^60.44211,22.3519~60.44491,22.35092~60.44783,22.34766~60.45206,22.34564~60.45506,22.34898~60.4569,22.35851~60.45464,22.36246~60.44861,22.36587~60.44271,22.36825
-polygon^#FF0000,5,1,#ff8800,0.4^^60.45658,22.33769~60.46067,22.33863~60.46369,22.34413~60.46361,22.35091~60.46069,22.35683~60.45802,22.35761~60.45549,22.34853~60.45532,22.34116
-polygon^#FF0000,5,1,#ff8800,0.4^^60.4623,22.31774~60.46502,22.33262~60.46094,22.33791~60.4565,22.33709~60.45315,22.33619~60.45112,22.33105~60.45135,22.32557~60.45712,22.32505
-polygon^#FF0000,5,1,#ff8800,0.4^^60.42408,22.21672~60.43288,22.20943~60.43357,22.21448~60.43179,22.225~60.42963,22.22912~60.42589,22.23131~60.42324,22.2362~60.42237,22.23158~60.41794,22.22753
-polygon^#FF0000,5,1,#ff8800,0.4^^60.45645,22.26163~60.45447,22.26424~60.45634,22.26935~60.4576,22.26927~60.45794,22.2662
-polygon^#FF0000,5,1,#ff8800,0.4^^60.456,22.26864~60.45472,22.2702~60.45356,22.26639~60.45395,22.26597~60.45512,22.26643
+undefined^#FF0000,5,1,#ff8800,0.4^^60.36483,22.11222~60.35498,22.12595~60.34539,22.09816~60.35061,22.08758
+undefined^#FF0000,5,1,#ff8800,0.4^^60.35557,22.12732~60.36614,22.11211~60.37617,22.11563~60.38197,22.13505~60.38392,22.1608~60.38367,22.21058~60.38265,22.23049~60.37467,22.23427~60.36377,22.15899
+undefined^#FF0000,5,1,#ff8800,0.4^^60.44513,22.32739~60.4509,22.33176~60.45303,22.33709~60.45193,22.34516~60.44766,22.34725~60.44482,22.35053~60.44204,22.35147~60.44187,22.33875~60.44334,22.33174
+undefined^#FF0000,5,1,#ff8800,0.4^^60.44211,22.3519~60.44491,22.35092~60.44783,22.34766~60.45206,22.34564~60.45506,22.34898~60.4569,22.35851~60.45464,22.36246~60.44861,22.36587~60.44271,22.36825
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45658,22.33769~60.46067,22.33863~60.46369,22.34413~60.46361,22.35091~60.46069,22.35683~60.45802,22.35761~60.45549,22.34853~60.45532,22.34116
+undefined^#FF0000,5,1,#ff8800,0.4^^60.4623,22.31774~60.46502,22.33262~60.46094,22.33791~60.4565,22.33709~60.45315,22.33619~60.45112,22.33105~60.45135,22.32557~60.45712,22.32505
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42408,22.21672~60.43288,22.20943~60.43357,22.21448~60.43179,22.225~60.42963,22.22912~60.42589,22.23131~60.42324,22.2362~60.42237,22.23158~60.41794,22.22753
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45645,22.26163~60.45447,22.26424~60.45634,22.26935~60.4576,22.26927~60.45794,22.2662
+undefined^#FF0000,5,1,#ff8800,0.4^^60.456,22.26864~60.45472,22.2702~60.45356,22.26639~60.45395,22.26597~60.45512,22.26643
 undefined^#FF0000,5,1,#ff8800,0.4^^60.45569,22.26935~60.45492,22.27039~60.45569,22.27163~60.45627,22.27076
 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
@@ -95,7 +94,6 @@
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44634,22.22058~60.44405,22.22474~60.44395,22.23328~60.44604,22.23667~60.44797,22.23457~60.44768,22.22393
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44594,22.19951~60.4478,22.19877~60.44824,22.21556~60.44775,22.22051~60.44611,22.22006~60.44378,22.22384~60.44355,22.23234~60.44448,22.23491~60.44422,22.23603~60.43618,22.23813~60.43201,22.22567~60.43402,22.21505~60.43541,22.20654~60.44264,22.2068
 undefined^#FF0000,5,1,#ff8800,0.4^^60.44896,22.2171~60.44767,22.22204~60.44837,22.22394~60.44827,22.23472~60.4463,22.2371~60.45119,22.24507~60.45133,22.24013~60.45296,22.23209~60.45315,22.22472
-undefined^#FF0000,5,1,#ff8800,0.4^^60.41353,22.22066~60.41406,22.23023~60.41201,22.23341~60.40777,22.23693~60.40773,22.24004~60.40468,22.24113~60.4044,22.22382
 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
@@ -112,4 +110,95 @@
 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
+undefined^#FF0000,5,1,#ff8800,0.4^^60.50456,22.27092~60.4942,22.26937~60.49296,22.28753~60.49025,22.30289~60.49583,22.31615~60.50197,22.30518~60.50918,22.29724~60.50454,22.27839
+undefined^#FF0000,5,1,#ff8800,0.4^^60.51907,22.29928~60.50948,22.29774~60.50223,22.30547~60.49598,22.31774~60.4924,22.32691~60.49714,22.33434~60.50004,22.33825~60.50487,22.34078~60.50577,22.34722~60.50741,22.35198~60.51125,22.35147~60.51308,22.34955~60.51599,22.35211~60.51867,22.34943~60.52121,22.35074~60.52359,22.34838~60.52687,22.35005~60.5276,22.32719~60.52621,22.30748
+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
+undefined^#FF0000,5,1,#ff8800,0.4^^60.63183,22.28765~60.62286,22.30757~60.62203,22.30275~60.61859,22.29876~60.61793,22.29512~60.6144,22.291~60.61267,22.28526~60.61524,22.26766~60.62429,22.25701~60.62436,22.27036~60.62543,22.27867~60.62748,22.28476
+undefined^#FF0000,5,1,#ff8800,0.4^^60.5485,22.21865~60.54859,22.22521~60.54679,22.23345~60.54212,22.23594~60.53736,22.23298~60.53583,22.22764~60.53504,22.22218~60.53565,22.21249~60.53877,22.21165
+undefined^#FF0000,5,1,#ff8800,0.4^^60.52877,22.21779~60.52955,22.22865~60.52875,22.23582~60.52454,22.23461~60.52214,22.22831~60.52235,22.21873~60.5245,22.21595
+undefined^#FF0000,5,1,#ff8800,0.4^^60.51975,22.21418~60.52028,22.23079~60.51605,22.23247~60.51343,22.23208~60.51251,22.2238~60.51284,22.21253~60.51642,22.20939
+undefined^#FF0000,5,1,#ff8800,0.4^^60.5124,22.21225~60.51248,22.22451~60.51299,22.23247~60.50741,22.23603~60.50545,22.23423~60.50505,22.22405~60.50632,22.20916~60.50953,22.20603~60.51158,22.20914
+undefined^#FF0000,5,1,#ff8800,0.4^^60.50515,22.21667~60.49938,22.21689~60.50086,22.23793~60.50539,22.23839~60.50476,22.22388
+undefined^#FF0000,5,1,#ff8800,0.4^^60.56523,22.23268~60.56325,22.23641~60.55938,22.23357~60.55631,22.23255~60.55635,22.22264~60.55931,22.22038~60.56377,22.22117~60.56525,22.22697
+undefined^#FF0000,5,1,#ff8800,0.4^^60.59679,22.27705~60.59422,22.28856~60.58484,22.27633~60.59074,22.261~60.59537,22.26289
+undefined^#FF0000,5,1,#ff8800,0.4^^60.60622,22.28272~60.60374,22.29667~60.59449,22.2892~60.59743,22.27614
+undefined^#FF0000,5,1,#ff8800,0.4^^60.5469,22.2341~60.54117,22.23667~60.54289,22.25424~60.54653,22.25504~60.54902,22.25303~60.5496,22.24528~60.54848,22.23719
+undefined^#FF0000,5,1,#ff8800,0.4^^60.53373,22.23598~60.53299,22.25298~60.5291,22.25375~60.52862,22.24042~60.53072,22.23656
+undefined^#FF0000,5,1,#ff8800,0.4^^60.49101,22.19397~60.49163,22.19834~60.49194,22.20178~60.4921,22.20437~60.49179,22.20583~60.49126,22.2083~60.48972,22.20796~60.48979,22.2039~60.48898,22.19994~60.4889,22.19673~60.4897,22.19482
+undefined^#FF0000,5,1,#ff8800,0.4^^60.4934,22.17886~60.48956,22.18084~60.4911,22.19373~60.49171,22.19841~60.49219,22.20442~60.49339,22.21451~60.4971,22.21457
+undefined^#FF0000,5,1,#ff8800,0.4^^60.49721,22.14869~60.50015,22.16573~60.49277,22.17238~60.48988,22.15109
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48622,22.15035~60.48616,22.14137~60.49151,22.13889~60.49218,22.14262~60.49193,22.14929~60.48956,22.15012
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48615,22.14136~60.48618,22.15052~60.48319,22.15037~60.48113,22.14966~60.47855,22.14669~60.48296,22.13831
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46621,22.01291~60.4756,22.03136~60.46964,22.04724~60.45966,22.02782
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48839,22.11325~60.48786,22.11544~60.48829,22.11771~60.48993,22.11788~60.49843,22.11377~60.49917,22.10025~60.49584,22.08536~60.4908,22.08252~60.48687,22.07969~60.48549,22.08037~60.48585,22.09461~60.48687,22.09672~60.48795,22.10552~60.48788,22.10548
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48539,22.08031~60.48569,22.09469~60.48678,22.09683~60.48766,22.10531~60.48835,22.11316~60.4877,22.11514~60.48809,22.11745~60.48705,22.1193~60.48378,22.10835~60.48163,22.09588~60.48026,22.08837~60.48112,22.08156
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48793,22.05986~60.48292,22.06321~60.48423,22.07634~60.4891,22.07471
+undefined^#FF0000,5,1,#ff8800,0.4^^60.47963,22.0434~60.48179,22.04952~60.48136,22.05795~60.47832,22.06057~60.47644,22.05118~60.4777,22.04725
+undefined^#FF0000,5,1,#ff8800,0.4^^60.47451,22.05205~60.47139,22.04357~60.47441,22.03658~60.47698,22.04613
+undefined^#FF0000,5,1,#ff8800,0.4^^60.48013,22.04005~60.47721,22.04623~60.4745,22.03626~60.47745,22.02811~60.47991,22.03291
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46934,22.00377~60.46376,22.006~60.45842,22.00107~60.45739,21.99416~60.45956,21.9855~60.4627,21.98495~60.46486,21.9869~60.46816,21.99042~60.47118,21.99553~60.47116,22.00085
+undefined^#FF0000,5,1,#ff8800,0.4^^60.4583,21.9657~60.45409,21.96832~60.45339,21.98699~60.45687,21.98618~60.45903,21.97556
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46479,21.93772~60.4601,21.94146~60.45912,21.95794~60.45933,21.96746~60.46305,21.96746~60.46538,21.95206
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45817,21.93747~60.45787,21.95395~60.45461,21.96017~60.44968,21.95759~60.44452,21.94811~60.44901,21.93678~60.4558,21.93259
+undefined^#FF0000,5,1,#ff8800,0.4^^60.47289,21.92545~60.47127,21.93193~60.4642,21.93661~60.45933,21.93905~60.45779,21.93472~60.45682,21.93004~60.46058,21.92725~60.46553,21.92554
+undefined^#FF0000,5,1,#ff8800,0.4^^60.44672,21.99368~60.44539,22.01072~60.43828,22.0106~60.43692,21.99503~60.4419,21.98714
+undefined^#FF0000,5,1,#ff8800,0.4^^60.43249,21.99471~60.42817,21.99317~60.42641,21.99991~60.42794,22.00707~60.43068,22.00725~60.43279,22.00142
+undefined^#FF0000,5,1,#ff8800,0.4^^60.4291,22.01385~60.42671,22.02724~60.4225,22.02561~60.42091,22.01817~60.42152,22.00729~60.42571,22.00965
+undefined^#FF0000,5,1,#ff8800,0.4^^60.43711,22.03643~60.43147,22.03844~60.43175,22.02212~60.43729,22.02329~60.43808,22.03051
+undefined^#FF0000,5,1,#ff8800,0.4^^60.43713,22.03784~60.43264,22.03969~60.4338,22.05253~60.4375,22.05188~60.43833,22.04534
+undefined^#FF0000,5,1,#ff8800,0.4^^60.43237,22.04244~60.43385,22.05553~60.43279,22.06823~60.42902,22.06797~60.42481,22.06334~60.42356,22.05095~60.42731,22.04409
+undefined^#FF0000,5,1,#ff8800,0.4^^60.44632,22.01141~60.43693,22.01184~60.43838,22.03102~60.4431,22.0342~60.44734,22.02842
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45153,21.99738~60.45208,22.01853~60.44772,22.0278~60.44674,22.0081~60.4474,21.99635
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45536,21.99716~60.45548,22.01993~60.45229,22.01896~60.45182,21.99755
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45817,22.00171~60.45587,22.00239~60.45578,22.02025~60.45977,22.02428~60.46318,22.01614~60.46463,22.00757
+undefined^#FF0000,5,1,#ff8800,0.4^^60.38468,21.92931~60.3751,21.92828~60.37034,21.933~60.37009,21.94914~60.37247,21.95781~60.37684,21.96141~60.38138,21.95583~60.38395,21.9437
+undefined^#FF0000,5,1,#ff8800,0.4^^60.39196,21.96356~60.38507,21.95802~60.38214,21.95519~60.38389,21.94663~60.38839,21.94785~60.3915,21.95289~60.39255,21.95558
+undefined^#FF0000,5,1,#ff8800,0.4^^60.39219,21.96429~60.39327,21.97081~60.39785,21.97493~60.40239,21.98922~60.39959,22.00454~60.3896,22.00042~60.38519,21.98236~60.38545,21.96723~60.38557,21.9592
+undefined^#FF0000,5,1,#ff8800,0.4^^60.37034,21.85902~60.37798,21.86576~60.379,21.88296~60.37701,21.89919~60.37115,21.89893~60.36266,21.89318
+undefined^#FF0000,5,1,#ff8800,0.4^^60.36147,21.91858~60.34742,21.89533~60.35684,21.81905~60.36498,21.816~60.36818,21.82743~60.36631,21.86932~60.3619,21.89292
+undefined^#FF0000,5,1,#ff8800,0.4^^60.345,21.93592~60.35307,21.93884~60.35161,21.96677~60.34273,21.96631
+undefined^#FF0000,5,1,#ff8800,0.4^^60.34721,21.8967~60.34462,21.93069~60.35386,21.93677~60.36105,21.94742~60.36139,21.91931
+undefined^#FF0000,5,1,#ff8800,0.4^^60.37034,21.91867~60.36958,21.96193~60.36075,21.95832~60.36209,21.91776
+undefined^#FF0000,5,1,#ff8800,0.4^^60.33213,21.94819~60.33858,22.00361~60.33052,22.04098~60.31658,22.04338~60.30279,22.02163~60.31461,21.96875~60.3181,21.9125~60.3248,21.91719~60.32677,21.94377
+undefined^#FF0000,5,1,#ff8800,0.4^^60.31615,21.91275~60.31411,21.96682~60.30382,22.00253~60.2732,21.95927~60.27022,21.9039~60.27743,21.86993~60.31041,21.86229
+undefined^#FF0000,5,1,#ff8800,0.4^^60.4588,21.89253~60.46342,21.91277~60.45913,21.92518~60.45353,21.92335~60.45278,21.89848
+undefined^#FF0000,5,1,#ff8800,0.4^^60.41993,21.88532~60.41981,21.90974~60.41084,21.90961~60.40606,21.90507~60.40658,21.88517~60.41376,21.88275
+undefined^#FF0000,5,1,#ff8800,0.4^^60.40559,21.87069~60.3973,21.86145~60.39395,21.86816~60.3913,21.88425~60.39673,21.89541~60.40183,21.90391~60.40548,21.90203~60.40573,21.88763~60.40638,21.87778
+undefined^#FF0000,5,1,#ff8800,0.4^^60.41411,21.86657~60.40649,21.87274~60.4061,21.86952~60.39758,21.85996~60.3999,21.84439~60.40677,21.84254~60.41169,21.84863
+undefined^#FF0000,5,1,#ff8800,0.4^^60.41625,21.84606~60.41236,21.83934~60.4107,21.84571~60.41211,21.8485~60.41383,21.85666~60.41599,21.85209
+undefined^#FF0000,5,1,#ff8800,0.4^^60.41608,21.82546~60.4126,21.83867~60.41642,21.84571~60.41676,21.8476~60.41523,21.85736~60.41847,21.86356~60.42265,21.85766~60.42449,21.84555~60.42942,21.83726~60.4271,21.82994~60.42242,21.82972~60.41895,21.82501
+undefined^#FF0000,5,1,#ff8800,0.4^^60.40953,21.82254~60.40847,21.8294~60.39851,21.83172~60.39584,21.81224~60.39433,21.78955~60.40101,21.78666~60.40682,21.80082
+undefined^#FF0000,5,1,#ff8800,0.4^^60.39418,21.79404~60.38477,21.79782~60.3818,21.81018~60.39284,21.83845~60.3988,21.8367~60.39539,21.81194
+undefined^#FF0000,5,1,#ff8800,0.4^^60.44168,21.89524~60.43967,21.92588~60.4315,21.92446~60.43124,21.91478~60.43522,21.91076~60.43514,21.89388
+undefined^#FF0000,5,1,#ff8800,0.4^^60.31005,22.31126~60.30829,22.31139~60.30549,22.32734~60.3091,22.33233
+undefined^#FF0000,5,1,#ff8800,0.4^^60.31726,22.31225~60.31029,22.31812~60.31014,22.31119~60.30795,22.30609~60.31543,22.30019
+undefined^#FF0000,5,1,#ff8800,0.4^^NaN,NaN
+undefined^#FF0000,5,1,#ff8800,0.4^^60.30946,22.30409~60.30757,22.30542~60.30366,22.30785~60.29686,22.30906~60.2964,22.29239~60.30305,22.29152~60.30762,22.29572~60.30874,22.29992
+undefined^#FF0000,5,1,#ff8800,0.4^^60.29872,22.3089~60.29602,22.30952~60.29306,22.30779~60.2912,22.31036~60.29087,22.31654~60.2948,22.31885~60.30009,22.31516~60.2991,22.31073
+undefined^#FF0000,5,1,#ff8800,0.4^^60.30564,22.32491~60.30443,22.32312~60.30334,22.31706~60.3037,22.30853~60.30703,22.30615~60.30808,22.31085
+undefined^#FF0000,5,1,#ff8800,0.4^^60.30238,22.31725~60.30307,22.32282~60.30508,22.3254~60.30326,22.33505~60.29891,22.32422~60.29814,22.31792~60.30027,22.31532
+undefined^#FF0000,5,1,#ff8800,0.4^^60.31741,22.31302~60.3105,22.31933~60.31371,22.33881~60.32013,22.3443~60.32292,22.3345~60.32233,22.32158
+undefined^#FF0000,5,1,#ff8800,0.4^^60.35167,22.34817~60.34309,22.34877~60.34296,22.37713~60.34534,22.39574~60.35086,22.39134~60.35266,22.37124~60.35292,22.35754
+undefined^#FF0000,5,1,#ff8800,0.4^^60.32516,22.33495~60.3187,22.36885~60.32113,22.38284~60.32541,22.38764~60.33406,22.35426~60.33033,22.34112
+undefined^#FF0000,5,1,#ff8800,0.4^^60.36324,22.34812~60.35388,22.34658~60.35574,22.37044~60.36562,22.36825
+undefined^#FF0000,5,1,#ff8800,0.4^^60.41358,22.22011~60.40495,22.22367~60.40406,22.2398~60.40792,22.23734~60.41234,22.23324~60.41464,22.22954~60.41648,22.22409
+undefined^#FF0000,5,1,#ff8800,0.4^^60.50787,22.44893~60.50853,22.45912~60.50819,22.46699~60.50497,22.46741~60.50317,22.4648~60.50189,22.45962~60.50153,22.45521~60.50215,22.45004~60.50255,22.44831~60.50485,22.44773
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42716,22.51605~60.42152,22.51764~60.42273,22.53824~60.42689,22.53533~60.42836,22.52668
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42815,22.51498~60.42365,22.51652~60.42286,22.50405~60.42545,22.50265~60.42893,22.50496~60.4312,22.51206
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42341,22.51682~60.42117,22.51721~60.42146,22.51966~60.41629,22.51476~60.41456,22.50974~60.4169,22.50669~60.42265,22.50845
+undefined^#FF0000,5,1,#ff8800,0.4^^60.41695,22.42666~60.40546,22.43262~60.40915,22.45477~60.42096,22.44649
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42114,22.44678~60.42228,22.457~60.41074,22.47228~60.40917,22.45584
+undefined^#FF0000,5,1,#ff8800,0.4^^60.4226,22.45713~60.42427,22.45721~60.42595,22.46996~60.42413,22.48103~60.41961,22.48056~60.41902,22.46213
+undefined^#FF0000,5,1,#ff8800,0.4^^60.42517,22.48142~60.41548,22.48056~60.41682,22.503~60.42228,22.50318~60.42232,22.49283
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45777,22.67578~60.45959,22.68239~60.45933,22.69372~60.45603,22.70428~60.45167,22.70831~60.44664,22.70857~60.44423,22.69632~60.44532,22.68055~60.44647,22.67252~60.44863,22.67166
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45944,22.67733~60.46092,22.69544~60.46672,22.69458~60.46699,22.66836~60.46703,22.6487~60.4624,22.64464
+undefined^#FF0000,5,1,#ff8800,0.4^^60.46799,22.7305~60.46779,22.73739~60.465,22.74003~60.46261,22.73803~60.46217,22.73225~60.4629,22.72985
+undefined^#FF0000,5,1,#ff8800,0.4^^60.45777,22.70256~60.45065,22.7114~60.46046,22.73801~60.46591,22.71834
+undefined^#FF0000,5,1,#ff8800,0.4^^60.43692,22.68321~60.43455,22.69084~60.42925,22.69067~60.42557,22.6866~60.42517,22.68029~60.42591,22.67351~60.42804,22.66844~60.43214,22.66584~60.43605,22.67028~60.43688,22.67745
 @@@@@@

--- a/bussit.py	Sun Apr 23 11:01:51 2017 +0300
+++ b/bussit.py	Fri May 19 21:15:12 2017 +0300
@@ -6,7 +6,7 @@
 Suunta = enum.Enum('Suunta', [('Taaksepäin', 0), ('Eteenpäin', 1)])
 
 def muunna_ajovuoro_tunniste(tunniste):
-	return int(tunniste.split('_')[0])
+	return tunniste
 
 class Ajovuoro:
 	def __init__(self, tunniste, linja, palvelu, kyltti, suunta):
@@ -78,14 +78,14 @@
 					if pysähdys and pysähdys is not ajo.reitti[-1]:
 						# ja jos tämä pysähdys on tulevaisuudessa,
 						aika = datetime.combine(päivä, time()) + pysähdys.saapumisaika
-						if aika >= datetime.now():
+						if aika >= nyt():
 							# lisää pysähdys listaan.
 							taulu.append((aika, pysähdys))
 			# Lajittele lopputulos saapumisajan mukaan.
 			taulu.sort(key = lambda tietue: tietue[0])
 			return taulu
 		taulu = []
-		päivä = date.today()
+		päivä = tänään()
 		# Niin kauan kuin aikatauluja ei ole vielä tarpeeksi,
 		while len(taulu) < määrä:
 			try:
@@ -189,4 +189,4 @@
 		laskettu += 1
 		if laskettu % 1000 == 0:
 			print('\rLadataan aikataulut... %.1f%%' % (laskettu * 100 / rivimäärä), end = ' ', file = stderr)
-print('\rLadataan aikataulut... ladattu', file = stderr)
\ No newline at end of file
+print('\rLadataan aikataulut... ladattu', file = stderr)

--- a/misc.py	Sun Apr 23 11:01:51 2017 +0300
+++ b/misc.py	Fri May 19 21:15:12 2017 +0300
@@ -1,3 +1,23 @@
+from datetime import datetime, date, time, timedelta
+
+def tänään():
+	return date.today()
+	#return date(2017, 4, 10)
+
+def nyt():
+	return datetime.now()
+	#return datetime.combine(tänään(), datetime.now().time())
+
+def muotoile_aika(aika, suhteellinen = True):
+	erotus = aika - nyt()
+	if suhteellinen and erotus < timedelta(minutes = 30):
+		return '%dm' % round(erotus.seconds / 60)
+	elif aika.date() == tänään():
+		return '%d:%02d' % (aika.hour, aika.minute)
+	elif erotus < timedelta(7):
+		return aika.strftime('%-a %H:%M')
+	else:
+		return aika.strftime('%-d.%-m. %H:%M')
 
 def lue_csv(tiedosto, muunnokset = None):
 	import csv
@@ -8,4 +28,7 @@
 		if muunnokset:
 			for avain, muunnos in muunnokset.items():
 				tietue[avain] = muunnos(tietue[avain])
-		yield tietue
\ No newline at end of file
+		yield tietue
+
+def yö(aika):
+	return aika.hour >= 23 or aika.hour < 5

--- a/palvelu.py	Sun Apr 23 11:01:51 2017 +0300
+++ b/palvelu.py	Fri May 19 21:15:12 2017 +0300
@@ -1,22 +1,12 @@
 #!/usr/bin/env python3
 from flask import Flask, render_template, abort
 from datetime import datetime, date, time, timedelta
+from misc import *
 import locale
 
 app = Flask(__name__)
 locale.setlocale(locale.LC_ALL, locale.getdefaultlocale())
 
-def muotoile_aika(aika, suhteellinen = True):
-	erotus = aika - datetime.now()
-	if suhteellinen and erotus < timedelta(minutes = 30):
-		return '%dm' % round(erotus.seconds / 60)
-	elif aika.day == datetime.now().day:
-		return '%d:%02d' % (aika.hour, aika.minute)
-	elif erotus < timedelta(7):
-		return aika.strftime('%-a %H:%M')
-	else:
-		return aika.strftime('%-d.%-m. %H:%M')
-
 @app.route('/pysäkki/<tunniste>')
 def pysäkkiaikataulu(tunniste):
 	from bussit import pysäkit
@@ -31,10 +21,11 @@
 			'linja': pysähdys.ajo.linja.viite,
 			'kyltti': pysähdys.ajo.kyltti,
 			'ajovuoro': pysähdys.ajo.nimi,
+			'yö': yö(aika),
 		})
 	return render_template('pysäkki.html', aikataulu = aikataulu, viite = tunniste, nimi = pysäkki.nimi)
 
-@app.route('/ajovuoro/<int:numero>')
+@app.route('/ajovuoro/<numero>')
 def ajoreitti(numero):
 	from flask import request
 	from bussit import ajot
@@ -47,8 +38,8 @@
 	suppea_reitti = []
 	käydyt_alueet = set()
 	for pysähdys in ajovuoro.reitti:
-		aika = datetime.combine(date.today(), time()) + pysähdys.saapumisaika
-		muotoiltu_aika = muotoile_aika(aika, suhteellinen = False)
+		aika = datetime.combine(tänään(), time()) + pysähdys.saapumisaika
+		muotoiltu_aika = muotoile_aika(aika)
 		reitti.append({
 			'aika': muotoiltu_aika,
 			'tunniste': pysähdys.pysäkki.tunniste,
@@ -65,7 +56,8 @@
 				käydyt_alueet.add(alue)
 	sivu = suppea and 'ajovuoro-suppea.html' or 'ajovuoro.html'
 	return render_template(sivu, reitti = reitti, suppea_reitti = suppea_reitti,
-						numero = numero, linja = ajovuoro.linja.viite, selite = ajovuoro.kyltti)
+						numero = numero, linja = ajovuoro.linja.viite, selite = ajovuoro.kyltti,
+						yö = yö(datetime.combine(tänään(), time()) + ajovuoro.reitti[-1].saapumisaika))
 
 if __name__ == '__main__':
 	from argparse import ArgumentParser

--- a/sv.ini	Sun Apr 23 11:01:51 2017 +0300
+++ b/sv.ini	Fri May 19 21:15:12 2017 +0300
@@ -1,5 +1,10 @@
-[paikkanimet]
-pikisaari = Bäckholmen
+[pysäkit]
+artukainen = Artukais
+artukaisten tehtaat = Artukais fabriker
+urusvuori = Urusberget
+sähkölaitos = Elverket
+pihlajaniemi = Rönnudden
+pikisaari = Beckholmen
 vaala = Svala
 puutori = Trätorget
 panimo = Bryggeri
@@ -119,9 +124,7 @@
 arholankuja = Arholankuja
 arontie = Arontie
 artturinkatu = Artturinkatu
-artukainen = Artukainen
 artukaisten kiitotie = Artukaisten kiitotie
-artukaisten tehtaat = Artukaisten tehtaat
 artukaistentie = Artukaistentie
 artukantie = Artukantie
 arvinkatu = Arvinkatu
@@ -164,7 +167,6 @@
 brinkhallintie = Brinkhallintie
 browalliuksenkuja = Browalliuksenkuja
 capsiankatu = Capsiankatu
-citymarket = Citymarket
 ekvalla = Ekvalla
 elinantie = Elinantie
 elisabetinkatu = Elisabetinkatu
@@ -480,8 +482,6 @@
 kemiön linja-autoasema = Kemiön linja-autoasema
 kemppilänkatu = Kemppilänkatu
 kenraalintie = Kenraalintie
-keo = Keo
-keonpellonkatu = Keonpellonkatu
 kerkola = Kerkola
 kerrola = Kerrola
 kerrumi = Kerrumi
@@ -1056,7 +1056,6 @@
 petäsmäki = Petäsmäki
 pihkalankatu = Pihkalankatu
 pihlajakuja = Pihlajakuja
-pihlajaniemi = Pihlajaniemi
 piikkiön koulukeskus = Piikkiön koulukeskus
 piikkiön palvelupiste = Piikkiön palvelupiste
 piikkiön terveyskeskus = Piikkiön terveyskeskus
@@ -1355,7 +1354,6 @@
 syrjäläntie = Syrjäläntie
 syvälahti = Syvälahti
 sädekuja = Sädekuja
-sähkölaitos = Sähkölaitos
 säkyläntie = Säkyläntie
 säkäkuja = Säkäkuja
 särkelä = Särkelä
@@ -1504,7 +1502,6 @@
 urpontie = Urpontie
 ursininkatu = Ursininkatu
 urushaara = Urushaara
-urusvuori = Urusvuori
 uudenkyläntie = Uudenkyläntie
 uudenmaantie = Uudenmaantie
 uudenmaantulli = Uudenmaantulli
@@ -1517,7 +1514,6 @@
 vaasanpuisto = Vaasanpuisto
 vahdon kirkko = Vahdon kirkko
 vahto keskusta = Vahto keskusta
-vaisaari = Vaisaari
 vaistentie = Vaistentie
 vajossuonkatu = Vajossuonkatu
 vakka-suomentie = Vakka-Suomentie
@@ -1640,8 +1636,70 @@
 yrjänänaukio = Yrjänänaukio
 yrjönniityntie = Yrjönniityntie
 öljysatama = Öljysatama
-österby e = Österby E
-österby i = Österby I
-österby l = Österby L
-österby p = Österby P
 öölanninkatu = Öölanninkatu
+
+[paikat]
+artukainen = Artukais
+eerikvalla = Erikvalla
+haarla = Harlax
+halinen = Halinen
+härkämäki = Oxbacka
+illoinen = Illois
+ilpoinen = Ilpois
+itäharju = Österås
+itäranta = Öststranden
+ispoinen = Ispois
+kaistarniemi = Kaistarudden
+katariina = Katarina
+kauppatori = Salutorget
+kerttuli = Gertrudsbacken
+koivula = Björkas
+konserttitalo = Konserthuset
+kuninkoja = Kungsbäcken
+kupittaa = Kuppis
+kurala (naantali) = Kurala
+kurjenmäki = Tranbacken
+kuuvuori = Månberget
+iso-heikkilä = Storheikkilä
+isokylä = Storby
+lauste = Laustis
+lauttaranta = Färjstranden
+lentoasema = Flygplatsen
+liljalaakso = Liljedalen
+linja-autoasema = Linjebilstationen
+littoinen = Littois
+majakkaranta = Fyrstranden
+moikoinen = Moikois
+naantali = Nådendal
+nummenmäki = Nummisbacken
+paattinen = Patis
+papinsaari = Prästholmen
+patterinhaka = Batterihagen
+pernon telakka = Perno varvet
+pikisaari = Beckholmen
+pohjola = Norrstan
+puutori = Trätorget
+pääskyvuori = Svalberga
+raision keskusta = 
+rautatieasema = Järnvägsstation
+ruissalo = Runsala
+runosmäki = Runosbacken
+ruskon keskusta = Rusko centrum
+rymättylä = Rimito
+saramäki = Starrbacka
+satama = Hamnen
+skanssi = Skansen
+tuomiokirkkotori = Domkyrkotorget
+tyks = ÅUCS
+urusvuori = Urusberget
+vaala = Svalas
+vanha suurtori = Gamla Stortorget
+vasaramäki = Hammarbacka
+varissuo = Kråkkärret
+vii kaupunginosa = VII stadsdelen
+vähä-heikkilä = Lillheikkilä
+yli-maaria = Övre S:t Marie
+yliopistonmäki = Universitetsbacken
+ylioppilaskylä-länsi = Västra Studentbyn
+ylioppilaskylä-itä = Östra Studentbyn
+caribia = Spa Caribia

--- a/templates/ajovuoro-suppea.html	Sun Apr 23 11:01:51 2017 +0300
+++ b/templates/ajovuoro-suppea.html	Fri May 19 21:15:12 2017 +0300
@@ -5,7 +5,7 @@
 	<style>
 	body
 	{
-		font-family: "Latin Modern Sans", Tahoma, FreeSans, Arial, sans-serif;
+		font-family: FreeSans, Arial, sans-serif;
 		background: white;
 		color: black;
 		margin: 0;
@@ -54,10 +54,10 @@
 		font-variant: small-caps;
 	}
 	</style>
-	<title>Ajovuoro #{{numero}}: {{linja}} {{selite}}</title>
+	<title>{{linja}} {{selite}}</title>
 </head>
 <body>
-	<h1>Ajo {{numero}}: {{linja}} {{selite}}</h1>
+	<h1>{{linja}} {{selite}}</h1>
 	<table id='aikataulu'>
 		<tr>
 			<th class='sarake-aika'>Aika</th>
@@ -71,4 +71,4 @@
 		{% endfor %}
 	</table>
 </body>
-</html>
\ No newline at end of file
+</html>

--- a/templates/ajovuoro.html	Sun Apr 23 11:01:51 2017 +0300
+++ b/templates/ajovuoro.html	Fri May 19 21:15:12 2017 +0300
@@ -5,7 +5,7 @@
 	<style>
 	body
 	{
-		font-family: "Latin Modern Sans", Tahoma, FreeSans, Arial, sans-serif;
+		font-family: "Oxygen-Sans", FreeSans, Arial, sans-serif;
 		background: white;
 		color: black;
 		margin: 0;
@@ -54,10 +54,15 @@
 		font-variant: small-caps;
 	}
 	</style>
-	<title>Ajovuoro #{{numero}}: {{linja}} {{selite}}</title>
+	<!--<title>Ajovuoro #{{numero}}: {{linja}} {{selite}}</title>-->
+	<title>{{linja}} {{selite}}</title>
 </head>
 <body>
-	<h1>Ajo {{numero}}: {{linja}} {{selite}}</h1>
+	<h1>
+	{% if yö %}
+	&#127769;
+	{% endif %}
+	<!--Ajo {{numero}}: -->{{linja}} {{selite}}</h1>
 	<table id='aikataulu'>
 		<tr>
 			<th class='sarake-aika'>Aika</th>
@@ -81,4 +86,4 @@
 		{% endfor %}
 	</table>
 </body>
-</html>
\ No newline at end of file
+</html>

--- a/templates/pysäkki.html	Sun Apr 23 11:01:51 2017 +0300
+++ b/templates/pysäkki.html	Fri May 19 21:15:12 2017 +0300
@@ -5,7 +5,7 @@
 	<style>
 	body
 	{
-		font-family: "Latin Modern Sans", Tahoma, FreeSans, Arial, sans-serif;
+		font-family: "Oxygen-Sans", "Latin Modern Sans", Tahoma, FreeSans, Arial, sans-serif;
 		background: white;
 		color: black;
 		margin: 0;
@@ -53,6 +53,15 @@
 	{
 		font-variant: small-caps;
 	}
+
+	.yölinja
+	{
+		background-color: #AAF;
+		color: #00A;
+		padding-left: 6px;
+		padding-right: 6px;
+		border: 1px solid #00A;
+	}
 	</style>
 	<title>{{viite}} {{nimi}}</title>
 </head>
@@ -68,7 +77,13 @@
 		<tr>
 			<td class='sarake-aika'>{{rivi['aika']}}</td>
 			<td class='sarake-linja linja'>
+				{% if rivi['yö'] %}
+				<span class="yölinja">
+				{% endif %}
 				<a href="/ajovuoro/{{rivi['ajovuoro']}}">{{rivi['linja']}}</a>
+				{% if rivi['yö'] %}
+				</span>
+				{% endif %}
 			</td>
 			<td class='sarake-määränpää'>
 				<a href="/ajovuoro/{{rivi['ajovuoro']}}">{{rivi['kyltti']}}</a>
@@ -77,4 +92,4 @@
 		{% endfor %}
 	</table>
 </body>
-</html>
\ No newline at end of file
+</html>