Mercurial > bus-service / changeset

changeset

fixes, updates, new regions + priorities

Fri, 04 May 2018 21:32:16 +0300

author
Teemu Piippo <teemu@hecknology.net>
date
Fri, 04 May 2018 21:32:16 +0300
changeset 98
c07a77c8a070
parent 97
6967657fced6
child 99
0726eb9bc9d1

fixes, updates, new regions + priorities

busroute.py file | annotate | diff | comparison | revisions
föli.osm file | annotate | diff | comparison | revisions
service.py file | annotate | diff | comparison | revisions
static/style.css file | annotate | diff | comparison | revisions
templates/interesting.html file | annotate | diff | comparison | revisions
templates/macros.html file | annotate | diff | comparison | revisions
templates/route.html file | annotate | diff | comparison | revisions 
--- a/busroute.py	Tue May 01 13:24:33 2018 +0300
+++ b/busroute.py	Fri May 04 21:32:16 2018 +0300
@@ -12,7 +12,7 @@
 def simplify_name(region_name, replace = False):
 	region = regions.get(region_name)
 	if region:
-		if replace and 'replacement' in region and region['replacement'] != region_name:
+		if replace and 'replacement' in region:
 			return simplify_name(region['replacement'])
 		return region.get('short_name', region_name)
 	else:
--- a/föli.osm	Tue May 01 13:24:33 2018 +0300
+++ b/föli.osm	Fri May 04 21:32:16 2018 +0300
@@ -504,8 +504,6 @@
   <node id='-40100' action='modify' lat='60.41902' lon='22.31332' />
   <node id='-40102' action='modify' lat='60.41824' lon='22.30827' />
   <node id='-40104' action='modify' lat='60.41482' lon='22.29424' />
-  <node id='-40106' action='modify' lat='60.50456' lon='22.27092' />
-  <node id='-40108' action='modify' lat='60.4942' lon='22.26937' />
   <node id='-40110' action='modify' lat='60.49296' lon='22.28753' />
   <node id='-40112' action='modify' lat='60.49025' lon='22.30289' />
   <node id='-40114' action='modify' lat='60.49770041523' lon='22.3120730423' />
@@ -1570,7 +1568,7 @@
   <node id='-42232' action='modify' lat='60.42832' lon='22.32754' />
   <node id='-42234' action='modify' lat='60.42946' lon='22.32621' />
   <node id='-42236' action='modify' lat='60.49531' lon='22.25345' />
-  <node id='-42238' action='modify' lat='60.49046' lon='22.27886' />
+  <node id='-42238' action='modify' lat='60.49274290416' lon='22.26495542847' />
   <node id='-42240' action='modify' lat='60.48537970097' lon='22.26523730682' />
   <node id='-42242' action='modify' lat='60.48353' lon='22.24978' />
   <node id='-42244' action='modify' lat='60.47545' lon='22.26723' />
@@ -2242,15 +2240,33 @@
   <node id='-43534' action='modify' lat='60.49460257755' lon='22.3537230438' />
   <node id='-43536' action='modify' lat='60.49025882934' lon='22.34893798292' />
   <node id='-43538' action='modify' lat='60.49194989802' lon='22.34323023677' />
-  <node id='-52297' action='modify' lat='60.44047031107' lon='22.27141140819' />
-  <node id='-52298' action='modify' lat='60.44137537253' lon='22.27391122699' />
-  <node id='-52300' action='modify' lat='60.44315366283' lon='22.27296173036' />
-  <node id='-52302' action='modify' lat='60.4419469773' lon='22.2690939796' />
-  <node id='-52318' action='modify' lat='60.44809639048' lon='22.26988790274' />
-  <node id='-52319' action='modify' lat='60.44614902752' lon='22.2736859107' />
-  <node id='-52321' action='modify' lat='60.44087786178' lon='22.26111171484' />
-  <node id='-52323' action='modify' lat='60.44426505443' lon='22.25604770422' />
-  <way id='-43540' action='modify'>
+  <node id='-43540' action='modify' lat='60.44047031107' lon='22.27141140819' />
+  <node id='-43542' action='modify' lat='60.44137537253' lon='22.27391122699' />
+  <node id='-43544' action='modify' lat='60.44315366283' lon='22.27296173036' />
+  <node id='-43546' action='modify' lat='60.4419469773' lon='22.2690939796' />
+  <node id='-43548' action='modify' lat='60.44809639048' lon='22.26988790274' />
+  <node id='-43550' action='modify' lat='60.44614902752' lon='22.2736859107' />
+  <node id='-43552' action='modify' lat='60.44087786178' lon='22.26111171484' />
+  <node id='-43554' action='modify' lat='60.44426505443' lon='22.25604770422' />
+  <node id='-50556' action='modify' lat='60.44737142947' lon='22.26324676394' />
+  <node id='-50572' action='modify' lat='60.44666762486' lon='22.26106881022' />
+  <node id='-50632' action='modify' lat='60.44830804805' lon='22.26163743854' />
+  <node id='-50642' action='modify' lat='60.44769951362' lon='22.25960968852' />
+  <node id='-50645' action='modify' lat='60.44769686515' lon='22.2597330755' />
+  <node id='-50646' action='modify' lat='60.44668349767' lon='22.26114391744' />
+  <node id='-50648' action='modify' lat='60.44733967657' lon='22.26312875211' />
+  <node id='-50650' action='modify' lat='60.44824983825' lon='22.26162135065' />
+  <node id='-50752' action='modify' lat='60.49052835683' lon='22.26671216726' />
+  <node id='-52765' action='modify' lat='60.49268971168' lon='22.26553200603' />
+  <node id='-52766' action='modify' lat='60.49056005958' lon='22.2668623817' />
+  <node id='-52768' action='modify' lat='60.48963522913' lon='22.2712075603' />
+  <node id='-52770' action='modify' lat='60.49243606319' lon='22.27189420581' />
+  <node id='-52772' action='modify' lat='60.49339251903' lon='22.26540325999' />
+  <node id='-52789' action='modify' lat='60.49388923082' lon='22.27258085132' />
+  <node id='-52790' action='modify' lat='60.49114136807' lon='22.27194784999' />
+  <node id='-52792' action='modify' lat='60.48982019733' lon='22.28049873233' />
+  <node id='-52794' action='modify' lat='60.49288523633' lon='22.28308437109' />
+  <way id='-43556' action='modify'>
     <nd ref='-39098' />
     <nd ref='-39100' />
     <nd ref='-39102' />
@@ -2263,7 +2279,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43542' action='modify'>
+  <way id='-43558' action='modify'>
     <nd ref='-39108' />
     <nd ref='-39110' />
     <nd ref='-39112' />
@@ -2275,7 +2291,7 @@
     <tag k='name:sv' v='Harlax' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43544' action='modify'>
+  <way id='-43560' action='modify'>
     <nd ref='-39120' />
     <nd ref='-39122' />
     <nd ref='-39124' />
@@ -2288,7 +2304,7 @@
     <tag k='priority' v='-1' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43546' action='modify'>
+  <way id='-43562' action='modify'>
     <nd ref='-39134' />
     <nd ref='-39136' />
     <nd ref='-39138' />
@@ -2301,7 +2317,7 @@
     <tag k='name:sv' v='Hingstudden' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43548' action='modify'>
+  <way id='-43564' action='modify'>
     <nd ref='-39146' />
     <nd ref='-39148' />
     <nd ref='-39150' />
@@ -2312,7 +2328,7 @@
     <tag k='name' v='Maanpää' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43550' action='modify'>
+  <way id='-43566' action='modify'>
     <nd ref='-39158' />
     <nd ref='-39160' />
     <nd ref='-39162' />
@@ -2322,10 +2338,10 @@
     <tag k='genitive:fi' v='Pikisaaren' />
     <tag k='name' v='Pikisaari' />
     <tag k='name:sv' v='Beckholmen' />
-    <tag k='priority' v='80' />
-    <tag k='region' v='yes' />
-  </way>
-  <way id='-43552' action='modify'>
+    <tag k='priority' v='70' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-43568' action='modify'>
     <nd ref='-39168' />
     <nd ref='-39170' />
     <nd ref='-39172' />
@@ -2335,7 +2351,7 @@
     <tag k='name' v='Jänessaari' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43554' action='modify'>
+  <way id='-43570' action='modify'>
     <nd ref='-39176' />
     <nd ref='-39178' />
     <nd ref='-39180' />
@@ -2352,7 +2368,7 @@
     <tag k='priority' v='150' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43556' action='modify'>
+  <way id='-43572' action='modify'>
     <nd ref='-39196' />
     <nd ref='-39198' />
     <nd ref='-39200' />
@@ -2365,14 +2381,14 @@
     <nd ref='-39214' />
     <nd ref='-39216' />
     <nd ref='-39196' />
-    <tag k='name' v='Turun yliopistollinen keskussairaala' />
-    <tag k='name:en' v='Turku university hospital' />
-    <tag k='name:sv' v='Åbo universitetscentralsjukhuset' />
+    <tag k='name' v='Yliopistollinen keskussairaala' />
+    <tag k='name:en' v='University hospital' />
+    <tag k='name:sv' v='Universitetscentralsjukhuset' />
     <tag k='region' v='yes' />
     <tag k='short_name' v='Tyks' />
     <tag k='short_name:sv' v='Åucs' />
   </way>
-  <way id='-43558' action='modify'>
+  <way id='-43574' action='modify'>
     <nd ref='-39218' />
     <nd ref='-39220' />
     <nd ref='-39222' />
@@ -2381,7 +2397,7 @@
     <tag k='name' v='Martti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43560' action='modify'>
+  <way id='-43576' action='modify'>
     <nd ref='-39226' />
     <nd ref='-39228' />
     <nd ref='-39230' />
@@ -2392,7 +2408,7 @@
     <tag k='name:sv' v='Järnvägsstation' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43562' action='modify'>
+  <way id='-43578' action='modify'>
     <nd ref='-39234' />
     <nd ref='-39236' />
     <nd ref='-39238' />
@@ -2409,7 +2425,7 @@
     <tag k='short_name' v='Nummi' />
     <tag k='short_name:sv' v='Nummis' />
   </way>
-  <way id='-43564' action='modify'>
+  <way id='-43580' action='modify'>
     <nd ref='-39248' />
     <nd ref='-39250' />
     <nd ref='-39252' />
@@ -2428,7 +2444,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43566' action='modify'>
+  <way id='-43582' action='modify'>
     <nd ref='-39262' />
     <nd ref='-39264' />
     <nd ref='-39266' />
@@ -2437,7 +2453,7 @@
     <tag k='name' v='Erikvalla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43568' action='modify'>
+  <way id='-43584' action='modify'>
     <nd ref='-39270' />
     <nd ref='-39272' />
     <nd ref='-39274' />
@@ -2451,7 +2467,7 @@
     <tag k='priority' v='80' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43570' action='modify'>
+  <way id='-43586' action='modify'>
     <nd ref='-39286' />
     <nd ref='-39288' />
     <nd ref='-39290' />
@@ -2463,7 +2479,7 @@
     <tag k='priority' v='10' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43572' action='modify'>
+  <way id='-43588' action='modify'>
     <nd ref='-39298' />
     <nd ref='-39300' />
     <nd ref='-39302' />
@@ -2479,7 +2495,7 @@
     <tag k='name:sv' v='Färjstranden' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43574' action='modify'>
+  <way id='-43590' action='modify'>
     <nd ref='-39316' />
     <nd ref='-39318' />
     <nd ref='-39320' />
@@ -2491,7 +2507,7 @@
     <tag k='name:sv' v='Busstation' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43576' action='modify'>
+  <way id='-43592' action='modify'>
     <nd ref='-39326' />
     <nd ref='-39328' />
     <nd ref='-39330' />
@@ -2502,7 +2518,7 @@
     <tag k='name:sv' v='Trätorget' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43578' action='modify'>
+  <way id='-43594' action='modify'>
     <nd ref='-39336' />
     <nd ref='-39338' />
     <nd ref='-39340' />
@@ -2513,7 +2529,7 @@
     <tag k='name:sv' v='Konserthuset' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43580' action='modify'>
+  <way id='-43596' action='modify'>
     <nd ref='-39344' />
     <nd ref='-43062' />
     <nd ref='-39346' />
@@ -2524,7 +2540,7 @@
     <tag k='name:sv' v='Tjärtorget' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43582' action='modify'>
+  <way id='-43598' action='modify'>
     <nd ref='-39352' />
     <nd ref='-39354' />
     <nd ref='-39356' />
@@ -2536,7 +2552,7 @@
     <tag k='name' v='Impivaara' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43584' action='modify'>
+  <way id='-43600' action='modify'>
     <nd ref='-39362' />
     <nd ref='-39364' />
     <nd ref='-39366' />
@@ -2549,7 +2565,7 @@
     <tag k='name:sv' v='Bleckstaden' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43586' action='modify'>
+  <way id='-43602' action='modify'>
     <nd ref='-39374' />
     <nd ref='-39376' />
     <nd ref='-39378' />
@@ -2559,7 +2575,7 @@
     <tag k='name' v='Mälikkälä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43588' action='modify'>
+  <way id='-43604' action='modify'>
     <nd ref='-39384' />
     <nd ref='-39386' />
     <nd ref='-39388' />
@@ -2571,7 +2587,7 @@
     <tag k='name:sv' v='Gamla Stortorget' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43590' action='modify'>
+  <way id='-43606' action='modify'>
     <nd ref='-39394' />
     <nd ref='-39396' />
     <nd ref='-39398' />
@@ -2582,7 +2598,7 @@
     <tag k='name' v='Marjaniemi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43592' action='modify'>
+  <way id='-43608' action='modify'>
     <nd ref='-39404' />
     <nd ref='-39406' />
     <nd ref='-39408' />
@@ -2592,7 +2608,7 @@
     <tag k='name' v='Kuuva' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43594' action='modify'>
+  <way id='-43610' action='modify'>
     <nd ref='-39412' />
     <nd ref='-39414' />
     <nd ref='-39416' />
@@ -2605,7 +2621,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Perno' />
   </way>
-  <way id='-43596' action='modify'>
+  <way id='-43612' action='modify'>
     <nd ref='-39422' />
     <nd ref='-39424' />
     <nd ref='-39426' />
@@ -2619,7 +2635,7 @@
     <tag k='name' v='Perno' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43598' action='modify'>
+  <way id='-43614' action='modify'>
     <nd ref='-39436' />
     <nd ref='-39438' />
     <nd ref='-39440' />
@@ -2637,7 +2653,7 @@
     <tag k='name:sv' v='Artukais' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43600' action='modify'>
+  <way id='-43616' action='modify'>
     <nd ref='-39460' />
     <nd ref='-39462' />
     <nd ref='-39464' />
@@ -2650,7 +2666,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43602' action='modify'>
+  <way id='-43618' action='modify'>
     <nd ref='-39472' />
     <nd ref='-39474' />
     <nd ref='-39476' />
@@ -2669,7 +2685,7 @@
     <tag k='name' v='Länsinummi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43604' action='modify'>
+  <way id='-43620' action='modify'>
     <nd ref='-39498' />
     <nd ref='-39500' />
     <nd ref='-39502' />
@@ -2688,7 +2704,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43606' action='modify'>
+  <way id='-43622' action='modify'>
     <nd ref='-39524' />
     <nd ref='-39526' />
     <nd ref='-39528' />
@@ -2707,7 +2723,7 @@
     <tag k='name:sv' v='Runsala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43608' action='modify'>
+  <way id='-43624' action='modify'>
     <nd ref='-39550' />
     <nd ref='-39552' />
     <nd ref='-39554' />
@@ -2722,17 +2738,21 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Ruissalo' />
   </way>
-  <way id='-43610' action='modify'>
+  <way id='-43626' action='modify'>
     <nd ref='-39564' />
     <nd ref='-39566' />
     <nd ref='-39568' />
+    <nd ref='-50556' />
+    <nd ref='-50632' />
+    <nd ref='-50642' />
+    <nd ref='-50572' />
     <nd ref='-39570' />
     <nd ref='-39564' />
-    <tag k='name' v='VII kaupunginosa' />
-    <tag k='name:sv' v='VII stadsdelen' />
-    <tag k='region' v='yes' />
-  </way>
-  <way id='-43612' action='modify'>
+    <tag k='name' v='Keskusta' />
+    <tag k='name:sv' v='Centrum' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-43628' action='modify'>
     <nd ref='-39572' />
     <nd ref='-39574' />
     <nd ref='-39576' />
@@ -2744,7 +2764,7 @@
     <tag k='priority' v='1000000' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43614' action='modify'>
+  <way id='-43630' action='modify'>
     <nd ref='-39580' />
     <nd ref='-39582' />
     <nd ref='-39584' />
@@ -2759,7 +2779,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43616' action='modify'>
+  <way id='-43632' action='modify'>
     <nd ref='-39596' />
     <nd ref='-39598' />
     <nd ref='-39600' />
@@ -2772,7 +2792,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43618' action='modify'>
+  <way id='-43634' action='modify'>
     <nd ref='-39608' />
     <nd ref='-39610' />
     <nd ref='-39612' />
@@ -2786,7 +2806,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43620' action='modify'>
+  <way id='-43636' action='modify'>
     <nd ref='-39624' />
     <nd ref='-39626' />
     <nd ref='-39628' />
@@ -2800,7 +2820,7 @@
     <tag k='name:sv' v='Littois' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43622' action='modify'>
+  <way id='-43638' action='modify'>
     <nd ref='-39638' />
     <nd ref='-39640' />
     <nd ref='-39642' />
@@ -2811,7 +2831,7 @@
     <tag k='name:sv' v='Lillheikkilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43624' action='modify'>
+  <way id='-43640' action='modify'>
     <nd ref='-39648' />
     <nd ref='-39650' />
     <nd ref='-39652' />
@@ -2825,7 +2845,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43626' action='modify'>
+  <way id='-43642' action='modify'>
     <nd ref='-39656' />
     <nd ref='-39658' />
     <nd ref='-39660' />
@@ -2839,7 +2859,7 @@
     <tag k='name:sv' v='Tranbacken' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43628' action='modify'>
+  <way id='-43644' action='modify'>
     <nd ref='-39668' />
     <nd ref='-39670' />
     <nd ref='-39672' />
@@ -2857,7 +2877,7 @@
     <tag k='priority' v='150' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43630' action='modify'>
+  <way id='-43646' action='modify'>
     <nd ref='-39692' />
     <nd ref='-39694' />
     <nd ref='-39696' />
@@ -2868,7 +2888,7 @@
     <tag k='name' v='Nuorikkala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43632' action='modify'>
+  <way id='-43648' action='modify'>
     <nd ref='-39704' />
     <nd ref='-39706' />
     <nd ref='-39708' />
@@ -2879,7 +2899,7 @@
     <tag k='name' v='Krookila' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43634' action='modify'>
+  <way id='-43650' action='modify'>
     <nd ref='-39716' />
     <nd ref='-39718' />
     <nd ref='-39720' />
@@ -2889,7 +2909,7 @@
     <tag k='name' v='Inkoinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43636' action='modify'>
+  <way id='-43652' action='modify'>
     <nd ref='-39726' />
     <nd ref='-39728' />
     <nd ref='-39730' />
@@ -2901,7 +2921,7 @@
     <tag k='name' v='Metsäaro' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43638' action='modify'>
+  <way id='-43654' action='modify'>
     <nd ref='-39740' />
     <nd ref='-39742' />
     <nd ref='-39744' />
@@ -2917,7 +2937,7 @@
     <nd ref='-39740' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43640' action='modify'>
+  <way id='-43656' action='modify'>
     <nd ref='-39752' />
     <nd ref='-39754' />
     <nd ref='-39756' />
@@ -2928,7 +2948,7 @@
     <tag k='name' v='Jyrkkälä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43642' action='modify'>
+  <way id='-43658' action='modify'>
     <nd ref='-39764' />
     <nd ref='-39766' />
     <nd ref='-39768' />
@@ -2941,7 +2961,7 @@
     <tag k='name:sv' v='Oxbacka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43644' action='modify'>
+  <way id='-43660' action='modify'>
     <nd ref='-39778' />
     <nd ref='-39780' />
     <nd ref='-39782' />
@@ -2950,7 +2970,7 @@
     <tag k='name' v='Huhko' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43646' action='modify'>
+  <way id='-43662' action='modify'>
     <nd ref='-39786' />
     <nd ref='-39788' />
     <nd ref='-39790' />
@@ -2964,7 +2984,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43648' action='modify'>
+  <way id='-43664' action='modify'>
     <nd ref='-39800' />
     <nd ref='-39802' />
     <nd ref='-39804' />
@@ -2976,7 +2996,7 @@
     <tag k='name' v='Luolavuori' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43650' action='modify'>
+  <way id='-43666' action='modify'>
     <nd ref='-39812' />
     <nd ref='-39814' />
     <nd ref='-39816' />
@@ -2989,7 +3009,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43652' action='modify'>
+  <way id='-43668' action='modify'>
     <nd ref='-39826' />
     <nd ref='-39828' />
     <nd ref='-39830' />
@@ -3001,7 +3021,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43654' action='modify'>
+  <way id='-43670' action='modify'>
     <nd ref='-39836' />
     <nd ref='-39838' />
     <nd ref='-39840' />
@@ -3012,7 +3032,7 @@
     <tag k='name:sv' v='Illois' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43656' action='modify'>
+  <way id='-43672' action='modify'>
     <nd ref='-39844' />
     <nd ref='-39846' />
     <nd ref='-39848' />
@@ -3024,7 +3044,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43658' action='modify'>
+  <way id='-43674' action='modify'>
     <nd ref='-39856' />
     <nd ref='-39858' />
     <nd ref='-39860' />
@@ -3033,7 +3053,7 @@
     <tag k='name' v='Tammisto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43660' action='modify'>
+  <way id='-43676' action='modify'>
     <nd ref='-39864' />
     <nd ref='-43504' />
     <nd ref='-39866' />
@@ -3045,7 +3065,7 @@
     <tag k='name' v='Majamäki' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43662' action='modify'>
+  <way id='-43678' action='modify'>
     <nd ref='-39874' />
     <nd ref='-39876' />
     <nd ref='-39878' />
@@ -3055,7 +3075,7 @@
     <tag k='name' v='Tammela' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43664' action='modify'>
+  <way id='-43680' action='modify'>
     <nd ref='-39884' />
     <nd ref='-39886' />
     <nd ref='-39888' />
@@ -3065,7 +3085,7 @@
     <tag k='name:sv' v='Toijais' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43666' action='modify'>
+  <way id='-43682' action='modify'>
     <nd ref='-39892' />
     <nd ref='-39894' />
     <nd ref='-39896' />
@@ -3078,7 +3098,7 @@
     <tag k='name:sv' v='Batterihagen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43668' action='modify'>
+  <way id='-43684' action='modify'>
     <nd ref='-39904' />
     <nd ref='-39906' />
     <nd ref='-39908' />
@@ -3100,7 +3120,7 @@
     <tag k='pictogram' v='⚓' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43670' action='modify'>
+  <way id='-43686' action='modify'>
     <nd ref='-39932' />
     <nd ref='-39934' />
     <nd ref='-39936' />
@@ -3114,7 +3134,7 @@
     <tag k='name:sv' v='Storheikkilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43672' action='modify'>
+  <way id='-43688' action='modify'>
     <nd ref='-39948' />
     <nd ref='-39950' />
     <nd ref='-39952' />
@@ -3131,7 +3151,7 @@
     <tag k='priority' v='70' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43674' action='modify'>
+  <way id='-43690' action='modify'>
     <nd ref='-39966' />
     <nd ref='-39968' />
     <nd ref='-39970' />
@@ -3144,7 +3164,7 @@
     <tag k='name:sv' v='Domkyrkan' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43676' action='modify'>
+  <way id='-43692' action='modify'>
     <nd ref='-39976' />
     <nd ref='-39978' />
     <nd ref='-39980' />
@@ -3154,7 +3174,7 @@
     <tag k='name:sv' v='Gertrudsbacken' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43678' action='modify'>
+  <way id='-43694' action='modify'>
     <nd ref='-39984' />
     <nd ref='-39986' />
     <nd ref='-39988' />
@@ -3167,7 +3187,7 @@
     <tag k='priority' v='40' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43680' action='modify'>
+  <way id='-43696' action='modify'>
     <nd ref='-39998' />
     <nd ref='-40000' />
     <nd ref='-40002' />
@@ -3178,7 +3198,7 @@
     <tag k='name' v='Piispanristi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43682' action='modify'>
+  <way id='-43698' action='modify'>
     <nd ref='-40010' />
     <nd ref='-40012' />
     <nd ref='-40014' />
@@ -3191,7 +3211,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43684' action='modify'>
+  <way id='-43700' action='modify'>
     <nd ref='-40020' />
     <nd ref='-40022' />
     <nd ref='-40024' />
@@ -3205,7 +3225,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43686' action='modify'>
+  <way id='-43702' action='modify'>
     <nd ref='-40032' />
     <nd ref='-40034' />
     <nd ref='-40036' />
@@ -3215,7 +3235,7 @@
     <tag k='name' v='Huhkola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43688' action='modify'>
+  <way id='-43704' action='modify'>
     <nd ref='-40042' />
     <nd ref='-40044' />
     <nd ref='-40046' />
@@ -3232,7 +3252,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43690' action='modify'>
+  <way id='-43706' action='modify'>
     <nd ref='-40064' />
     <nd ref='-40066' />
     <nd ref='-40068' />
@@ -3250,7 +3270,7 @@
     <tag k='name:sv' v='Ilpois' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43692' action='modify'>
+  <way id='-43708' action='modify'>
     <nd ref='-40088' />
     <nd ref='-40090' />
     <nd ref='-40092' />
@@ -3266,23 +3286,21 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43694' action='modify'>
-    <nd ref='-40106' />
-    <nd ref='-40108' />
+  <way id='-43710' action='modify'>
     <nd ref='-40110' />
     <nd ref='-40112' />
     <nd ref='-40114' />
     <nd ref='-40116' />
     <nd ref='-40118' />
     <nd ref='-40120' />
-    <nd ref='-40106' />
+    <nd ref='-40110' />
     <tag k='genitive:fi' v='Urusvuoren' />
     <tag k='name' v='Urusvuori' />
     <tag k='name:sv' v='Urusberget' />
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43696' action='modify'>
+  <way id='-43712' action='modify'>
     <nd ref='-40122' />
     <nd ref='-40124' />
     <nd ref='-40126' />
@@ -3308,7 +3326,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43698' action='modify'>
+  <way id='-43714' action='modify'>
     <nd ref='-40160' />
     <nd ref='-40162' />
     <nd ref='-40164' />
@@ -3324,7 +3342,7 @@
     <tag k='priority' v='150' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43700' action='modify'>
+  <way id='-43716' action='modify'>
     <nd ref='-40180' />
     <nd ref='-40182' />
     <nd ref='-40184' />
@@ -3336,7 +3354,7 @@
     <tag k='priority' v='150' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43702' action='modify'>
+  <way id='-43718' action='modify'>
     <nd ref='-40192' />
     <nd ref='-40194' />
     <nd ref='-40196' />
@@ -3352,7 +3370,7 @@
     <tag k='name:sv' v='Övre S:t Marie' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43704' action='modify'>
+  <way id='-43720' action='modify'>
     <nd ref='-40212' />
     <nd ref='-40214' />
     <nd ref='-40216' />
@@ -3363,7 +3381,7 @@
     <tag k='name' v='Tortinmäki' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43706' action='modify'>
+  <way id='-43722' action='modify'>
     <nd ref='-40222' />
     <nd ref='-40224' />
     <nd ref='-42488' />
@@ -3380,7 +3398,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Vahto' />
   </way>
-  <way id='-43708' action='modify'>
+  <way id='-43724' action='modify'>
     <nd ref='-40242' />
     <nd ref='-40244' />
     <nd ref='-40246' />
@@ -3398,7 +3416,7 @@
     <tag k='name' v='Vahto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43710' action='modify'>
+  <way id='-43726' action='modify'>
     <nd ref='-40268' />
     <nd ref='-40270' />
     <nd ref='-40272' />
@@ -3416,7 +3434,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Vahto' />
   </way>
-  <way id='-43712' action='modify'>
+  <way id='-43728' action='modify'>
     <nd ref='-40292' />
     <nd ref='-40294' />
     <nd ref='-40296' />
@@ -3434,7 +3452,7 @@
     <tag k='region' v='yes' />
     <tag k='short_name' v='Rusko' />
   </way>
-  <way id='-43714' action='modify'>
+  <way id='-43730' action='modify'>
     <nd ref='-40310' />
     <nd ref='-40312' />
     <nd ref='-40314' />
@@ -3446,7 +3464,7 @@
     <tag k='name' v='Munittula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43716' action='modify'>
+  <way id='-43732' action='modify'>
     <nd ref='-40324' />
     <nd ref='-40326' />
     <nd ref='-40328' />
@@ -3458,7 +3476,7 @@
     <tag k='name' v='Suitturi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43718' action='modify'>
+  <way id='-43734' action='modify'>
     <nd ref='-40338' />
     <nd ref='-40340' />
     <nd ref='-40342' />
@@ -3468,7 +3486,7 @@
     <tag k='name' v='Maksla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43720' action='modify'>
+  <way id='-43736' action='modify'>
     <nd ref='-40348' />
     <nd ref='-40350' />
     <nd ref='-40352' />
@@ -3481,7 +3499,7 @@
     <tag k='name' v='Merttelä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43722' action='modify'>
+  <way id='-43738' action='modify'>
     <nd ref='-40364' />
     <nd ref='-40366' />
     <nd ref='-40368' />
@@ -3491,7 +3509,7 @@
     <tag k='name' v='Peijerlä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43724' action='modify'>
+  <way id='-43740' action='modify'>
     <nd ref='-40374' />
     <nd ref='-40376' />
     <nd ref='-40378' />
@@ -3500,7 +3518,7 @@
     <tag k='name' v='Hyrköinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43726' action='modify'>
+  <way id='-43742' action='modify'>
     <nd ref='-40382' />
     <nd ref='-40384' />
     <nd ref='-40386' />
@@ -3513,7 +3531,7 @@
     <tag k='priority' v='70' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43728' action='modify'>
+  <way id='-43744' action='modify'>
     <nd ref='-40396' />
     <nd ref='-40398' />
     <nd ref='-40400' />
@@ -3524,7 +3542,7 @@
     <tag k='priority' v='-1' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43730' action='modify'>
+  <way id='-43746' action='modify'>
     <nd ref='-40406' />
     <nd ref='-40408' />
     <nd ref='-40410' />
@@ -3544,7 +3562,7 @@
     <tag k='region' v='yes' />
     <tag k='short_name' v='Mylly' />
   </way>
-  <way id='-43732' action='modify'>
+  <way id='-43748' action='modify'>
     <nd ref='-40428' />
     <nd ref='-40430' />
     <nd ref='-40432' />
@@ -3557,7 +3575,7 @@
     <tag k='name' v='Hauninen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43734' action='modify'>
+  <way id='-43750' action='modify'>
     <nd ref='-40442' />
     <nd ref='-40444' />
     <nd ref='-40446' />
@@ -3566,7 +3584,7 @@
     <tag k='name' v='Kerttula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43736' action='modify'>
+  <way id='-43752' action='modify'>
     <nd ref='-40450' />
     <nd ref='-40452' />
     <nd ref='-40454' />
@@ -3576,7 +3594,7 @@
     <nd ref='-40450' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43738' action='modify'>
+  <way id='-43754' action='modify'>
     <nd ref='-40462' />
     <nd ref='-40464' />
     <nd ref='-40466' />
@@ -3587,7 +3605,7 @@
     <tag k='name' v='Raision tehtaat' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43740' action='modify'>
+  <way id='-43756' action='modify'>
     <nd ref='-40474' />
     <nd ref='-40476' />
     <nd ref='-40478' />
@@ -3601,7 +3619,7 @@
     <tag k='short_name' v='Naantali' />
     <tag k='short_name:sv' v='Nådendal' />
   </way>
-  <way id='-43742' action='modify'>
+  <way id='-43758' action='modify'>
     <nd ref='-40482' />
     <nd ref='-40484' />
     <nd ref='-40486' />
@@ -3609,7 +3627,7 @@
     <nd ref='-40482' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43744' action='modify'>
+  <way id='-43760' action='modify'>
     <nd ref='-40490' />
     <nd ref='-40492' />
     <nd ref='-40494' />
@@ -3620,7 +3638,7 @@
     <tag k='name' v='Karvetti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43746' action='modify'>
+  <way id='-43762' action='modify'>
     <nd ref='-40502' />
     <nd ref='-40504' />
     <nd ref='-40506' />
@@ -3629,7 +3647,7 @@
     <tag k='name' v='Viluluoto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43748' action='modify'>
+  <way id='-43764' action='modify'>
     <nd ref='-40510' />
     <nd ref='-40512' />
     <nd ref='-40514' />
@@ -3639,7 +3657,7 @@
     <tag k='name' v='Ruona' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43750' action='modify'>
+  <way id='-43766' action='modify'>
     <nd ref='-40520' />
     <nd ref='-40522' />
     <nd ref='-40524' />
@@ -3654,7 +3672,7 @@
     <tag k='name' v='Kultaranta' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43752' action='modify'>
+  <way id='-43768' action='modify'>
     <nd ref='-40540' />
     <nd ref='-40542' />
     <nd ref='-40544' />
@@ -3664,7 +3682,7 @@
     <tag k='name' v='Pyöli' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43754' action='modify'>
+  <way id='-43770' action='modify'>
     <nd ref='-40550' />
     <nd ref='-40552' />
     <nd ref='-40554' />
@@ -3675,7 +3693,7 @@
     <tag k='name' v='Simola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43756' action='modify'>
+  <way id='-43772' action='modify'>
     <nd ref='-40562' />
     <nd ref='-40564' />
     <nd ref='-40566' />
@@ -3687,7 +3705,7 @@
     <tag k='name' v='Isokylä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43758' action='modify'>
+  <way id='-43774' action='modify'>
     <nd ref='-40576' />
     <nd ref='-40578' />
     <nd ref='-40580' />
@@ -3700,7 +3718,7 @@
     <tag k='name' v='Kaukoranta' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43760' action='modify'>
+  <way id='-43776' action='modify'>
     <nd ref='-40592' />
     <nd ref='-40594' />
     <nd ref='-40596' />
@@ -3710,7 +3728,7 @@
     <tag k='name' v='Haijainen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43762' action='modify'>
+  <way id='-43778' action='modify'>
     <nd ref='-40602' />
     <nd ref='-40604' />
     <nd ref='-40606' />
@@ -3721,7 +3739,7 @@
     <tag k='name' v='Kirstilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43764' action='modify'>
+  <way id='-43780' action='modify'>
     <nd ref='-40614' />
     <nd ref='-40616' />
     <nd ref='-40618' />
@@ -3732,7 +3750,7 @@
     <tag k='name' v='Akkala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43766' action='modify'>
+  <way id='-43782' action='modify'>
     <nd ref='-40626' />
     <nd ref='-40628' />
     <nd ref='-40630' />
@@ -3742,7 +3760,7 @@
     <tag k='name' v='Meikkula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43768' action='modify'>
+  <way id='-43784' action='modify'>
     <nd ref='-40636' />
     <nd ref='-40638' />
     <nd ref='-40640' />
@@ -3752,7 +3770,7 @@
     <tag k='name' v='Herttula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43770' action='modify'>
+  <way id='-43786' action='modify'>
     <nd ref='-40646' />
     <nd ref='-40648' />
     <nd ref='-40650' />
@@ -3764,7 +3782,7 @@
     <tag k='name' v='Käkölä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43772' action='modify'>
+  <way id='-43788' action='modify'>
     <nd ref='-40660' />
     <nd ref='-40662' />
     <nd ref='-40664' />
@@ -3774,7 +3792,7 @@
     <tag k='name' v='Kuivalahti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43774' action='modify'>
+  <way id='-43790' action='modify'>
     <nd ref='-40670' />
     <nd ref='-40672' />
     <nd ref='-40674' />
@@ -3784,7 +3802,7 @@
     <tag k='name' v='Kaivola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43776' action='modify'>
+  <way id='-43792' action='modify'>
     <nd ref='-40680' />
     <nd ref='-40682' />
     <nd ref='-40684' />
@@ -3793,7 +3811,7 @@
     <tag k='name' v='Isotalo' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43778' action='modify'>
+  <way id='-43794' action='modify'>
     <nd ref='-40688' />
     <nd ref='-40690' />
     <nd ref='-40692' />
@@ -3804,7 +3822,7 @@
     <tag k='name' v='Viiala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43780' action='modify'>
+  <way id='-43796' action='modify'>
     <nd ref='-40700' />
     <nd ref='-40702' />
     <nd ref='-40704' />
@@ -3819,7 +3837,7 @@
     <tag k='priority' v='150' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43782' action='modify'>
+  <way id='-43798' action='modify'>
     <nd ref='-40716' />
     <nd ref='-40718' />
     <nd ref='-40720' />
@@ -3830,7 +3848,7 @@
     <nd ref='-40716' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43784' action='modify'>
+  <way id='-43800' action='modify'>
     <nd ref='-40730' />
     <nd ref='-40732' />
     <nd ref='-40734' />
@@ -3843,7 +3861,7 @@
     <nd ref='-40730' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43786' action='modify'>
+  <way id='-43802' action='modify'>
     <nd ref='-40748' />
     <nd ref='-40750' />
     <nd ref='-40752' />
@@ -3854,7 +3872,7 @@
     <tag k='name' v='Ahteentaka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43788' action='modify'>
+  <way id='-43804' action='modify'>
     <nd ref='-40760' />
     <nd ref='-40762' />
     <nd ref='-40764' />
@@ -3866,7 +3884,7 @@
     <tag k='name' v='Salonkylä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43790' action='modify'>
+  <way id='-43806' action='modify'>
     <nd ref='-40774' />
     <nd ref='-40776' />
     <nd ref='-40778' />
@@ -3875,7 +3893,7 @@
     <tag k='name' v='Röölä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43792' action='modify'>
+  <way id='-43808' action='modify'>
     <nd ref='-40782' />
     <nd ref='-40784' />
     <nd ref='-40786' />
@@ -3885,7 +3903,7 @@
     <tag k='name' v='Okala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43794' action='modify'>
+  <way id='-43810' action='modify'>
     <nd ref='-40792' />
     <nd ref='-40794' />
     <nd ref='-40796' />
@@ -3894,7 +3912,7 @@
     <tag k='name' v='Montola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43796' action='modify'>
+  <way id='-43812' action='modify'>
     <nd ref='-40800' />
     <nd ref='-40802' />
     <nd ref='-40804' />
@@ -3908,7 +3926,7 @@
     <tag k='name' v='Ojainen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43798' action='modify'>
+  <way id='-43814' action='modify'>
     <nd ref='-40818' />
     <nd ref='-40820' />
     <nd ref='-40822' />
@@ -3920,7 +3938,7 @@
     <tag k='name' v='Pulkkala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43800' action='modify'>
+  <way id='-43816' action='modify'>
     <nd ref='-40832' />
     <nd ref='-40834' />
     <nd ref='-40836' />
@@ -3930,7 +3948,7 @@
     <tag k='name' v='Meripirtti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43802' action='modify'>
+  <way id='-43818' action='modify'>
     <nd ref='-40842' />
     <nd ref='-40844' />
     <nd ref='-40846' />
@@ -3941,7 +3959,7 @@
     <tag k='name' v='Poikko' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43804' action='modify'>
+  <way id='-43820' action='modify'>
     <nd ref='-40854' />
     <nd ref='-40856' />
     <nd ref='-40858' />
@@ -3955,7 +3973,7 @@
     <tag k='name' v='Riiainen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43806' action='modify'>
+  <way id='-43822' action='modify'>
     <nd ref='-40872' />
     <nd ref='-40874' />
     <nd ref='-40876' />
@@ -3966,7 +3984,7 @@
     <nd ref='-40872' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43808' action='modify'>
+  <way id='-43824' action='modify'>
     <nd ref='-40886' />
     <nd ref='-40888' />
     <nd ref='-40890' />
@@ -3976,7 +3994,7 @@
     <nd ref='-40886' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43810' action='modify'>
+  <way id='-43826' action='modify'>
     <nd ref='-40898' />
     <nd ref='-40900' />
     <nd ref='-40902' />
@@ -3992,7 +4010,7 @@
     <nd ref='-40898' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43812' action='modify'>
+  <way id='-43828' action='modify'>
     <nd ref='-40922' />
     <nd ref='-40924' />
     <nd ref='-40926' />
@@ -4003,7 +4021,7 @@
     <nd ref='-40922' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43814' action='modify'>
+  <way id='-43830' action='modify'>
     <nd ref='-40936' />
     <nd ref='-40938' />
     <nd ref='-40940' />
@@ -4013,7 +4031,7 @@
     <nd ref='-40936' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43816' action='modify'>
+  <way id='-43832' action='modify'>
     <nd ref='-40948' />
     <nd ref='-40950' />
     <nd ref='-40952' />
@@ -4024,7 +4042,7 @@
     <tag k='name' v='Leikkinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43818' action='modify'>
+  <way id='-43834' action='modify'>
     <nd ref='-40960' />
     <nd ref='-40962' />
     <nd ref='-40964' />
@@ -4033,7 +4051,7 @@
     <tag k='name' v='Söderby' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43820' action='modify'>
+  <way id='-43836' action='modify'>
     <nd ref='-40968' />
     <nd ref='-40970' />
     <nd ref='-40972' />
@@ -4043,7 +4061,7 @@
     <tag k='name' v='Norrby' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43822' action='modify'>
+  <way id='-43838' action='modify'>
     <nd ref='-40978' />
     <nd ref='-40980' />
     <nd ref='-40982' />
@@ -4060,7 +4078,7 @@
     <tag k='short_name' v='Pargas' />
     <tag k='short_name:fi' v='Parainen' />
   </way>
-  <way id='-43824' action='modify'>
+  <way id='-43840' action='modify'>
     <nd ref='-40994' />
     <nd ref='-40996' />
     <nd ref='-40998' />
@@ -4073,7 +4091,7 @@
     <tag k='name' v='Munkvik' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43826' action='modify'>
+  <way id='-43842' action='modify'>
     <nd ref='-41010' />
     <nd ref='-41012' />
     <nd ref='-41014' />
@@ -4084,7 +4102,7 @@
     <tag k='name' v='Björkhagen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43828' action='modify'>
+  <way id='-43844' action='modify'>
     <nd ref='-41022' />
     <nd ref='-41024' />
     <nd ref='-41026' />
@@ -4096,7 +4114,7 @@
     <tag k='name' v='Tennby' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43830' action='modify'>
+  <way id='-43846' action='modify'>
     <nd ref='-41036' />
     <nd ref='-41038' />
     <nd ref='-41040' />
@@ -4107,7 +4125,7 @@
     <tag k='region' v='yes' />
     <tag k='Österby' v='Norrby' />
   </way>
-  <way id='-43832' action='modify'>
+  <way id='-43848' action='modify'>
     <nd ref='-41048' />
     <nd ref='-41050' />
     <nd ref='-41052' />
@@ -4119,7 +4137,7 @@
     <tag k='name' v='Trollgärda' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43834' action='modify'>
+  <way id='-43850' action='modify'>
     <nd ref='-41062' />
     <nd ref='-41064' />
     <nd ref='-41066' />
@@ -4130,7 +4148,7 @@
     <tag k='name' v='Kyrkäng' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43836' action='modify'>
+  <way id='-43852' action='modify'>
     <nd ref='-41074' />
     <nd ref='-41076' />
     <nd ref='-41078' />
@@ -4139,7 +4157,7 @@
     <tag k='name' v='Kirjala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43838' action='modify'>
+  <way id='-43854' action='modify'>
     <nd ref='-41082' />
     <nd ref='-41084' />
     <nd ref='-41086' />
@@ -4152,7 +4170,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43840' action='modify'>
+  <way id='-43856' action='modify'>
     <nd ref='-41096' />
     <nd ref='-41098' />
     <nd ref='-41100' />
@@ -4173,7 +4191,7 @@
     <tag k='short_name' v='Lieto' />
     <tag k='short_name:sv' v='Lundo' />
   </way>
-  <way id='-43842' action='modify'>
+  <way id='-43858' action='modify'>
     <nd ref='-41116' />
     <nd ref='-41118' />
     <nd ref='-41120' />
@@ -4185,7 +4203,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43844' action='modify'>
+  <way id='-43860' action='modify'>
     <nd ref='-41126' />
     <nd ref='-41128' />
     <nd ref='-41130' />
@@ -4196,7 +4214,7 @@
     <tag k='name' v='Hadvala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43846' action='modify'>
+  <way id='-43862' action='modify'>
     <nd ref='-41138' />
     <nd ref='-41140' />
     <nd ref='-41142' />
@@ -4208,7 +4226,7 @@
     <tag k='name' v='Puosta' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43848' action='modify'>
+  <way id='-43864' action='modify'>
     <nd ref='-41152' />
     <nd ref='-41154' />
     <nd ref='-41156' />
@@ -4217,7 +4235,7 @@
     <tag k='name' v='Tuorla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43850' action='modify'>
+  <way id='-43866' action='modify'>
     <nd ref='-41160' />
     <nd ref='-41162' />
     <nd ref='-41164' />
@@ -4226,7 +4244,7 @@
     <tag k='name' v='Raadelma' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43852' action='modify'>
+  <way id='-43868' action='modify'>
     <nd ref='-41168' />
     <nd ref='-41170' />
     <nd ref='-41172' />
@@ -4237,7 +4255,7 @@
     <tag k='name' v='Kreula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43854' action='modify'>
+  <way id='-43870' action='modify'>
     <nd ref='-41180' />
     <nd ref='-41182' />
     <nd ref='-41184' />
@@ -4247,7 +4265,7 @@
     <tag k='name' v='Runko' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43856' action='modify'>
+  <way id='-43872' action='modify'>
     <nd ref='-41190' />
     <nd ref='-41192' />
     <nd ref='-41194' />
@@ -4263,7 +4281,7 @@
     <tag k='name:sv' v='Pemar' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43858' action='modify'>
+  <way id='-43874' action='modify'>
     <nd ref='-41210' />
     <nd ref='-41212' />
     <nd ref='-41214' />
@@ -4275,7 +4293,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Paimio' />
   </way>
-  <way id='-43860' action='modify'>
+  <way id='-43876' action='modify'>
     <nd ref='-41222' />
     <nd ref='-41224' />
     <nd ref='-41226' />
@@ -4285,7 +4303,7 @@
     <nd ref='-41222' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43862' action='modify'>
+  <way id='-43878' action='modify'>
     <nd ref='-41234' />
     <nd ref='-41236' />
     <nd ref='-41238' />
@@ -4297,7 +4315,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Paimio' />
   </way>
-  <way id='-43864' action='modify'>
+  <way id='-43880' action='modify'>
     <nd ref='-41242' />
     <nd ref='-41244' />
     <nd ref='-41246' />
@@ -4312,7 +4330,7 @@
     <tag k='name' v='Naskarla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43866' action='modify'>
+  <way id='-43882' action='modify'>
     <nd ref='-41262' />
     <nd ref='-41264' />
     <nd ref='-41266' />
@@ -4323,7 +4341,7 @@
     <tag k='name' v='Tammi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43868' action='modify'>
+  <way id='-43884' action='modify'>
     <nd ref='-41274' />
     <nd ref='-41276' />
     <nd ref='-41278' />
@@ -4332,7 +4350,7 @@
     <tag k='name' v='Auranlaakso' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43870' action='modify'>
+  <way id='-43886' action='modify'>
     <nd ref='-41282' />
     <nd ref='-41284' />
     <nd ref='-41286' />
@@ -4342,7 +4360,7 @@
     <tag k='name' v='Vanhalinna' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43872' action='modify'>
+  <way id='-43888' action='modify'>
     <nd ref='-41292' />
     <nd ref='-41294' />
     <nd ref='-41296' />
@@ -4354,7 +4372,7 @@
     <tag k='name' v='Loukinainen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43874' action='modify'>
+  <way id='-43890' action='modify'>
     <nd ref='-41304' />
     <nd ref='-41306' />
     <nd ref='-41308' />
@@ -4366,7 +4384,7 @@
     <tag k='name' v='Sillilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43876' action='modify'>
+  <way id='-43892' action='modify'>
     <nd ref='-41318' />
     <nd ref='-41320' />
     <nd ref='-41322' />
@@ -4377,7 +4395,7 @@
     <tag k='name' v='Vierunpuisto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43878' action='modify'>
+  <way id='-43894' action='modify'>
     <nd ref='-41330' />
     <nd ref='-41332' />
     <nd ref='-41334' />
@@ -4387,7 +4405,7 @@
     <tag k='name' v='Muhkuri' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43880' action='modify'>
+  <way id='-43896' action='modify'>
     <nd ref='-41340' />
     <nd ref='-41342' />
     <nd ref='-41344' />
@@ -4402,7 +4420,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43882' action='modify'>
+  <way id='-43898' action='modify'>
     <nd ref='-41356' />
     <nd ref='-41358' />
     <nd ref='-41360' />
@@ -4419,7 +4437,7 @@
     <tag k='short_name:en' v='Lieto stn' />
     <tag k='short_name:sv' v='Lundo stn' />
   </way>
-  <way id='-43884' action='modify'>
+  <way id='-43900' action='modify'>
     <nd ref='-41366' />
     <nd ref='-41368' />
     <nd ref='-43240' />
@@ -4435,7 +4453,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43886' action='modify'>
+  <way id='-43902' action='modify'>
     <nd ref='-41378' />
     <nd ref='-41380' />
     <nd ref='-41382' />
@@ -4444,7 +4462,7 @@
     <tag k='name' v='Salo' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43888' action='modify'>
+  <way id='-43904' action='modify'>
     <nd ref='-41386' />
     <nd ref='-41388' />
     <nd ref='-41390' />
@@ -4456,9 +4474,10 @@
     <tag k='name:en' v='Airport' />
     <tag k='name:sv' v='Flygstationen' />
     <tag k='pictogram' v='✈' />
-    <tag k='region' v='yes' />
-  </way>
-  <way id='-43890' action='modify'>
+    <tag k='priority' v='200' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-43906' action='modify'>
     <nd ref='-41398' />
     <nd ref='-41400' />
     <nd ref='-41402' />
@@ -4469,7 +4488,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43892' action='modify'>
+  <way id='-43908' action='modify'>
     <nd ref='-41408' />
     <nd ref='-41410' />
     <nd ref='-41412' />
@@ -4479,7 +4498,7 @@
     <tag k='name:sv' v='Koskis' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43894' action='modify'>
+  <way id='-43910' action='modify'>
     <nd ref='-41416' />
     <nd ref='-41418' />
     <nd ref='-41420' />
@@ -4490,7 +4509,7 @@
     <tag k='name' v='Avanti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43896' action='modify'>
+  <way id='-43912' action='modify'>
     <nd ref='-41428' />
     <nd ref='-41430' />
     <nd ref='-41432' />
@@ -4502,7 +4521,7 @@
     <tag k='name:sv' v='S:t Mårtens' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43898' action='modify'>
+  <way id='-43914' action='modify'>
     <nd ref='-41440' />
     <nd ref='-41442' />
     <nd ref='-41444' />
@@ -4511,10 +4530,10 @@
     <nd ref='-41450' />
     <nd ref='-41440' />
     <tag k='name' v='Teräsrautela' />
-    <tag k='priority' v='100' />
-    <tag k='region' v='yes' />
-  </way>
-  <way id='-43900' action='modify'>
+    <tag k='priority' v='50' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-43916' action='modify'>
     <nd ref='-41452' />
     <nd ref='-41454' />
     <nd ref='-41456' />
@@ -4525,7 +4544,7 @@
     <tag k='priority' v='75' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43902' action='modify'>
+  <way id='-43918' action='modify'>
     <nd ref='-41460' />
     <nd ref='-41462' />
     <nd ref='-41464' />
@@ -4535,7 +4554,7 @@
     <tag k='priority' v='150' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43904' action='modify'>
+  <way id='-43920' action='modify'>
     <nd ref='-41468' />
     <nd ref='-41470' />
     <nd ref='-41472' />
@@ -4548,7 +4567,7 @@
     <tag k='name:sv' v='Nummi skola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43906' action='modify'>
+  <way id='-43922' action='modify'>
     <nd ref='-41480' />
     <nd ref='-41482' />
     <nd ref='-41484' />
@@ -4559,7 +4578,7 @@
     <tag k='name' v='Somero' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43908' action='modify'>
+  <way id='-43924' action='modify'>
     <nd ref='-41492' />
     <nd ref='-41494' />
     <nd ref='-41496' />
@@ -4570,10 +4589,10 @@
     <tag k='genitive:fi' v='Moikoisten' />
     <tag k='name' v='Moikoinen' />
     <tag k='name:sv' v='Moikois' />
-    <tag k='priority' v='70' />
-    <tag k='region' v='yes' />
-  </way>
-  <way id='-43910' action='modify'>
+    <tag k='priority' v='80' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-43926' action='modify'>
     <nd ref='-41504' />
     <nd ref='-41506' />
     <nd ref='-41508' />
@@ -4582,7 +4601,7 @@
     <tag k='name' v='Kähäri' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43912' action='modify'>
+  <way id='-43928' action='modify'>
     <nd ref='-41512' />
     <nd ref='-41514' />
     <nd ref='-41516' />
@@ -4594,7 +4613,7 @@
     <tag k='name:sv' v='Långbacka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43914' action='modify'>
+  <way id='-43930' action='modify'>
     <nd ref='-41522' />
     <nd ref='-41524' />
     <nd ref='-41526' />
@@ -4608,7 +4627,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43916' action='modify'>
+  <way id='-43932' action='modify'>
     <nd ref='-41536' />
     <nd ref='-41538' />
     <nd ref='-41540' />
@@ -4623,7 +4642,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43918' action='modify'>
+  <way id='-43934' action='modify'>
     <nd ref='-41552' />
     <nd ref='-41554' />
     <nd ref='-41556' />
@@ -4634,7 +4653,7 @@
     <tag k='name' v='Kastu' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43920' action='modify'>
+  <way id='-43936' action='modify'>
     <nd ref='-41564' />
     <nd ref='-43118' />
     <nd ref='-41566' />
@@ -4650,7 +4669,7 @@
     <tag k='name:sv' v='Kuppisparken' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43922' action='modify'>
+  <way id='-43938' action='modify'>
     <nd ref='-41578' />
     <nd ref='-41580' />
     <nd ref='-41582' />
@@ -4668,7 +4687,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Ylioppilaskylä-länsi' />
   </way>
-  <way id='-43924' action='modify'>
+  <way id='-43940' action='modify'>
     <nd ref='-41598' />
     <nd ref='-41600' />
     <nd ref='-41602' />
@@ -4685,7 +4704,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43926' action='modify'>
+  <way id='-43942' action='modify'>
     <nd ref='-41616' />
     <nd ref='-41618' />
     <nd ref='-41620' />
@@ -4696,7 +4715,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43928' action='modify'>
+  <way id='-43944' action='modify'>
     <nd ref='-41624' />
     <nd ref='-42580' />
     <nd ref='-41626' />
@@ -4706,7 +4725,7 @@
     <tag k='name' v='Kaxskäla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43930' action='modify'>
+  <way id='-43946' action='modify'>
     <nd ref='-41632' />
     <nd ref='-41634' />
     <nd ref='-41636' />
@@ -4717,7 +4736,7 @@
     <tag k='name:sv' v='Kemiö' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43932' action='modify'>
+  <way id='-43948' action='modify'>
     <nd ref='-41642' />
     <nd ref='-41644' />
     <nd ref='-41646' />
@@ -4728,7 +4747,7 @@
     <tag k='name:sv' v='Sagu' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43934' action='modify'>
+  <way id='-43950' action='modify'>
     <nd ref='-41652' />
     <nd ref='-41654' />
     <nd ref='-41656' />
@@ -4748,7 +4767,7 @@
     <tag k='short_name:en' v='Student village' />
     <tag k='short_name:sv' v='Studentbyn' />
   </way>
-  <way id='-43936' action='modify'>
+  <way id='-43952' action='modify'>
     <nd ref='-41668' />
     <nd ref='-41670' />
     <nd ref='-41672' />
@@ -4756,7 +4775,7 @@
     <nd ref='-41668' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43938' action='modify'>
+  <way id='-43954' action='modify'>
     <nd ref='-41676' />
     <nd ref='-41678' />
     <nd ref='-41680' />
@@ -4770,7 +4789,7 @@
     <tag k='name:sv' v='Katarina' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43940' action='modify'>
+  <way id='-43956' action='modify'>
     <nd ref='-41692' />
     <nd ref='-41694' />
     <nd ref='-41696' />
@@ -4782,7 +4801,7 @@
     <tag k='name' v='Piispanlähde' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43942' action='modify'>
+  <way id='-43958' action='modify'>
     <nd ref='-41704' />
     <nd ref='-41706' />
     <nd ref='-41708' />
@@ -4795,7 +4814,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Kaistarniemi' />
   </way>
-  <way id='-43944' action='modify'>
+  <way id='-43960' action='modify'>
     <nd ref='-41714' />
     <nd ref='-41716' />
     <nd ref='-41718' />
@@ -4817,7 +4836,7 @@
     <tag k='name:sv' v='Universitet' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43946' action='modify'>
+  <way id='-43962' action='modify'>
     <nd ref='-41744' />
     <nd ref='-41746' />
     <nd ref='-41748' />
@@ -4836,7 +4855,7 @@
     <tag k='short_name:en' v='Barracks' />
     <tag k='short_name:sv' v='Kasernen' />
   </way>
-  <way id='-43948' action='modify'>
+  <way id='-43964' action='modify'>
     <nd ref='-41758' />
     <nd ref='-41760' />
     <nd ref='-41762' />
@@ -4856,7 +4875,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43950' action='modify'>
+  <way id='-43966' action='modify'>
     <nd ref='-41782' />
     <nd ref='-41784' />
     <nd ref='-41786' />
@@ -4865,7 +4884,7 @@
     <tag k='name' v='Lehmusvalkama' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43952' action='modify'>
+  <way id='-43968' action='modify'>
     <nd ref='-41790' />
     <nd ref='-41792' />
     <nd ref='-41794' />
@@ -4880,7 +4899,7 @@
     <tag k='name:sv' v='Månberget' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43954' action='modify'>
+  <way id='-43970' action='modify'>
     <nd ref='-41806' />
     <nd ref='-41808' />
     <nd ref='-41810' />
@@ -4890,7 +4909,7 @@
     <tag k='name:sv' v='Kyrkovägens hälsovårdscentralen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43956' action='modify'>
+  <way id='-43972' action='modify'>
     <nd ref='-41812' />
     <nd ref='-41814' />
     <nd ref='-41816' />
@@ -4907,7 +4926,7 @@
     <tag k='priority' v='-1' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43958' action='modify'>
+  <way id='-43974' action='modify'>
     <nd ref='-41832' />
     <nd ref='-41834' />
     <nd ref='-41836' />
@@ -4918,7 +4937,7 @@
     <tag k='name' v='Kauri' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43960' action='modify'>
+  <way id='-43976' action='modify'>
     <nd ref='-41844' />
     <nd ref='-43094' />
     <nd ref='-43096' />
@@ -4931,7 +4950,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43962' action='modify'>
+  <way id='-43978' action='modify'>
     <nd ref='-41852' />
     <nd ref='-41854' />
     <nd ref='-42808' />
@@ -4950,7 +4969,7 @@
     <tag k='short_name' v='Raisio' />
     <tag k='short_name:sv' v='Reso' />
   </way>
-  <way id='-43964' action='modify'>
+  <way id='-43980' action='modify'>
     <nd ref='-41866' />
     <nd ref='-41868' />
     <nd ref='-41870' />
@@ -4961,7 +4980,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43966' action='modify'>
+  <way id='-43982' action='modify'>
     <nd ref='-41876' />
     <nd ref='-41878' />
     <nd ref='-41880' />
@@ -4975,7 +4994,7 @@
     <tag k='short_name' v='Kaarina' />
     <tag k='short_name:sv' v='S:t Karins' />
   </way>
-  <way id='-43968' action='modify'>
+  <way id='-43984' action='modify'>
     <nd ref='-41884' />
     <nd ref='-41886' />
     <nd ref='-41888' />
@@ -4987,7 +5006,7 @@
     <tag k='name' v='Voivala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43970' action='modify'>
+  <way id='-43986' action='modify'>
     <nd ref='-41898' />
     <nd ref='-41900' />
     <nd ref='-41902' />
@@ -4997,7 +5016,7 @@
     <nd ref='-41898' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43972' action='modify'>
+  <way id='-43988' action='modify'>
     <nd ref='-41910' />
     <nd ref='-41912' />
     <nd ref='-41914' />
@@ -5007,7 +5026,7 @@
     <tag k='name:fi' v='Nauvo' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43974' action='modify'>
+  <way id='-43990' action='modify'>
     <nd ref='-41918' />
     <nd ref='-41920' />
     <nd ref='-41922' />
@@ -5018,7 +5037,7 @@
     <tag k='name:fi' v='Korppoo' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43976' action='modify'>
+  <way id='-43992' action='modify'>
     <nd ref='-41928' />
     <nd ref='-41930' />
     <nd ref='-41932' />
@@ -5028,7 +5047,7 @@
     <tag k='name:fi' v='Pärnäinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43978' action='modify'>
+  <way id='-43994' action='modify'>
     <nd ref='-41936' />
     <nd ref='-41938' />
     <nd ref='-41940' />
@@ -5037,7 +5056,7 @@
     <tag k='name' v='Lemu' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43980' action='modify'>
+  <way id='-43996' action='modify'>
     <nd ref='-41944' />
     <nd ref='-41946' />
     <nd ref='-41948' />
@@ -5046,7 +5065,7 @@
     <tag k='name' v='Torppala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43982' action='modify'>
+  <way id='-43998' action='modify'>
     <nd ref='-41952' />
     <nd ref='-41954' />
     <nd ref='-41956' />
@@ -5056,7 +5075,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43984' action='modify'>
+  <way id='-44000' action='modify'>
     <nd ref='-41960' />
     <nd ref='-41962' />
     <nd ref='-41964' />
@@ -5067,7 +5086,7 @@
     <tag k='priority' v='300' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43986' action='modify'>
+  <way id='-44002' action='modify'>
     <nd ref='-41968' />
     <nd ref='-41970' />
     <nd ref='-41972' />
@@ -5082,7 +5101,7 @@
     <tag k='priority' v='25' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43988' action='modify'>
+  <way id='-44004' action='modify'>
     <nd ref='-41984' />
     <nd ref='-41986' />
     <nd ref='-41988' />
@@ -5093,7 +5112,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43990' action='modify'>
+  <way id='-44006' action='modify'>
     <nd ref='-41994' />
     <nd ref='-41996' />
     <nd ref='-41998' />
@@ -5109,7 +5128,7 @@
     <tag k='name' v='Velkua' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43992' action='modify'>
+  <way id='-44008' action='modify'>
     <nd ref='-42016' />
     <nd ref='-42018' />
     <nd ref='-42020' />
@@ -5121,7 +5140,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43994' action='modify'>
+  <way id='-44010' action='modify'>
     <nd ref='-42028' />
     <nd ref='-42030' />
     <nd ref='-42032' />
@@ -5130,7 +5149,7 @@
     <tag k='name' v='Lieranta' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43996' action='modify'>
+  <way id='-44012' action='modify'>
     <nd ref='-42036' />
     <nd ref='-42038' />
     <nd ref='-42040' />
@@ -5141,7 +5160,7 @@
     <tag k='name' v='Rauduinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-43998' action='modify'>
+  <way id='-44014' action='modify'>
     <nd ref='-42048' />
     <nd ref='-42050' />
     <nd ref='-42052' />
@@ -5155,7 +5174,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44000' action='modify'>
+  <way id='-44016' action='modify'>
     <nd ref='-42060' />
     <nd ref='-42062' />
     <nd ref='-42064' />
@@ -5169,7 +5188,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44002' action='modify'>
+  <way id='-44018' action='modify'>
     <nd ref='-42074' />
     <nd ref='-42076' />
     <nd ref='-42078' />
@@ -5255,9 +5274,10 @@
     <tag k='name' v='Helsingin moottoritie' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44004' action='modify'>
+  <way id='-44020' action='modify'>
     <nd ref='-42236' />
     <nd ref='-42238' />
+    <nd ref='-50752' />
     <nd ref='-43120' />
     <nd ref='-42240' />
     <nd ref='-42242' />
@@ -5265,10 +5285,10 @@
     <tag k='genitive:fi' v='Runosmäen' />
     <tag k='name' v='Runosmäki' />
     <tag k='name:sv' v='Runosbacken' />
-    <tag k='priority' v='75' />
-    <tag k='region' v='yes' />
-  </way>
-  <way id='-44006' action='modify'>
+    <tag k='priority' v='150' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-44022' action='modify'>
     <nd ref='-42244' />
     <nd ref='-42246' />
     <nd ref='-42248' />
@@ -5279,7 +5299,7 @@
     <tag k='name' v='Takakirves' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44008' action='modify'>
+  <way id='-44024' action='modify'>
     <nd ref='-42254' />
     <nd ref='-42256' />
     <nd ref='-42258' />
@@ -5301,7 +5321,7 @@
     <tag k='priority' v='20' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44010' action='modify'>
+  <way id='-44026' action='modify'>
     <nd ref='-42266' />
     <nd ref='-42268' />
     <nd ref='-42270' />
@@ -5318,7 +5338,7 @@
     <tag k='priority' v='70' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44012' action='modify'>
+  <way id='-44028' action='modify'>
     <nd ref='-42286' />
     <nd ref='-42288' />
     <nd ref='-42290' />
@@ -5338,7 +5358,7 @@
     <tag k='short_name:en' v='Kupittaa stn' />
     <tag k='short_name:sv' v='Kuppis stn' />
   </way>
-  <way id='-44014' action='modify'>
+  <way id='-44030' action='modify'>
     <nd ref='-42300' />
     <nd ref='-42302' />
     <nd ref='-42304' />
@@ -5347,7 +5367,7 @@
     <tag k='name' v='Auvaismäki' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44016' action='modify'>
+  <way id='-44032' action='modify'>
     <nd ref='-42308' />
     <nd ref='-42310' />
     <nd ref='-42312' />
@@ -5355,7 +5375,7 @@
     <nd ref='-42308' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44018' action='modify'>
+  <way id='-44034' action='modify'>
     <nd ref='-42316' />
     <nd ref='-42318' />
     <nd ref='-42320' />
@@ -5367,7 +5387,7 @@
     <tag k='name' v='Rauhakylä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44020' action='modify'>
+  <way id='-44036' action='modify'>
     <nd ref='-42330' />
     <nd ref='-42332' />
     <nd ref='-42334' />
@@ -5381,7 +5401,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44022' action='modify'>
+  <way id='-44038' action='modify'>
     <nd ref='-42342' />
     <nd ref='-42344' />
     <nd ref='-42346' />
@@ -5391,7 +5411,7 @@
     <tag k='name' v='Armonlaakso' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44024' action='modify'>
+  <way id='-44040' action='modify'>
     <nd ref='-42350' />
     <nd ref='-42352' />
     <nd ref='-42354' />
@@ -5403,7 +5423,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44026' action='modify'>
+  <way id='-44042' action='modify'>
     <nd ref='-42360' />
     <nd ref='-42362' />
     <nd ref='-42364' />
@@ -5414,7 +5434,7 @@
     <tag k='name' v='Laalahti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44028' action='modify'>
+  <way id='-44044' action='modify'>
     <nd ref='-42368' />
     <nd ref='-42370' />
     <nd ref='-42372' />
@@ -5425,7 +5445,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44030' action='modify'>
+  <way id='-44046' action='modify'>
     <nd ref='-42376' />
     <nd ref='-42378' />
     <nd ref='-42380' />
@@ -5436,7 +5456,7 @@
     <tag k='name' v='Hylkilahti' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44032' action='modify'>
+  <way id='-44048' action='modify'>
     <nd ref='-42384' />
     <nd ref='-42386' />
     <nd ref='-42388' />
@@ -5446,7 +5466,7 @@
     <tag k='name' v='Samppa' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44034' action='modify'>
+  <way id='-44050' action='modify'>
     <nd ref='-42392' />
     <nd ref='-42394' />
     <nd ref='-42396' />
@@ -5455,7 +5475,7 @@
     <tag k='name' v='Artukka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44036' action='modify'>
+  <way id='-44052' action='modify'>
     <nd ref='-42400' />
     <nd ref='-42402' />
     <nd ref='-42404' />
@@ -5464,7 +5484,7 @@
     <tag k='name' v='Satava' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44038' action='modify'>
+  <way id='-44054' action='modify'>
     <nd ref='-42408' />
     <nd ref='-42410' />
     <nd ref='-42412' />
@@ -5473,7 +5493,7 @@
     <tag k='name' v='Ekvalla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44040' action='modify'>
+  <way id='-44056' action='modify'>
     <nd ref='-42416' />
     <nd ref='-42418' />
     <nd ref='-42420' />
@@ -5482,7 +5502,7 @@
     <tag k='name' v='Kakskerran koulu' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44042' action='modify'>
+  <way id='-44058' action='modify'>
     <nd ref='-42424' />
     <nd ref='-42632' />
     <nd ref='-42426' />
@@ -5492,7 +5512,7 @@
     <tag k='name' v='Laukkavuori' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44044' action='modify'>
+  <way id='-44060' action='modify'>
     <nd ref='-42432' />
     <nd ref='-42434' />
     <nd ref='-42436' />
@@ -5502,7 +5522,7 @@
     <tag k='name' v='Itäkeskus' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44046' action='modify'>
+  <way id='-44062' action='modify'>
     <nd ref='-42440' />
     <nd ref='-42442' />
     <nd ref='-42444' />
@@ -5517,7 +5537,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44048' action='modify'>
+  <way id='-44064' action='modify'>
     <nd ref='-42448' />
     <nd ref='-42450' />
     <nd ref='-42452' />
@@ -5531,7 +5551,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44050' action='modify'>
+  <way id='-44066' action='modify'>
     <nd ref='-42462' />
     <nd ref='-42464' />
     <nd ref='-42466' />
@@ -5553,7 +5573,7 @@
     <tag k='region' v='yes' />
     <tag k='short_name' v='Kuhankuono' />
   </way>
-  <way id='-44052' action='modify'>
+  <way id='-44068' action='modify'>
     <nd ref='-42490' />
     <nd ref='-42492' />
     <nd ref='-43084' />
@@ -5563,7 +5583,7 @@
     <tag k='name' v='Petäsmäki' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44054' action='modify'>
+  <way id='-44070' action='modify'>
     <nd ref='-42498' />
     <nd ref='-42500' />
     <nd ref='-42502' />
@@ -5572,7 +5592,7 @@
     <tag k='name' v='Somersoja' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44056' action='modify'>
+  <way id='-44072' action='modify'>
     <nd ref='-42506' />
     <nd ref='-42508' />
     <nd ref='-42510' />
@@ -5581,7 +5601,7 @@
     <tag k='name' v='Pirilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44058' action='modify'>
+  <way id='-44074' action='modify'>
     <nd ref='-42514' />
     <nd ref='-42516' />
     <nd ref='-42518' />
@@ -5590,7 +5610,7 @@
     <nd ref='-42524' />
     <nd ref='-42514' />
   </way>
-  <way id='-44060' action='modify'>
+  <way id='-44076' action='modify'>
     <nd ref='-42526' />
     <nd ref='-42528' />
     <nd ref='-42530' />
@@ -5604,7 +5624,7 @@
     <tag k='priority' v='1000000' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44062' action='modify'>
+  <way id='-44078' action='modify'>
     <nd ref='-42540' />
     <nd ref='-42542' />
     <nd ref='-42544' />
@@ -5615,7 +5635,7 @@
     <tag k='name:sv' v='Stadshuset' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44064' action='modify'>
+  <way id='-44080' action='modify'>
     <nd ref='-42548' />
     <nd ref='-42550' />
     <nd ref='-42552' />
@@ -5628,7 +5648,7 @@
     <tag k='replacement' v='Ylioppilaskylä-länsi' />
     <tag k='short_name' v='Caribia' />
   </way>
-  <way id='-44066' action='modify'>
+  <way id='-44082' action='modify'>
     <nd ref='-42556' />
     <nd ref='-42558' />
     <nd ref='-42560' />
@@ -5638,7 +5658,7 @@
     <tag k='name' v='Nenämäki' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44068' action='modify'>
+  <way id='-44084' action='modify'>
     <nd ref='-42564' />
     <nd ref='-42566' />
     <nd ref='-42568' />
@@ -5647,7 +5667,7 @@
     <tag k='name' v='Ankka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44070' action='modify'>
+  <way id='-44086' action='modify'>
     <nd ref='-42572' />
     <nd ref='-42574' />
     <nd ref='-42576' />
@@ -5657,7 +5677,7 @@
     <tag k='name:fi' v='Taalintehdas' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44072' action='modify'>
+  <way id='-44088' action='modify'>
     <nd ref='-42588' />
     <nd ref='-42590' />
     <nd ref='-42592' />
@@ -5669,7 +5689,7 @@
     <tag k='name:sv' v='Stadssjukhuset' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44074' action='modify'>
+  <way id='-44090' action='modify'>
     <nd ref='-42598' />
     <nd ref='-42600' />
     <nd ref='-42602' />
@@ -5679,7 +5699,7 @@
     <tag k='name:sv' v='Prisma Tammerforsvägen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44076' action='modify'>
+  <way id='-44092' action='modify'>
     <nd ref='-42608' />
     <nd ref='-42610' />
     <nd ref='-42612' />
@@ -5690,7 +5710,7 @@
     <tag k='region' v='yes' />
     <tag k='short_name' v='Citymarket' />
   </way>
-  <way id='-44078' action='modify'>
+  <way id='-44094' action='modify'>
     <nd ref='-42622' />
     <nd ref='-42624' />
     <nd ref='-42626' />
@@ -5703,7 +5723,7 @@
     <tag k='region' v='yes' />
     <tag k='short_name' v='Prisma' />
   </way>
-  <way id='-44080' action='modify'>
+  <way id='-44096' action='modify'>
     <nd ref='-42634' />
     <nd ref='-42636' />
     <nd ref='-42638' />
@@ -5712,7 +5732,7 @@
     <tag k='name' v='Saarenoja' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44082' action='modify'>
+  <way id='-44098' action='modify'>
     <nd ref='-42642' />
     <nd ref='-42644' />
     <nd ref='-42646' />
@@ -5721,7 +5741,7 @@
     <tag k='name' v='Rintahaka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44084' action='modify'>
+  <way id='-44100' action='modify'>
     <nd ref='-42650' />
     <nd ref='-42652' />
     <nd ref='-42654' />
@@ -5730,7 +5750,7 @@
     <tag k='name' v='Kreivilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44086' action='modify'>
+  <way id='-44102' action='modify'>
     <nd ref='-42660' />
     <nd ref='-42662' />
     <nd ref='-42664' />
@@ -5741,7 +5761,7 @@
     <tag k='priority' v='75' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44088' action='modify'>
+  <way id='-44104' action='modify'>
     <nd ref='-42670' />
     <nd ref='-42672' />
     <nd ref='-42674' />
@@ -5752,7 +5772,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Perno' />
   </way>
-  <way id='-44090' action='modify'>
+  <way id='-44106' action='modify'>
     <nd ref='-42680' />
     <nd ref='-42682' />
     <nd ref='-42684' />
@@ -5763,7 +5783,7 @@
     <tag k='name' v='Paakarla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44092' action='modify'>
+  <way id='-44108' action='modify'>
     <nd ref='-42702' />
     <nd ref='-42704' />
     <nd ref='-42706' />
@@ -5772,7 +5792,7 @@
     <tag k='name' v='Vienola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44094' action='modify'>
+  <way id='-44110' action='modify'>
     <nd ref='-42712' />
     <nd ref='-42714' />
     <nd ref='-42720' />
@@ -5788,7 +5808,7 @@
     <tag k='name:sv' v='Ispois' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44096' action='modify'>
+  <way id='-44112' action='modify'>
     <nd ref='-42730' />
     <nd ref='-42732' />
     <nd ref='-42734' />
@@ -5799,7 +5819,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44098' action='modify'>
+  <way id='-44114' action='modify'>
     <nd ref='-42740' />
     <nd ref='-42742' />
     <nd ref='-42744' />
@@ -5808,7 +5828,7 @@
     <tag k='name' v='Makarla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44100' action='modify'>
+  <way id='-44116' action='modify'>
     <nd ref='-42748' />
     <nd ref='-42750' />
     <nd ref='-42752' />
@@ -5818,7 +5838,7 @@
     <tag k='priority' v='200' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44102' action='modify'>
+  <way id='-44118' action='modify'>
     <nd ref='-42756' />
     <nd ref='-42758' />
     <nd ref='-42760' />
@@ -5827,7 +5847,7 @@
     <tag k='name' v='Heernummi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44104' action='modify'>
+  <way id='-44120' action='modify'>
     <nd ref='-42764' />
     <nd ref='-42766' />
     <nd ref='-42768' />
@@ -5836,7 +5856,7 @@
     <tag k='name' v='Niemenkulma' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44106' action='modify'>
+  <way id='-44122' action='modify'>
     <nd ref='-42772' />
     <nd ref='-42774' />
     <nd ref='-42776' />
@@ -5845,7 +5865,7 @@
     <tag k='name' v='Harvaluoto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44108' action='modify'>
+  <way id='-44124' action='modify'>
     <nd ref='-42780' />
     <nd ref='-42782' />
     <nd ref='-42784' />
@@ -5857,7 +5877,7 @@
     <tag k='name' v='Nättinummi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44110' action='modify'>
+  <way id='-44126' action='modify'>
     <nd ref='-42792' />
     <nd ref='-42794' />
     <nd ref='-42796' />
@@ -5868,7 +5888,7 @@
     <tag k='name' v='Kuloinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44112' action='modify'>
+  <way id='-44128' action='modify'>
     <nd ref='-42800' />
     <nd ref='-42802' />
     <nd ref='-42804' />
@@ -5877,7 +5897,7 @@
     <tag k='name' v='Pasala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44114' action='modify'>
+  <way id='-44130' action='modify'>
     <nd ref='-42810' />
     <nd ref='-42812' />
     <nd ref='-42814' />
@@ -5887,7 +5907,7 @@
     <tag k='name' v='Petterinpelto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44116' action='modify'>
+  <way id='-44132' action='modify'>
     <nd ref='-42820' />
     <nd ref='-42822' />
     <nd ref='-42824' />
@@ -5899,7 +5919,7 @@
     <tag k='name' v='Varppeenseutu' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44118' action='modify'>
+  <way id='-44134' action='modify'>
     <nd ref='-42834' />
     <nd ref='-42836' />
     <nd ref='-42838' />
@@ -5911,7 +5931,7 @@
     <tag k='name' v='Upalinko' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44120' action='modify'>
+  <way id='-44136' action='modify'>
     <nd ref='-42850' />
     <nd ref='-42852' />
     <nd ref='-43474' />
@@ -5927,7 +5947,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44122' action='modify'>
+  <way id='-44138' action='modify'>
     <nd ref='-42864' />
     <nd ref='-42866' />
     <nd ref='-42868' />
@@ -5935,7 +5955,7 @@
     <nd ref='-42872' />
     <nd ref='-42864' />
   </way>
-  <way id='-44124' action='modify'>
+  <way id='-44140' action='modify'>
     <nd ref='-42874' />
     <nd ref='-42876' />
     <nd ref='-42878' />
@@ -5949,7 +5969,7 @@
     <tag k='priority' v='15' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44126' action='modify'>
+  <way id='-44142' action='modify'>
     <nd ref='-42890' />
     <nd ref='-42892' />
     <nd ref='-42894' />
@@ -5958,7 +5978,7 @@
     <tag k='name' v='Palomaa' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44128' action='modify'>
+  <way id='-44144' action='modify'>
     <nd ref='-42900' />
     <nd ref='-42902' />
     <nd ref='-42904' />
@@ -5967,7 +5987,7 @@
     <tag k='greater_replacement' v='Kakskerta' />
     <tag k='name' v='Naula' />
   </way>
-  <way id='-44130' action='modify'>
+  <way id='-44146' action='modify'>
     <nd ref='-42908' />
     <nd ref='-42910' />
     <nd ref='-42912' />
@@ -5977,7 +5997,7 @@
     <tag k='name' v='Aatila' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44132' action='modify'>
+  <way id='-44148' action='modify'>
     <nd ref='-42916' />
     <nd ref='-42918' />
     <nd ref='-42920' />
@@ -5988,7 +6008,7 @@
     <tag k='name' v='Monnoinen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44134' action='modify'>
+  <way id='-44150' action='modify'>
     <nd ref='-42924' />
     <nd ref='-42926' />
     <nd ref='-42928' />
@@ -6003,7 +6023,7 @@
     <tag k='name:sv' v='Korois' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44136' action='modify'>
+  <way id='-44152' action='modify'>
     <nd ref='-42940' />
     <nd ref='-42942' />
     <nd ref='-42944' />
@@ -6018,7 +6038,7 @@
     <tag k='name:sv' v='Hansängen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44138' action='modify'>
+  <way id='-44154' action='modify'>
     <nd ref='-42956' />
     <nd ref='-42958' />
     <nd ref='-42960' />
@@ -6027,7 +6047,7 @@
     <tag k='name' v='Kultanummi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44140' action='modify'>
+  <way id='-44156' action='modify'>
     <nd ref='-42964' />
     <nd ref='-42966' />
     <nd ref='-42968' />
@@ -6038,7 +6058,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Littoinen' />
   </way>
-  <way id='-44142' action='modify'>
+  <way id='-44158' action='modify'>
     <nd ref='-42974' />
     <nd ref='-42976' />
     <nd ref='-42978' />
@@ -6049,7 +6069,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Liedon keskusta' />
   </way>
-  <way id='-44144' action='modify'>
+  <way id='-44160' action='modify'>
     <nd ref='-42982' />
     <nd ref='-42984' />
     <nd ref='-42986' />
@@ -6059,7 +6079,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Liedon keskusta' />
   </way>
-  <way id='-44146' action='modify'>
+  <way id='-44162' action='modify'>
     <nd ref='-42990' />
     <nd ref='-42992' />
     <nd ref='-42994' />
@@ -6071,7 +6091,7 @@
     <tag k='region' v='yes' />
     <tag k='replacement' v='Liedon keskusta' />
   </way>
-  <way id='-44148' action='modify'>
+  <way id='-44164' action='modify'>
     <nd ref='-43004' />
     <nd ref='-43006' />
     <nd ref='-43008' />
@@ -6080,7 +6100,7 @@
     <tag k='name' v='Ruuska' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44150' action='modify'>
+  <way id='-44166' action='modify'>
     <nd ref='-43012' />
     <nd ref='-43014' />
     <nd ref='-43016' />
@@ -6089,7 +6109,7 @@
     <tag k='name' v='Mäkkylä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44152' action='modify'>
+  <way id='-44168' action='modify'>
     <nd ref='-43020' />
     <nd ref='-43022' />
     <nd ref='-43024' />
@@ -6098,7 +6118,7 @@
     <tag k='name' v='Nautelankoski' />
     <tag k='replacement' v='yes' />
   </way>
-  <way id='-44154' action='modify'>
+  <way id='-44170' action='modify'>
     <nd ref='-43030' />
     <nd ref='-43032' />
     <nd ref='-43034' />
@@ -6107,7 +6127,7 @@
     <tag k='name' v='Tikanmaa' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44156' action='modify'>
+  <way id='-44172' action='modify'>
     <nd ref='-43038' />
     <nd ref='-43040' />
     <nd ref='-43042' />
@@ -6117,7 +6137,7 @@
     <tag k='priority' v='50' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44158' action='modify'>
+  <way id='-44174' action='modify'>
     <nd ref='-43046' />
     <nd ref='-43048' />
     <nd ref='-43050' />
@@ -6126,7 +6146,7 @@
     <tag k='name' v='Tammikankare' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44160' action='modify'>
+  <way id='-44176' action='modify'>
     <nd ref='-43054' />
     <nd ref='-43056' />
     <nd ref='-43058' />
@@ -6135,7 +6155,7 @@
     <tag k='name' v='Paikkari' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44162' action='modify'>
+  <way id='-44178' action='modify'>
     <nd ref='-43064' />
     <nd ref='-43066' />
     <nd ref='-43068' />
@@ -6147,7 +6167,7 @@
     <tag k='name:sv' v='Lonttis' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44164' action='modify'>
+  <way id='-44180' action='modify'>
     <nd ref='-43076' />
     <nd ref='-43078' />
     <nd ref='-43080' />
@@ -6158,7 +6178,7 @@
     <tag k='name:sv' v='Reso hälsovårdcentralen' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44166' action='modify'>
+  <way id='-44182' action='modify'>
     <nd ref='-43086' />
     <nd ref='-43088' />
     <nd ref='-43090' />
@@ -6167,7 +6187,7 @@
     <tag k='name' v='Ulpukka' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44168' action='modify'>
+  <way id='-44184' action='modify'>
     <nd ref='-43100' />
     <nd ref='-43102' />
     <nd ref='-43104' />
@@ -6175,7 +6195,7 @@
     <nd ref='-43108' />
     <nd ref='-43100' />
   </way>
-  <way id='-44170' action='modify'>
+  <way id='-44186' action='modify'>
     <nd ref='-43110' />
     <nd ref='-43112' />
     <nd ref='-43114' />
@@ -6184,7 +6204,7 @@
     <tag k='name' v='Käyrä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44172' action='modify'>
+  <way id='-44188' action='modify'>
     <nd ref='-43122' />
     <nd ref='-43124' />
     <nd ref='-43132' />
@@ -6195,7 +6215,7 @@
     <tag k='name' v='Kaerla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44174' action='modify'>
+  <way id='-44190' action='modify'>
     <nd ref='-43136' />
     <nd ref='-43138' />
     <nd ref='-43140' />
@@ -6206,7 +6226,7 @@
     <tag k='name:sv' v='Rieskalähde skola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44176' action='modify'>
+  <way id='-44192' action='modify'>
     <nd ref='-43144' />
     <nd ref='-43146' />
     <nd ref='-43148' />
@@ -6222,7 +6242,7 @@
     <tag k='name:sv' v='Flottbas' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44178' action='modify'>
+  <way id='-44194' action='modify'>
     <nd ref='-43162' />
     <nd ref='-43164' />
     <nd ref='-43166' />
@@ -6231,7 +6251,7 @@
     <tag k='name' v='Manhattan' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44180' action='modify'>
+  <way id='-44196' action='modify'>
     <nd ref='-43172' />
     <nd ref='-43174' />
     <nd ref='-43176' />
@@ -6240,7 +6260,7 @@
     <tag k='name' v='Hakula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44182' action='modify'>
+  <way id='-44198' action='modify'>
     <nd ref='-43180' />
     <nd ref='-43182' />
     <nd ref='-43184' />
@@ -6249,7 +6269,7 @@
     <tag k='name' v='Keto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44184' action='modify'>
+  <way id='-44200' action='modify'>
     <nd ref='-43188' />
     <nd ref='-43190' />
     <nd ref='-43192' />
@@ -6258,7 +6278,7 @@
     <tag k='name' v='Nautela' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44186' action='modify'>
+  <way id='-44202' action='modify'>
     <nd ref='-43196' />
     <nd ref='-43198' />
     <nd ref='-43200' />
@@ -6267,7 +6287,7 @@
     <tag k='name' v='Laustee' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44188' action='modify'>
+  <way id='-44204' action='modify'>
     <nd ref='-43204' />
     <nd ref='-43206' />
     <nd ref='-43208' />
@@ -6276,7 +6296,7 @@
     <tag k='name' v='Pakurla' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44190' action='modify'>
+  <way id='-44206' action='modify'>
     <nd ref='-43212' />
     <nd ref='-43214' />
     <nd ref='-43216' />
@@ -6288,7 +6308,7 @@
     <tag k='name:sv' v='Fängelse' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44192' action='modify'>
+  <way id='-44208' action='modify'>
     <nd ref='-43222' />
     <nd ref='-43224' />
     <nd ref='-43226' />
@@ -6297,7 +6317,7 @@
     <tag k='name' v='Kirkonkulma' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44194' action='modify'>
+  <way id='-44210' action='modify'>
     <nd ref='-43232' />
     <nd ref='-43234' />
     <nd ref='-43236' />
@@ -6306,7 +6326,7 @@
     <tag k='name' v='Lahto' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44196' action='modify'>
+  <way id='-44212' action='modify'>
     <nd ref='-43248' />
     <nd ref='-43250' />
     <nd ref='-43252' />
@@ -6315,7 +6335,7 @@
     <tag k='name' v='Pitkäniitty' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44198' action='modify'>
+  <way id='-44214' action='modify'>
     <nd ref='-43256' />
     <nd ref='-43258' />
     <nd ref='-43260' />
@@ -6326,7 +6346,7 @@
     <tag k='name' v='Vanhatalo' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44200' action='modify'>
+  <way id='-44216' action='modify'>
     <nd ref='-43268' />
     <nd ref='-43270' />
     <nd ref='-43272' />
@@ -6335,7 +6355,7 @@
     <tag k='name' v='Leikola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44202' action='modify'>
+  <way id='-44218' action='modify'>
     <nd ref='-43276' />
     <nd ref='-43278' />
     <nd ref='-43280' />
@@ -6344,7 +6364,7 @@
     <tag k='name' v='Käetty' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44204' action='modify'>
+  <way id='-44220' action='modify'>
     <nd ref='-43284' />
     <nd ref='-43286' />
     <nd ref='-43288' />
@@ -6353,7 +6373,7 @@
     <tag k='name' v='Leppäkoski' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44206' action='modify'>
+  <way id='-44222' action='modify'>
     <nd ref='-43292' />
     <nd ref='-43294' />
     <nd ref='-43296' />
@@ -6362,7 +6382,7 @@
     <tag k='name' v='Leinakkala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44208' action='modify'>
+  <way id='-44224' action='modify'>
     <nd ref='-43300' />
     <nd ref='-43302' />
     <nd ref='-43304' />
@@ -6371,7 +6391,7 @@
     <tag k='name' v='Sikilä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44210' action='modify'>
+  <way id='-44226' action='modify'>
     <nd ref='-43308' />
     <nd ref='-43310' />
     <nd ref='-43312' />
@@ -6380,7 +6400,7 @@
     <tag k='name' v='Ryökäs' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44212' action='modify'>
+  <way id='-44228' action='modify'>
     <nd ref='-43316' />
     <nd ref='-43318' />
     <nd ref='-43320' />
@@ -6389,7 +6409,7 @@
     <tag k='name' v='Rähälä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44214' action='modify'>
+  <way id='-44230' action='modify'>
     <nd ref='-43324' />
     <nd ref='-43326' />
     <nd ref='-43328' />
@@ -6398,7 +6418,7 @@
     <tag k='name' v='Kaskala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44216' action='modify'>
+  <way id='-44232' action='modify'>
     <nd ref='-43334' />
     <nd ref='-43336' />
     <nd ref='-43338' />
@@ -6407,7 +6427,7 @@
     <tag k='name' v='Teijula' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44218' action='modify'>
+  <way id='-44234' action='modify'>
     <nd ref='-43342' />
     <nd ref='-43344' />
     <nd ref='-43346' />
@@ -6416,7 +6436,7 @@
     <tag k='name' v='Metsäniemi' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44220' action='modify'>
+  <way id='-44236' action='modify'>
     <nd ref='-43350' />
     <nd ref='-43352' />
     <nd ref='-43354' />
@@ -6425,7 +6445,7 @@
     <tag k='name' v='Kurkela' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44222' action='modify'>
+  <way id='-44238' action='modify'>
     <nd ref='-43358' />
     <nd ref='-43360' />
     <nd ref='-43362' />
@@ -6434,7 +6454,7 @@
     <tag k='name' v='Vuohenkulma' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44224' action='modify'>
+  <way id='-44240' action='modify'>
     <nd ref='-43366' />
     <nd ref='-43368' />
     <nd ref='-43370' />
@@ -6446,7 +6466,7 @@
     <tag k='name' v='Vintala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44226' action='modify'>
+  <way id='-44242' action='modify'>
     <nd ref='-43380' />
     <nd ref='-43382' />
     <nd ref='-43384' />
@@ -6455,7 +6475,7 @@
     <tag k='name' v='Kaurinkoski' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44228' action='modify'>
+  <way id='-44244' action='modify'>
     <nd ref='-43390' />
     <nd ref='-43392' />
     <nd ref='-43394' />
@@ -6464,7 +6484,7 @@
     <tag k='name' v='Pränikkälä' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44230' action='modify'>
+  <way id='-44246' action='modify'>
     <nd ref='-43398' />
     <nd ref='-43400' />
     <nd ref='-43402' />
@@ -6488,7 +6508,7 @@
     <tag k='name:sv' v='Svalberga' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44232' action='modify'>
+  <way id='-44248' action='modify'>
     <nd ref='-43432' />
     <nd ref='-43434' />
     <nd ref='-43436' />
@@ -6499,7 +6519,7 @@
     <tag k='name:sv' v='Svalberga skola' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44234' action='modify'>
+  <way id='-44250' action='modify'>
     <nd ref='-43462' />
     <nd ref='-43442' />
     <nd ref='-43444' />
@@ -6518,7 +6538,7 @@
     <tag k='priority' v='100' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44236' action='modify'>
+  <way id='-44252' action='modify'>
     <nd ref='-43480' />
     <nd ref='-43482' />
     <nd ref='-43484' />
@@ -6527,7 +6547,7 @@
     <tag k='name' v='Toivonlinna' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44238' action='modify'>
+  <way id='-44254' action='modify'>
     <nd ref='-43488' />
     <nd ref='-43490' />
     <nd ref='-43492' />
@@ -6536,7 +6556,7 @@
     <tag k='name' v='Viukkala' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44240' action='modify'>
+  <way id='-44256' action='modify'>
     <nd ref='-43496' />
     <nd ref='-43498' />
     <nd ref='-43500' />
@@ -6545,7 +6565,7 @@
     <tag k='name' v='Pussila' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-44242' action='modify'>
+  <way id='-44258' action='modify'>
     <nd ref='-43524' />
     <nd ref='-43526' />
     <nd ref='-43528' />
@@ -6559,22 +6579,50 @@
     <tag k='name:sv' v='Skogsbacka travbanan' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-52299' action='modify'>
-    <nd ref='-52297' />
-    <nd ref='-52298' />
-    <nd ref='-52300' />
-    <nd ref='-52302' />
-    <nd ref='-52297' />
+  <way id='-44260' action='modify'>
+    <nd ref='-43540' />
+    <nd ref='-43542' />
+    <nd ref='-43544' />
+    <nd ref='-43546' />
+    <nd ref='-43540' />
     <tag k='name' v='Puropellon koulu' />
     <tag k='region' v='yes' />
   </way>
-  <way id='-52320' action='modify'>
-    <nd ref='-52318' />
-    <nd ref='-52319' />
-    <nd ref='-52321' />
-    <nd ref='-52323' />
-    <nd ref='-52318' />
+  <way id='-44262' action='modify'>
+    <nd ref='-43548' />
+    <nd ref='-43550' />
+    <nd ref='-43552' />
+    <nd ref='-43554' />
+    <nd ref='-43548' />
     <tag k='name' v='Samppalinna' />
     <tag k='region' v='yes' />
   </way>
+  <way id='-50647' action='modify'>
+    <nd ref='-50645' />
+    <nd ref='-50646' />
+    <nd ref='-50648' />
+    <nd ref='-50650' />
+    <nd ref='-50645' />
+    <tag k='name' v='Klassillinen lukio' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-52767' action='modify'>
+    <nd ref='-52765' />
+    <nd ref='-52766' />
+    <nd ref='-52768' />
+    <nd ref='-52770' />
+    <nd ref='-52772' />
+    <nd ref='-52765' />
+    <tag k='name' v='Turun lyseo' />
+    <tag k='region' v='yes' />
+  </way>
+  <way id='-52791' action='modify'>
+    <nd ref='-52789' />
+    <nd ref='-52790' />
+    <nd ref='-52792' />
+    <nd ref='-52794' />
+    <nd ref='-52789' />
+    <tag k='name' v='Kärsämäen hautausmaa' />
+    <tag k='region' v='yes' />
+  </way>
 </osm>
--- a/service.py	Tue May 01 13:24:33 2018 +0300
+++ b/service.py	Fri May 04 21:32:16 2018 +0300
@@ -161,11 +161,11 @@
 	entries = [trip.from_place]
 	old_places = None
 	starting_halt = None
-	while True:
+	while len(entries) < 3:
 		remaining_length = trip.length
 		if starting_halt:
 			remaining_length -= starting_halt.traveled_distance
-		places = reduce_schedule(trip.concise_schedule(starting_stop = starting_halt), trip_length = remaining_length, format = 'medium')
+		places = reduce_schedule(trip.concise_schedule(starting_stop = starting_halt), trip_length = remaining_length, format = 'short')
 		new_places = set(places) - set(entries)
 		if not new_places or places == old_places:
 			break
@@ -769,20 +769,27 @@
 @app.route('/route/<name>')
 def route_page(name):
 	from buses import routes
+	from collections import defaultdict
+	from busroute import greatly_simplify_name
 	route = routes[name.upper()]
-	schedule = []
+	schedules = defaultdict(list)
 	for trip in route.trips:
-		if trip.is_served_at(today()) and datetime.combine(today(), time()) + trip.schedule[-1].arrival_time < now():
-			schedule.append({
+		if trip.is_served_at(today()):
+			schedules[trip.schedule[0].stop].append({
 				'name': trip.reference,
 				'from': trip.from_place,
 				'to': trip.to_place,
+				'description': ' - '.join(
+					greatly_simplify_name(place)
+					for place in trip_description(trip)
+				),
+				'gone': datetime.combine(today(), time()) + trip.schedule[-1].arrival_time < now(),
 				'time': time_representation(datetime.combine(today(), time()) + trip.schedule[0].departure_time),
 			})
 	return render_template('route.html',
 		name = route.reference + ' ' + route.description,
 		tr = tr,
-		schedule = schedule,
+		schedules = schedules,
 	)
 
 @app.route('/interesting')
--- a/static/style.css	Tue May 01 13:24:33 2018 +0300
+++ b/static/style.css	Fri May 04 21:32:16 2018 +0300
@@ -269,3 +269,13 @@
 {
 	font-size: 75%;
 }
+
+.stop-code
+{
+	font-weight: bold;
+}
+.stop-name
+{
+	font-size: 75%;
+	/*font-style: italic;*/
+}
--- a/templates/interesting.html	Tue May 01 13:24:33 2018 +0300
+++ b/templates/interesting.html	Fri May 04 21:32:16 2018 +0300
@@ -1,4 +1,4 @@
-{% from "macros.html" import route_rep %}
+{% from "macros.html" import route_rep, bus_stop_rep %}
 <html>
 <head>
 	<link rel="icon" type="image/png" href="./static/favicon.png" />
@@ -11,15 +11,10 @@
 	{
 		text-align: left;
 	}
-	.sarake-linja, .stop-code
+	.sarake-linja
 	{
 		font-weight: bold;
 	}
-	.stop-name
-	{
-		font-size: 75%;
-		/*font-style: italic;*/
-	}
 	</style>
 </head>
 <body>
@@ -51,7 +46,7 @@
 			<td class='sarake-aika'>
 				{{entry['departure'].strftime('%H:%M')}}</td>
 			<td class='sarake-pysäkki'>
-				<a href="./stop/{{entry['stop'].code}}"><img src="./static/{{entry['stop'].typename}}.png" height="24" /> <span class='stop-code'>{{entry['stop'].code}} </span><br /><span class='stop-name'>{{entry['stop'].name}}</span></a>
+				{{bus_stop_rep(entry['stop'])}}
 			</td>
 			<td class='sarake-linja linja'>
 				<a href="./trip/{{entry['trip']}}">{{entry['route']}}</a>
--- a/templates/macros.html	Tue May 01 13:24:33 2018 +0300
+++ b/templates/macros.html	Fri May 04 21:32:16 2018 +0300
@@ -1,3 +1,7 @@
 {% macro route_rep(route_splice) %}
 {{route_splice[0]}}{{route_splice[1]}}<span class='route-suffix'>{{route_splice[2]}}</span>
 {% endmacro %}
+
+{% macro bus_stop_rep(bus_stop) %}
+<a href="./stop/{{bus_stop.code}}"><img src="./static/{{bus_stop.typename}}.png" height="24" /> <span class='stop-code'>{{bus_stop.code}} </span><br /><span class='stop-name'>{{bus_stop.name}}</span></a>
+{% endmacro %}
--- a/templates/route.html	Tue May 01 13:24:33 2018 +0300
+++ b/templates/route.html	Fri May 04 21:32:16 2018 +0300
@@ -1,5 +1,7 @@
+{% from "macros.html" import route_rep, bus_stop_rep %}
 <html>
 <head>
+	<base href='..' />
 	<link rel="icon" type="image/png" href="../static/favicon.png" />
 	<link rel="stylesheet" type="text/css" href="../static/style.css" />
 	<meta charset='UTF-8' />
@@ -11,18 +13,21 @@
 	<table class='aikataulu' cellspacing="0">
 		<tr>
 			<th class='sarake-aika'>{{tr('time', 'headings')}}</th>
-			<th class='sarake-lähtö'>{{tr('from', 'headings')}}</th>
-			<th class='sarake-määränpää'>{{tr('destination', 'headings')}}</th>
-			<th class='sarake-status'>{{tr('status', 'headings')}}</th>
+			<th class='sarake-lähtö'>{{tr('trip-description', 'headings')}}</th>
 		</tr>
+		{% for stop, schedule in schedules.items() %}
+		<thead>
+		<tr>
+			<td colspan='2'>{{bus_stop_rep(stop)}}</th>
+		</tr>
+		</thead>
 		{% for trip in schedule %}
 		<tr>
 			<td>{{trip['time']}}</td>
-			<td><a href="../trip/{{trip['name']}}">{{trip['from']}}</a></td>
-			<td><a href="../trip/{{trip['name']}}">{{trip['to']}}</a></td>
-			<td><a href="../trip/{{trip['name']}}">{{trip['status']}}</a></td>
+			<td><a href="./trip/{{trip['name']}}">{{trip['description']}}</a></td>
 		</tr>
 		{% endfor %}
+		{% endfor %}
 	</table>
 </body>
 </html>

Mercurial Repository: bus-service

mercurial