# HG changeset patch # User Teemu Piippo # Date 1492934511 -10800 # Node ID ca2df60215ff6f10b0d5cc3bb15e5f92fabcd7ce # Parent 48efa8ca14dd705b6e508f331929eb7b65c544ad Lisätty alueita diff -r 48efa8ca14dd -r ca2df60215ff alue-edustajat.json --- a/alue-edustajat.json Tue Apr 18 14:59:18 2017 +0300 +++ b/alue-edustajat.json Sun Apr 23 11:01:51 2017 +0300 @@ -2,13 +2,20 @@ "Artukainen": "1516", "Eerikvalla": "395", "Friskala": "394", + "Jyrkkälä": "758", "Haarla": "364", "Halinen": "1628", + "Harittu": "1489", "Hepokulta": "26", + "Häppilä": "409", + "Härkämäki": "761", "Ihala": "2098", + "Illoinen": "324", + "Ilpoinen": "456", "Impivaara": "1564", "Itäharju": "1672", "Itäranta": "332", + "Ispoinen": "647", "Jänessaari": "437", "Kaistarniemi": "1747", "Kakskerta": "1764", @@ -16,40 +23,56 @@ "Katariina": "1708", "Kauppatori": "T1", "Kerttuli": "867", + "Koivula": "788", "Kohmo": "1651", "Konserttitalo": "18", - "Kukola": "303", + "Kukola": "1732", "Kuninkoja": "2129", "Kupittaa": "1972", "Kurala": "1660", + "Kurjenmäki": "1688", "Kuuvuori": "218", + "Kähäri": "1022", + "Kärsämäki": "192", + "Iso-Heikkilä": "768", + "Lauste": "708", "Lauttaranta": "128", "Lentoasema": "1586", "Liljalaakso": "592", "Linja-autoasema": "41", "Littoinen": "6085", + "Luolavuori": "1721", "Luostarinmäki": "864", "Länsinummi": "818", "Maanpää": "1729", "Majakkaranta": "81", "Marjaniemi": "534", "Martti": "74", + "Metsäaro": "2089", + "Mäntymäki": "1800", "Moikoinen": "90", + "Muhkuri": "899", "Mylly": "2117", "Mälikkälä": "781", + "Nuorikkala": "2079", "Nummenmäki": "62", "Nättinummi": "30", "Oriniemi": "316", "Oriketo": "1435", "Pansio": "1506", "Papinsaari": "352", + "Patterinhaka": "578", + "Peltola": "1455", "Perno": "745", "Pernon telakka": "775", + "Piispanristi": "6282", "Pikisaari": "124", "Pläkkikaupunki": "780", + "Pohjola": "1017", "Port Arthur": "9", "Puutori": "286", "Pääskyvuori": "879", + "Raision keskusta": "2010", "Raunistula": "224", "Rautatieasema": "144", "Ruissalo": "666", @@ -58,16 +81,25 @@ "Saaro": "556", "Satama": "1", "Satava": "373", + "Skanssi": "349", "Suikkila": "485", + "Särkilahti": "404", "Teräsrautela": "476", + "Toijainen": "424", "Tuomiokirkkotori": "131", "TYKS": "1030", "Uittamo": "920", + "Vaala": "1500", + "Vaisaari": "2103", "Vanha Suurtori": "219", + "Vasaramäki": "1967", "Varissuo": "828", "Verkahovi": "1601", - "VII": "109", + "Vienola": "1020", + "VII kaupunginosa": "109", "Vähä-Heikkilä": "944", "Yliopistonmäki": "1797", - "Ylioppilaskylä": "1643" -} \ No newline at end of file + "Ylioppilaskylä-Länsi": "445", + "Ylioppilaskylä-Itä": "448", + "Caribia": "1643" +} diff -r 48efa8ca14dd -r ca2df60215ff alueet.gmp --- a/alueet.gmp Tue Apr 18 14:59:18 2017 +0300 +++ b/alueet.gmp Sun Apr 23 11:01:51 2017 +0300 @@ -1,52 +1,41 @@ -roadmap^60.443792526257056, 22.279618602314603^15@undefined^#FF0000,5,1,#ff8800,0.4^^60.4609,22.28027~60.46498,22.28722~60.46587,22.29813~60.4646,22.30422~60.46284,22.30463~60.46111,22.3071~60.45995,22.29775~60.45769,22.28959~60.45981,22.28626 -polygon^#FF0000,5,1,#ff8800,0.4^^60.4716,22.30774~60.47444,22.31868~60.47537,22.32499~60.47319,22.3325~60.46946,22.33473~60.46617,22.33658~60.46503,22.3245~60.46416,22.30973~60.47051,22.30346 -polygon^#FF0000,5,1,#ff8800,0.4^^60.44255,22.20659~60.44617,22.19914~60.45022,22.19881~60.44886,22.21573~60.44435,22.23624~60.43617,22.23826~60.43205,22.22517~60.43592,22.20679 -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.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 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 -polygon^#FF0000,5,1,#ff8800,0.4^^60.41228,22.23341~60.40674,22.23847~60.40283,22.23487~60.40258,22.2168~60.40696,22.21113~60.41236,22.21849 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 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 -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.46742,22.16646~60.47441,22.16731~60.47744,22.17186~60.47668,22.17882~60.4752,22.18835~60.47127,22.19204~60.46632,22.19152~60.46475,22.18783~60.46403,22.17242 -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.45449,22.27684~60.45363,22.28081~60.45187,22.28268~60.45021,22.27761~60.45183,22.27498~60.45315,22.276 -undefined^#FF0000,5,1,#ff8800,0.4^^60.45191,22.28278~60.45318,22.28653~60.45331,22.28639~60.45376,22.28747~60.45455,22.2916~60.45579,22.29063~60.45768,22.28938~60.45871,22.28782~60.45974,22.28622~60.4608,22.28048~60.45965,22.27872~60.45826,22.27791~60.45722,22.2778~60.45553,22.27757~60.45456,22.27695~60.45369,22.28097 -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 -undefined^#FF0000,5,1,#ff8800,0.4^^60.42205,22.23332~60.41743,22.22843~60.41462,22.23002~60.41226,22.23362~60.40794,22.23766~60.40841,22.26324~60.41685,22.25384~60.42155,22.24643~60.42243,22.23594 -undefined^#FF0000,5,1,#ff8800,0.4^^60.4537,22.25043~60.45203,22.25283~60.45345,22.25685~60.45493,22.25432 -undefined^#FF0000,5,1,#ff8800,0.4^^60.45014,22.27757~60.4531,22.28664~60.45031,22.29057~60.44735,22.28184 -undefined^#FF0000,5,1,#ff8800,0.4^^60.44005,22.2866~60.44433,22.30705~60.44753,22.30114~60.45008,22.29708~60.4519,22.29485~60.45193,22.2942~60.45107,22.2933~60.44645,22.27961~60.44438,22.28246 -undefined^#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 -undefined^#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 -undefined^#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 -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 +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 +polygon^#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 +polygon^#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 +polygon^#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 +polygon^#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 +polygon^#FF0000,5,1,#ff8800,0.4^^60.42205,22.23332~60.41743,22.22843~60.41462,22.23002~60.41226,22.23362~60.40794,22.23766~60.40841,22.26324~60.41685,22.25384~60.42155,22.24643~60.42243,22.23594 +polygon^#FF0000,5,1,#ff8800,0.4^^60.4537,22.25043~60.45203,22.25283~60.45345,22.25685~60.45493,22.25432 +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.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^^NaN,NaN 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^^NaN,NaN undefined^#FF0000,5,1,#ff8800,0.4^^60.4848,22.22929~60.4745,22.23281~60.47744,22.25101~60.48083,22.25006~60.48293,22.24869~60.48568,22.24715 undefined^#FF0000,5,1,#ff8800,0.4^^60.47431,22.23298~60.4707,22.23392~60.4664,22.2498~60.47087,22.2528~60.47636,22.25137~60.47635,22.24784 undefined^#FF0000,5,1,#ff8800,0.4^^60.48011,22.225~60.48002,22.23015~60.4683,22.23427~60.47094,22.22069 @@ -56,8 +45,6 @@ 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.42578,22.26521~60.41983,22.26733~60.41353,22.26766~60.41256,22.25922~60.41749,22.25439~60.4231,22.24424 -undefined^#FF0000,5,1,#ff8800,0.4^^60.41004,22.26508~60.41744,22.27211~60.41898,22.29023~60.4105,22.29177~60.40538,22.2807~60.4063,22.26891 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 @@ -74,4 +61,55 @@ undefined^#FF0000,5,1,#ff8800,0.4^^60.43711,22.25976~60.4297,22.26362~60.43476,22.28431~60.4409,22.27738 undefined^#FF0000,5,1,#ff8800,0.4^^60.44109,22.27813~60.44283,22.28328~60.43965,22.28611~60.44219,22.29813~60.43711,22.3013~60.43474,22.28554 undefined^#FF0000,5,1,#ff8800,0.4^^60.44452,22.25624~60.44774,22.26929~60.44727,22.2704~60.4496,22.2777~60.44736,22.2807~60.44634,22.27856~60.44338,22.28208~60.44145,22.27749~60.43898,22.26476 -@@@@@@ \ No newline at end of file +undefined^#FF0000,5,1,#ff8800,0.4^^60.47118,22.16063~60.47947,22.18281~60.47535,22.18783~60.4732,22.189~60.47133,22.1923~60.47014,22.19453~60.46911,22.19307~60.46615,22.19058~60.46354,22.18959~60.462,22.18921~60.46103,22.18338~60.46691,22.17196 +undefined^#FF0000,5,1,#ff8800,0.4^^60.48169,22.16286~60.47717,22.17423~60.4715,22.16041~60.47522,22.1529 +undefined^#FF0000,5,1,#ff8800,0.4^^60.48953,22.15058~60.49328,22.17831~60.48793,22.18101~60.48119,22.17755~60.48323,22.16537~60.48313,22.15071 +undefined^#FF0000,5,1,#ff8800,0.4^^60.48302,22.16453~60.48082,22.17753~60.48234,22.17873~60.48201,22.18088~60.47987,22.18217~60.47708,22.17531~60.48196,22.1631 +undefined^#FF0000,5,1,#ff8800,0.4^^60.48421,22.13076~60.48235,22.13745~60.47389,22.1541~60.46755,22.13231~60.47493,22.12153~60.48071,22.11884 +undefined^#FF0000,5,1,#ff8800,0.4^^60.47353,22.1541~60.47091,22.15934~60.46926,22.15591~60.46098,22.15119~60.46196,22.13721~60.46798,22.145 +undefined^#FF0000,5,1,#ff8800,0.4^^60.473,22.15251~60.46819,22.14438~60.46243,22.13627~60.46293,22.12142~60.46689,22.13144 +undefined^#FF0000,5,1,#ff8800,0.4^^60.47074,22.1599~60.46629,22.17157~60.46058,22.182~60.46054,22.17163~60.45963,22.15159~60.46511,22.15427~60.46911,22.15644 +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.4591,22.21187~60.45665,22.20955~60.4533,22.23375~60.4536,22.23839~60.4543,22.24281~60.45478,22.24573~60.45789,22.2266~60.45939,22.21217 +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 +undefined^#FF0000,5,1,#ff8800,0.4^^60.49404,22.26856~60.49248,22.28712~60.48973,22.30216~60.48271,22.29808~60.47627,22.28925~60.47537,22.27866~60.47564,22.26596~60.48309,22.27138~60.48695,22.27301 +undefined^#FF0000,5,1,#ff8800,0.4^^60.43241,22.32263~60.4233,22.33585~60.42025,22.32107~60.42818,22.31196~60.43215,22.31439~60.43258,22.31667 +undefined^#FF0000,5,1,#ff8800,0.4^^60.4422,22.29864~60.43473,22.30327~60.43438,22.32316~60.43887,22.3172~60.44454,22.30841 +undefined^#FF0000,5,1,#ff8800,0.4^^60.42961,22.26392~60.4343,22.28456~60.43499,22.29225~60.43245,22.29564~60.42894,22.29349~60.42506,22.27929~60.42531,22.26699 +undefined^#FF0000,5,1,#ff8800,0.4^^60.42521,22.26577~60.42195,22.26877~60.41579,22.26733~60.41625,22.27877~60.42052,22.2783~60.42469,22.2762 +undefined^#FF0000,5,1,#ff8800,0.4^^60.42288,22.24603~60.42536,22.26349~60.4219,22.26787~60.4157,22.26641~60.41536,22.2713~60.40943,22.26612~60.41382,22.25849 +undefined^#FF0000,5,1,#ff8800,0.4^^60.40898,22.26645~60.41573,22.27229~60.4162,22.27959~60.41694,22.28892~60.41809,22.29195~60.41392,22.29396~60.40429,22.28059~60.40683,22.26871 +undefined^#FF0000,5,1,#ff8800,0.4^^60.41536,22.18092~60.41875,22.19766~60.4136,22.20165~60.41187,22.18124~60.41382,22.18224 +undefined^#FF0000,5,1,#ff8800,0.4^^60.41156,22.18045~60.41307,22.20002~60.40765,22.19821~60.40864,22.17655 +undefined^#FF0000,5,1,#ff8800,0.4^^60.40834,22.17552~60.40773,22.19004~60.40054,22.18878~60.40212,22.18257~60.40071,22.1682~60.40567,22.17207 +undefined^#FF0000,5,1,#ff8800,0.4^^60.38922,22.16942~60.39234,22.18616~60.38439,22.1926~60.38445,22.16751 +undefined^#FF0000,5,1,#ff8800,0.4^^60.39291,22.18552~60.39257,22.19483~60.39348,22.20569~60.39844,22.21229~60.3995,22.18893 +undefined^#FF0000,5,1,#ff8800,0.4^^60.40769,22.19037~60.40056,22.18946~60.40044,22.19775~60.40256,22.19895~60.40733,22.19792 +undefined^#FF0000,5,1,#ff8800,0.4^^60.41343,22.21989~60.40506,22.22324~60.40398,22.20494~60.4127,22.2044 +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 +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 +undefined^#FF0000,5,1,#ff8800,0.4^^60.41489,22.29662~60.40966,22.30021~60.41175,22.31038~60.41516,22.31797~60.41864,22.31381~60.41797,22.30828~60.41666,22.3036 +undefined^#FF0000,5,1,#ff8800,0.4^^60.41662,22.31787~60.41211,22.32495~60.41382,22.33615~60.41582,22.33948~60.41949,22.33244~60.41896,22.32201 +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 +@@@@@@ diff -r 48efa8ca14dd -r ca2df60215ff palvelu.py --- a/palvelu.py Tue Apr 18 14:59:18 2017 +0300 +++ b/palvelu.py Sun Apr 23 11:01:51 2017 +0300 @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from flask import Flask, render_template +from flask import Flask, render_template, abort from datetime import datetime, date, time, timedelta import locale @@ -21,7 +21,10 @@ def pysäkkiaikataulu(tunniste): from bussit import pysäkit aikataulu = [] - pysäkki = pysäkit[tunniste] + try: + pysäkki = pysäkit[tunniste] + except KeyError: + abort(404) for (aika, pysähdys) in pysäkki.aikataulu(100): aikataulu.append({ 'aika': muotoile_aika(aika), @@ -35,7 +38,10 @@ def ajoreitti(numero): from flask import request from bussit import ajot - ajovuoro = ajot[numero] + try: + ajovuoro = ajot[numero] + except KeyError: + abort(404) suppea = request.args.get('suppea') is not None reitti = [] suppea_reitti = [] @@ -66,4 +72,4 @@ parser = ArgumentParser() parser.add_argument('-p', '--port', type = int, default = 5000) args = parser.parse_args() - app.run(debug = True, port = args.port) \ No newline at end of file + app.run(debug = True, port = args.port)