Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 2739)
+++ /trunk/styles/standard/elemstyles.xml	(revision 2740)
@@ -2010,4 +2010,11 @@
 
 	<rule>
+		<condition k="amenity" v="grit_bin"/>
+		<icon annotate="true" src="misc/grit_bin.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="telephone"/>
 		<icon annotate="true" src="service/telephone.png"/>
Index: /trunk/styles/standard/overview.osm
===================================================================
--- /trunk/styles/standard/overview.osm	(revision 2739)
+++ /trunk/styles/standard/overview.osm	(revision 2740)
@@ -1076,6 +1076,6 @@
   </node>
   <node id="-65800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00090">
-    <tag k="barrier" v="bollard"/>
-    <tag k="name" v="bollard"/>
+    <tag k="barrier" v="any"/>
+    <tag k="name" v="(any)"/>
   </node>
   <node id="-65801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00086"/>
@@ -1089,10 +1089,10 @@
     <nd ref="-65804"/>
     <nd ref="-65801"/>
+    <tag k="barrier" v="any"/>
+    <tag k="name" v="any"/>
+  </way>
+  <node id="-66000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00090">
     <tag k="barrier" v="bollard"/>
     <tag k="name" v="bollard"/>
-  </way>
-  <node id="-66000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00090">
-    <tag k="barrier" v="gate"/>
-    <tag k="name" v="gate"/>
   </node>
   <node id="-66001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00086"/>
@@ -1106,10 +1106,10 @@
     <nd ref="-66004"/>
     <nd ref="-66001"/>
+    <tag k="barrier" v="bollard"/>
+    <tag k="name" v="bollard"/>
+  </way>
+  <node id="-66200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00090">
     <tag k="barrier" v="gate"/>
     <tag k="name" v="gate"/>
-  </way>
-  <node id="-66200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00090">
-    <tag k="barrier" v="hedge"/>
-    <tag k="name" v="hedge"/>
   </node>
   <node id="-66201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00086"/>
@@ -1123,10 +1123,10 @@
     <nd ref="-66204"/>
     <nd ref="-66201"/>
+    <tag k="barrier" v="gate"/>
+    <tag k="name" v="gate"/>
+  </way>
+  <node id="-66400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00090">
     <tag k="barrier" v="hedge"/>
     <tag k="name" v="hedge"/>
-  </way>
-  <node id="-66400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00090">
-    <tag k="barrier" v="stile"/>
-    <tag k="name" v="stile"/>
   </node>
   <node id="-66401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00086"/>
@@ -1140,10 +1140,10 @@
     <nd ref="-66404"/>
     <nd ref="-66401"/>
+    <tag k="barrier" v="hedge"/>
+    <tag k="name" v="hedge"/>
+  </way>
+  <node id="-66600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00090">
     <tag k="barrier" v="stile"/>
     <tag k="name" v="stile"/>
-  </way>
-  <node id="-66600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00090">
-    <tag k="barrier" v="turnstile"/>
-    <tag k="name" v="turnstile"/>
   </node>
   <node id="-66601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00086"/>
@@ -1157,10 +1157,10 @@
     <nd ref="-66604"/>
     <nd ref="-66601"/>
+    <tag k="barrier" v="stile"/>
+    <tag k="name" v="stile"/>
+  </way>
+  <node id="-66800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00090">
     <tag k="barrier" v="turnstile"/>
     <tag k="name" v="turnstile"/>
-  </way>
-  <node id="-66800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00090">
-    <tag k="barrier" v="fence"/>
-    <tag k="name" v="fence"/>
   </node>
   <node id="-66801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00086"/>
@@ -1174,10 +1174,10 @@
     <nd ref="-66804"/>
     <nd ref="-66801"/>
+    <tag k="barrier" v="turnstile"/>
+    <tag k="name" v="turnstile"/>
+  </way>
+  <node id="-67000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00090">
     <tag k="barrier" v="fence"/>
     <tag k="name" v="fence"/>
-  </way>
-  <node id="-67000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00090">
-    <tag k="barrier" v="cycle_barrier"/>
-    <tag k="name" v="cycle_barrier"/>
   </node>
   <node id="-67001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00086"/>
@@ -1191,10 +1191,10 @@
     <nd ref="-67004"/>
     <nd ref="-67001"/>
+    <tag k="barrier" v="fence"/>
+    <tag k="name" v="fence"/>
+  </way>
+  <node id="-67200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00090">
     <tag k="barrier" v="cycle_barrier"/>
     <tag k="name" v="cycle_barrier"/>
-  </way>
-  <node id="-67200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00090">
-    <tag k="barrier" v="lift_gate"/>
-    <tag k="name" v="lift_gate"/>
   </node>
   <node id="-67201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00086"/>
@@ -1208,10 +1208,10 @@
     <nd ref="-67204"/>
     <nd ref="-67201"/>
+    <tag k="barrier" v="cycle_barrier"/>
+    <tag k="name" v="cycle_barrier"/>
+  </way>
+  <node id="-67400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00090">
     <tag k="barrier" v="lift_gate"/>
     <tag k="name" v="lift_gate"/>
-  </way>
-  <node id="-67400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00090">
-    <tag k="barrier" v="wall"/>
-    <tag k="name" v="wall"/>
   </node>
   <node id="-67401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00086"/>
@@ -1225,10 +1225,10 @@
     <nd ref="-67404"/>
     <nd ref="-67401"/>
+    <tag k="barrier" v="lift_gate"/>
+    <tag k="name" v="lift_gate"/>
+  </way>
+  <node id="-67600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00090">
     <tag k="barrier" v="wall"/>
     <tag k="name" v="wall"/>
-  </way>
-  <node id="-67600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00090">
-    <tag k="barrier" v="toll_booth"/>
-    <tag k="name" v="toll_booth"/>
   </node>
   <node id="-67601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00086"/>
@@ -1242,10 +1242,10 @@
     <nd ref="-67604"/>
     <nd ref="-67601"/>
+    <tag k="barrier" v="wall"/>
+    <tag k="name" v="wall"/>
+  </way>
+  <node id="-67800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00090">
     <tag k="barrier" v="toll_booth"/>
     <tag k="name" v="toll_booth"/>
-  </way>
-  <node id="-67800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00090">
-    <tag k="barrier" v="kissing_gate"/>
-    <tag k="name" v="kissing_gate"/>
   </node>
   <node id="-67801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00086"/>
@@ -1259,10 +1259,10 @@
     <nd ref="-67804"/>
     <nd ref="-67801"/>
+    <tag k="barrier" v="toll_booth"/>
+    <tag k="name" v="toll_booth"/>
+  </way>
+  <node id="-68000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00090">
     <tag k="barrier" v="kissing_gate"/>
     <tag k="name" v="kissing_gate"/>
-  </way>
-  <node id="-68000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00090">
-    <tag k="barrier" v="city_wall"/>
-    <tag k="name" v="city_wall"/>
   </node>
   <node id="-68001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00086"/>
@@ -1276,10 +1276,10 @@
     <nd ref="-68004"/>
     <nd ref="-68001"/>
+    <tag k="barrier" v="kissing_gate"/>
+    <tag k="name" v="kissing_gate"/>
+  </way>
+  <node id="-68200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00090">
     <tag k="barrier" v="city_wall"/>
     <tag k="name" v="city_wall"/>
-  </way>
-  <node id="-68200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00090">
-    <tag k="barrier" v="entrance"/>
-    <tag k="name" v="entrance"/>
   </node>
   <node id="-68201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00086"/>
@@ -1293,10 +1293,10 @@
     <nd ref="-68204"/>
     <nd ref="-68201"/>
+    <tag k="barrier" v="city_wall"/>
+    <tag k="name" v="city_wall"/>
+  </way>
+  <node id="-85800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00120">
     <tag k="barrier" v="entrance"/>
     <tag k="name" v="entrance"/>
-  </way>
-  <node id="-85800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00120">
-    <tag k="barrier" v="retaining_wall"/>
-    <tag k="name" v="retaining_wall"/>
   </node>
   <node id="-85801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00116"/>
@@ -1310,10 +1310,10 @@
     <nd ref="-85804"/>
     <nd ref="-85801"/>
+    <tag k="barrier" v="entrance"/>
+    <tag k="name" v="entrance"/>
+  </way>
+  <node id="-86000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00120">
     <tag k="barrier" v="retaining_wall"/>
     <tag k="name" v="retaining_wall"/>
-  </way>
-  <node id="-86000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00120">
-    <tag k="barrier" v="cattle_grid"/>
-    <tag k="name" v="cattle_grid"/>
   </node>
   <node id="-86001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00116"/>
@@ -1327,10 +1327,10 @@
     <nd ref="-86004"/>
     <nd ref="-86001"/>
+    <tag k="barrier" v="retaining_wall"/>
+    <tag k="name" v="retaining_wall"/>
+  </way>
+  <node id="-86200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00120">
     <tag k="barrier" v="cattle_grid"/>
     <tag k="name" v="cattle_grid"/>
-  </way>
-  <node id="-86200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00120">
-    <tag k="barrier" v="block"/>
-    <tag k="name" v="block"/>
   </node>
   <node id="-86201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00116"/>
@@ -1344,10 +1344,10 @@
     <nd ref="-86204"/>
     <nd ref="-86201"/>
+    <tag k="barrier" v="cattle_grid"/>
+    <tag k="name" v="cattle_grid"/>
+  </way>
+  <node id="-86400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00120">
     <tag k="barrier" v="block"/>
     <tag k="name" v="block"/>
-  </way>
-  <node id="-86400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00120">
-    <tag k="barrier" v="border_control"/>
-    <tag k="name" v="border_control"/>
   </node>
   <node id="-86401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00116"/>
@@ -1361,10 +1361,10 @@
     <nd ref="-86404"/>
     <nd ref="-86401"/>
+    <tag k="barrier" v="block"/>
+    <tag k="name" v="block"/>
+  </way>
+  <node id="-86600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00120">
     <tag k="barrier" v="border_control"/>
     <tag k="name" v="border_control"/>
-  </way>
-  <node id="-86600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00120">
-    <tag k="barrier" v="bump_gate"/>
-    <tag k="name" v="bump_gate"/>
   </node>
   <node id="-86601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00116"/>
@@ -1378,10 +1378,10 @@
     <nd ref="-86604"/>
     <nd ref="-86601"/>
+    <tag k="barrier" v="border_control"/>
+    <tag k="name" v="border_control"/>
+  </way>
+  <node id="-86800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00120">
     <tag k="barrier" v="bump_gate"/>
     <tag k="name" v="bump_gate"/>
-  </way>
-  <node id="-86800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00120">
-    <tag k="barrier" v="sally_port"/>
-    <tag k="name" v="sally_port"/>
   </node>
   <node id="-86801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00116"/>
@@ -1395,10 +1395,10 @@
     <nd ref="-86804"/>
     <nd ref="-86801"/>
+    <tag k="barrier" v="bump_gate"/>
+    <tag k="name" v="bump_gate"/>
+  </way>
+  <node id="-87000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00120">
     <tag k="barrier" v="sally_port"/>
     <tag k="name" v="sally_port"/>
-  </way>
-  <node id="-87000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00120">
-    <tag k="barrier" v="portcullis"/>
-    <tag k="name" v="portcullis"/>
   </node>
   <node id="-87001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00116"/>
@@ -1412,10 +1412,10 @@
     <nd ref="-87004"/>
     <nd ref="-87001"/>
+    <tag k="barrier" v="sally_port"/>
+    <tag k="name" v="sally_port"/>
+  </way>
+  <node id="-87200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00120">
     <tag k="barrier" v="portcullis"/>
     <tag k="name" v="portcullis"/>
-  </way>
-  <node id="-87200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00120">
-    <tag k="barrier" v="spikes"/>
-    <tag k="name" v="spikes"/>
   </node>
   <node id="-87201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00116"/>
@@ -1429,10 +1429,10 @@
     <nd ref="-87204"/>
     <nd ref="-87201"/>
+    <tag k="barrier" v="portcullis"/>
+    <tag k="name" v="portcullis"/>
+  </way>
+  <node id="-87400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00120">
     <tag k="barrier" v="spikes"/>
     <tag k="name" v="spikes"/>
-  </way>
-  <node id="-87400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00120">
-    <tag k="barrier" v="bus_trap"/>
-    <tag k="name" v="bus_trap"/>
   </node>
   <node id="-87401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00116"/>
@@ -1446,10 +1446,10 @@
     <nd ref="-87404"/>
     <nd ref="-87401"/>
+    <tag k="barrier" v="spikes"/>
+    <tag k="name" v="spikes"/>
+  </way>
+  <node id="-87600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00120">
     <tag k="barrier" v="bus_trap"/>
     <tag k="name" v="bus_trap"/>
-  </way>
-  <node id="-87600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00120">
-    <tag k="barrier" v="drawbridge"/>
-    <tag k="name" v="drawbridge"/>
   </node>
   <node id="-87601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00116"/>
@@ -1463,10 +1463,10 @@
     <nd ref="-87604"/>
     <nd ref="-87601"/>
+    <tag k="barrier" v="bus_trap"/>
+    <tag k="name" v="bus_trap"/>
+  </way>
+  <node id="-87800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00120">
     <tag k="barrier" v="drawbridge"/>
     <tag k="name" v="drawbridge"/>
-  </way>
-  <node id="-87800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00120">
-    <tag k="barrier" v="hampshire_gate"/>
-    <tag k="name" v="hampshire_gate"/>
   </node>
   <node id="-87801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00116"/>
@@ -1480,4 +1480,21 @@
     <nd ref="-87804"/>
     <nd ref="-87801"/>
+    <tag k="barrier" v="drawbridge"/>
+    <tag k="name" v="drawbridge"/>
+  </way>
+  <node id="-88000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00120">
+    <tag k="barrier" v="hampshire_gate"/>
+    <tag k="name" v="hampshire_gate"/>
+  </node>
+  <node id="-88001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00116"/>
+  <node id="-88002" user="overview-creator" visible="true" lat="-0.00396" lon="0.00144"/>
+  <node id="-88003" user="overview-creator" visible="true" lat="-0.00404" lon="0.00144"/>
+  <node id="-88004" user="overview-creator" visible="true" lat="-0.00404" lon="0.00116"/>
+  <way id="-88004" user="overview-creator" visible="true">
+    <nd ref="-88001"/>
+    <nd ref="-88002"/>
+    <nd ref="-88003"/>
+    <nd ref="-88004"/>
+    <nd ref="-88001"/>
     <tag k="barrier" v="hampshire_gate"/>
     <tag k="name" v="hampshire_gate"/>
@@ -3597,6 +3614,6 @@
   </way>
   <node id="-164200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00240">
-    <tag k="amenity" v="telephone"/>
-    <tag k="name" v="telephone"/>
+    <tag k="amenity" v="grit_bin"/>
+    <tag k="name" v="grit_bin"/>
   </node>
   <node id="-164201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00236"/>
@@ -3610,10 +3627,10 @@
     <nd ref="-164204"/>
     <nd ref="-164201"/>
+    <tag k="amenity" v="grit_bin"/>
+    <tag k="name" v="grit_bin"/>
+  </way>
+  <node id="-164400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00240">
     <tag k="amenity" v="telephone"/>
     <tag k="name" v="telephone"/>
-  </way>
-  <node id="-164400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00240">
-    <tag k="amenity" v="clock"/>
-    <tag k="name" v="clock"/>
   </node>
   <node id="-164401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00236"/>
@@ -3627,10 +3644,10 @@
     <nd ref="-164404"/>
     <nd ref="-164401"/>
+    <tag k="amenity" v="telephone"/>
+    <tag k="name" v="telephone"/>
+  </way>
+  <node id="-164600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00240">
     <tag k="amenity" v="clock"/>
     <tag k="name" v="clock"/>
-  </way>
-  <node id="-164600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00240">
-    <tag k="amenity" v="emergency_phone"/>
-    <tag k="name" v="emergency_phone"/>
   </node>
   <node id="-164601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00236"/>
@@ -3644,10 +3661,10 @@
     <nd ref="-164604"/>
     <nd ref="-164601"/>
+    <tag k="amenity" v="clock"/>
+    <tag k="name" v="clock"/>
+  </way>
+  <node id="-164800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00240">
     <tag k="amenity" v="emergency_phone"/>
     <tag k="name" v="emergency_phone"/>
-  </way>
-  <node id="-164800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00240">
-    <tag k="amenity" v="toilets"/>
-    <tag k="name" v="toilets"/>
   </node>
   <node id="-164801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00236"/>
@@ -3661,10 +3678,10 @@
     <nd ref="-164804"/>
     <nd ref="-164801"/>
+    <tag k="amenity" v="emergency_phone"/>
+    <tag k="name" v="emergency_phone"/>
+  </way>
+  <node id="-165000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00240">
     <tag k="amenity" v="toilets"/>
     <tag k="name" v="toilets"/>
-  </way>
-  <node id="-165000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00240">
-    <tag k="amenity" v="recycling"/>
-    <tag k="name" v="recycling"/>
   </node>
   <node id="-165001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00236"/>
@@ -3678,10 +3695,10 @@
     <nd ref="-165004"/>
     <nd ref="-165001"/>
+    <tag k="amenity" v="toilets"/>
+    <tag k="name" v="toilets"/>
+  </way>
+  <node id="-165200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00240">
     <tag k="amenity" v="recycling"/>
     <tag k="name" v="recycling"/>
-  </way>
-  <node id="-165200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00240">
-    <tag k="amenity" v="waste_basket"/>
-    <tag k="name" v="waste_basket"/>
   </node>
   <node id="-165201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00236"/>
@@ -3695,10 +3712,10 @@
     <nd ref="-165204"/>
     <nd ref="-165201"/>
+    <tag k="amenity" v="recycling"/>
+    <tag k="name" v="recycling"/>
+  </way>
+  <node id="-165400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00240">
     <tag k="amenity" v="waste_basket"/>
     <tag k="name" v="waste_basket"/>
-  </way>
-  <node id="-165400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00240">
-    <tag k="amenity" v="public_building"/>
-    <tag k="name" v="public_building"/>
   </node>
   <node id="-165401" user="overview-creator" visible="true" lat="-0.00266" lon="0.00236"/>
@@ -3712,10 +3729,10 @@
     <nd ref="-165404"/>
     <nd ref="-165401"/>
+    <tag k="amenity" v="waste_basket"/>
+    <tag k="name" v="waste_basket"/>
+  </way>
+  <node id="-165600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00240">
     <tag k="amenity" v="public_building"/>
     <tag k="name" v="public_building"/>
-  </way>
-  <node id="-165600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00240">
-    <tag k="amenity" v="embassy"/>
-    <tag k="name" v="embassy"/>
   </node>
   <node id="-165601" user="overview-creator" visible="true" lat="-0.00276" lon="0.00236"/>
@@ -3729,10 +3746,10 @@
     <nd ref="-165604"/>
     <nd ref="-165601"/>
+    <tag k="amenity" v="public_building"/>
+    <tag k="name" v="public_building"/>
+  </way>
+  <node id="-165800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00240">
     <tag k="amenity" v="embassy"/>
     <tag k="name" v="embassy"/>
-  </way>
-  <node id="-165800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00240">
-    <tag k="amenity" v="townhall"/>
-    <tag k="name" v="townhall"/>
   </node>
   <node id="-165801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00236"/>
@@ -3746,10 +3763,10 @@
     <nd ref="-165804"/>
     <nd ref="-165801"/>
+    <tag k="amenity" v="embassy"/>
+    <tag k="name" v="embassy"/>
+  </way>
+  <node id="-166000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00240">
     <tag k="amenity" v="townhall"/>
     <tag k="name" v="townhall"/>
-  </way>
-  <node id="-166000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00240">
-    <tag k="amenity" v="community_centre"/>
-    <tag k="name" v="community_centre"/>
   </node>
   <node id="-166001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00236"/>
@@ -3763,10 +3780,10 @@
     <nd ref="-166004"/>
     <nd ref="-166001"/>
+    <tag k="amenity" v="townhall"/>
+    <tag k="name" v="townhall"/>
+  </way>
+  <node id="-166200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00240">
     <tag k="amenity" v="community_centre"/>
     <tag k="name" v="community_centre"/>
-  </way>
-  <node id="-166200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00240">
-    <tag k="amenity" v="drinking_water"/>
-    <tag k="name" v="drinking_water"/>
   </node>
   <node id="-166201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00236"/>
@@ -3780,10 +3797,10 @@
     <nd ref="-166204"/>
     <nd ref="-166201"/>
+    <tag k="amenity" v="community_centre"/>
+    <tag k="name" v="community_centre"/>
+  </way>
+  <node id="-166400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00240">
     <tag k="amenity" v="drinking_water"/>
     <tag k="name" v="drinking_water"/>
-  </way>
-  <node id="-166400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00240">
-    <tag k="amenity" v="fountain"/>
-    <tag k="name" v="fountain"/>
   </node>
   <node id="-166401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00236"/>
@@ -3797,10 +3814,10 @@
     <nd ref="-166404"/>
     <nd ref="-166401"/>
+    <tag k="amenity" v="drinking_water"/>
+    <tag k="name" v="drinking_water"/>
+  </way>
+  <node id="-166600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00240">
     <tag k="amenity" v="fountain"/>
     <tag k="name" v="fountain"/>
-  </way>
-  <node id="-166600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00240">
-    <tag k="amenity" v="place_of_worship"/>
-    <tag k="name" v="place_of_worship"/>
   </node>
   <node id="-166601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00236"/>
@@ -3814,10 +3831,10 @@
     <nd ref="-166604"/>
     <nd ref="-166601"/>
+    <tag k="amenity" v="fountain"/>
+    <tag k="name" v="fountain"/>
+  </way>
+  <node id="-166800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00240">
     <tag k="amenity" v="place_of_worship"/>
     <tag k="name" v="place_of_worship"/>
-  </way>
-  <node id="-166800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00240">
-    <tag k="amenity" v="grave_yard"/>
-    <tag k="name" v="grave_yard"/>
   </node>
   <node id="-166801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00236"/>
@@ -3831,10 +3848,10 @@
     <nd ref="-166804"/>
     <nd ref="-166801"/>
+    <tag k="amenity" v="place_of_worship"/>
+    <tag k="name" v="place_of_worship"/>
+  </way>
+  <node id="-167000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00240">
     <tag k="amenity" v="grave_yard"/>
     <tag k="name" v="grave_yard"/>
-  </way>
-  <node id="-167000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00240">
-    <tag k="amenity" v="crematorium"/>
-    <tag k="name" v="crematorium"/>
   </node>
   <node id="-167001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00236"/>
@@ -3848,10 +3865,10 @@
     <nd ref="-167004"/>
     <nd ref="-167001"/>
+    <tag k="amenity" v="grave_yard"/>
+    <tag k="name" v="grave_yard"/>
+  </way>
+  <node id="-167200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00240">
     <tag k="amenity" v="crematorium"/>
     <tag k="name" v="crematorium"/>
-  </way>
-  <node id="-167200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00240">
-    <tag k="amenity" v="post_office"/>
-    <tag k="name" v="post_office"/>
   </node>
   <node id="-167201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00236"/>
@@ -3865,10 +3882,10 @@
     <nd ref="-167204"/>
     <nd ref="-167201"/>
+    <tag k="amenity" v="crematorium"/>
+    <tag k="name" v="crematorium"/>
+  </way>
+  <node id="-167400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00240">
     <tag k="amenity" v="post_office"/>
     <tag k="name" v="post_office"/>
-  </way>
-  <node id="-167400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00240">
-    <tag k="amenity" v="post_box"/>
-    <tag k="name" v="post_box"/>
   </node>
   <node id="-167401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00236"/>
@@ -3882,10 +3899,10 @@
     <nd ref="-167404"/>
     <nd ref="-167401"/>
+    <tag k="amenity" v="post_office"/>
+    <tag k="name" v="post_office"/>
+  </way>
+  <node id="-167600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00240">
     <tag k="amenity" v="post_box"/>
     <tag k="name" v="post_box"/>
-  </way>
-  <node id="-167600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00240">
-    <tag k="amenity" v="school"/>
-    <tag k="name" v="school"/>
   </node>
   <node id="-167601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00236"/>
@@ -3899,10 +3916,10 @@
     <nd ref="-167604"/>
     <nd ref="-167601"/>
+    <tag k="amenity" v="post_box"/>
+    <tag k="name" v="post_box"/>
+  </way>
+  <node id="-167800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00240">
     <tag k="amenity" v="school"/>
     <tag k="name" v="school"/>
-  </way>
-  <node id="-167800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00240">
-    <tag k="amenity" v="university"/>
-    <tag k="name" v="university"/>
   </node>
   <node id="-167801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00236"/>
@@ -3916,10 +3933,10 @@
     <nd ref="-167804"/>
     <nd ref="-167801"/>
+    <tag k="amenity" v="school"/>
+    <tag k="name" v="school"/>
+  </way>
+  <node id="-168000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00240">
     <tag k="amenity" v="university"/>
     <tag k="name" v="university"/>
-  </way>
-  <node id="-168000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00240">
-    <tag k="amenity" v="college"/>
-    <tag k="name" v="college"/>
   </node>
   <node id="-168001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00236"/>
@@ -3933,10 +3950,10 @@
     <nd ref="-168004"/>
     <nd ref="-168001"/>
+    <tag k="amenity" v="university"/>
+    <tag k="name" v="university"/>
+  </way>
+  <node id="-168200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00240">
     <tag k="amenity" v="college"/>
     <tag k="name" v="college"/>
-  </way>
-  <node id="-168200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00240">
-    <tag k="amenity" v="kindergarten"/>
-    <tag k="name" v="kindergarten"/>
   </node>
   <node id="-168201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00236"/>
@@ -3950,10 +3967,10 @@
     <nd ref="-168204"/>
     <nd ref="-168201"/>
+    <tag k="amenity" v="college"/>
+    <tag k="name" v="college"/>
+  </way>
+  <node id="-185800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00270">
     <tag k="amenity" v="kindergarten"/>
     <tag k="name" v="kindergarten"/>
-  </way>
-  <node id="-185800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00270">
-    <tag k="amenity" v="driving_school"/>
-    <tag k="name" v="driving_school"/>
   </node>
   <node id="-185801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00266"/>
@@ -3967,10 +3984,10 @@
     <nd ref="-185804"/>
     <nd ref="-185801"/>
+    <tag k="amenity" v="kindergarten"/>
+    <tag k="name" v="kindergarten"/>
+  </way>
+  <node id="-186000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00270">
     <tag k="amenity" v="driving_school"/>
     <tag k="name" v="driving_school"/>
-  </way>
-  <node id="-186000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00270">
-    <tag k="amenity" v="pharmacy"/>
-    <tag k="name" v="pharmacy"/>
   </node>
   <node id="-186001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00266"/>
@@ -3984,10 +4001,10 @@
     <nd ref="-186004"/>
     <nd ref="-186001"/>
+    <tag k="amenity" v="driving_school"/>
+    <tag k="name" v="driving_school"/>
+  </way>
+  <node id="-186200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00270">
     <tag k="amenity" v="pharmacy"/>
     <tag k="name" v="pharmacy"/>
-  </way>
-  <node id="-186200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00270">
-    <tag k="amenity" v="hospital"/>
-    <tag k="name" v="hospital"/>
   </node>
   <node id="-186201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00266"/>
@@ -4001,10 +4018,10 @@
     <nd ref="-186204"/>
     <nd ref="-186201"/>
+    <tag k="amenity" v="pharmacy"/>
+    <tag k="name" v="pharmacy"/>
+  </way>
+  <node id="-186400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00270">
     <tag k="amenity" v="hospital"/>
     <tag k="name" v="hospital"/>
-  </way>
-  <node id="-186400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00270">
-    <tag k="amenity" v="nursery"/>
-    <tag k="name" v="nursery"/>
   </node>
   <node id="-186401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00266"/>
@@ -4018,10 +4035,10 @@
     <nd ref="-186404"/>
     <nd ref="-186401"/>
+    <tag k="amenity" v="hospital"/>
+    <tag k="name" v="hospital"/>
+  </way>
+  <node id="-186600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00270">
     <tag k="amenity" v="nursery"/>
     <tag k="name" v="nursery"/>
-  </way>
-  <node id="-186600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00270">
-    <tag k="amenity" v="baby_hatch"/>
-    <tag k="name" v="baby_hatch"/>
   </node>
   <node id="-186601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00266"/>
@@ -4035,10 +4052,10 @@
     <nd ref="-186604"/>
     <nd ref="-186601"/>
+    <tag k="amenity" v="nursery"/>
+    <tag k="name" v="nursery"/>
+  </way>
+  <node id="-186800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00270">
     <tag k="amenity" v="baby_hatch"/>
     <tag k="name" v="baby_hatch"/>
-  </way>
-  <node id="-186800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00270">
-    <tag k="amenity" v="doctors"/>
-    <tag k="name" v="doctors"/>
   </node>
   <node id="-186801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00266"/>
@@ -4052,10 +4069,10 @@
     <nd ref="-186804"/>
     <nd ref="-186801"/>
+    <tag k="amenity" v="baby_hatch"/>
+    <tag k="name" v="baby_hatch"/>
+  </way>
+  <node id="-187000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00270">
     <tag k="amenity" v="doctors"/>
     <tag k="name" v="doctors"/>
-  </way>
-  <node id="-187000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00270">
-    <tag k="amenity" v="dentist"/>
-    <tag k="name" v="dentist"/>
   </node>
   <node id="-187001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00266"/>
@@ -4069,10 +4086,10 @@
     <nd ref="-187004"/>
     <nd ref="-187001"/>
+    <tag k="amenity" v="doctors"/>
+    <tag k="name" v="doctors"/>
+  </way>
+  <node id="-187200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00270">
     <tag k="amenity" v="dentist"/>
     <tag k="name" v="dentist"/>
-  </way>
-  <node id="-187200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00270">
-    <tag k="amenity" v="veterinary"/>
-    <tag k="name" v="veterinary"/>
   </node>
   <node id="-187201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00266"/>
@@ -4086,10 +4103,10 @@
     <nd ref="-187204"/>
     <nd ref="-187201"/>
+    <tag k="amenity" v="dentist"/>
+    <tag k="name" v="dentist"/>
+  </way>
+  <node id="-187400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00270">
     <tag k="amenity" v="veterinary"/>
     <tag k="name" v="veterinary"/>
-  </way>
-  <node id="-187400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00270">
-    <tag k="amenity" v="library"/>
-    <tag k="name" v="library"/>
   </node>
   <node id="-187401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00266"/>
@@ -4103,10 +4120,10 @@
     <nd ref="-187404"/>
     <nd ref="-187401"/>
+    <tag k="amenity" v="veterinary"/>
+    <tag k="name" v="veterinary"/>
+  </way>
+  <node id="-187600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00270">
     <tag k="amenity" v="library"/>
     <tag k="name" v="library"/>
-  </way>
-  <node id="-187600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00270">
-    <tag k="amenity" v="police"/>
-    <tag k="name" v="police"/>
   </node>
   <node id="-187601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00266"/>
@@ -4120,10 +4137,10 @@
     <nd ref="-187604"/>
     <nd ref="-187601"/>
+    <tag k="amenity" v="library"/>
+    <tag k="name" v="library"/>
+  </way>
+  <node id="-187800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00270">
     <tag k="amenity" v="police"/>
     <tag k="name" v="police"/>
-  </way>
-  <node id="-187800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00270">
-    <tag k="amenity" v="fire_station"/>
-    <tag k="name" v="fire_station"/>
   </node>
   <node id="-187801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00266"/>
@@ -4137,10 +4154,10 @@
     <nd ref="-187804"/>
     <nd ref="-187801"/>
+    <tag k="amenity" v="police"/>
+    <tag k="name" v="police"/>
+  </way>
+  <node id="-188000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00270">
     <tag k="amenity" v="fire_station"/>
     <tag k="name" v="fire_station"/>
-  </way>
-  <node id="-188000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00270">
-    <tag k="amenity" v="bus_station"/>
-    <tag k="name" v="bus_station"/>
   </node>
   <node id="-188001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00266"/>
@@ -4154,10 +4171,10 @@
     <nd ref="-188004"/>
     <nd ref="-188001"/>
+    <tag k="amenity" v="fire_station"/>
+    <tag k="name" v="fire_station"/>
+  </way>
+  <node id="-188200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00270">
     <tag k="amenity" v="bus_station"/>
     <tag k="name" v="bus_station"/>
-  </way>
-  <node id="-188200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00270">
-    <tag k="amenity" v="ferry_terminal"/>
-    <tag k="name" v="ferry_terminal"/>
   </node>
   <node id="-188201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00266"/>
@@ -4171,10 +4188,10 @@
     <nd ref="-188204"/>
     <nd ref="-188201"/>
+    <tag k="amenity" v="bus_station"/>
+    <tag k="name" v="bus_station"/>
+  </way>
+  <node id="-205800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00300">
     <tag k="amenity" v="ferry_terminal"/>
     <tag k="name" v="ferry_terminal"/>
-  </way>
-  <node id="-205800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00300">
-    <tag k="amenity" v="theatre"/>
-    <tag k="name" v="theatre"/>
   </node>
   <node id="-205801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00296"/>
@@ -4188,10 +4205,10 @@
     <nd ref="-205804"/>
     <nd ref="-205801"/>
+    <tag k="amenity" v="ferry_terminal"/>
+    <tag k="name" v="ferry_terminal"/>
+  </way>
+  <node id="-206000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00300">
     <tag k="amenity" v="theatre"/>
     <tag k="name" v="theatre"/>
-  </way>
-  <node id="-206000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00300">
-    <tag k="amenity" v="cinema"/>
-    <tag k="name" v="cinema"/>
   </node>
   <node id="-206001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00296"/>
@@ -4205,10 +4222,10 @@
     <nd ref="-206004"/>
     <nd ref="-206001"/>
+    <tag k="amenity" v="theatre"/>
+    <tag k="name" v="theatre"/>
+  </way>
+  <node id="-206200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00300">
     <tag k="amenity" v="cinema"/>
     <tag k="name" v="cinema"/>
-  </way>
-  <node id="-206200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00300">
-    <tag k="amenity" v="arts_centre"/>
-    <tag k="name" v="arts_centre"/>
   </node>
   <node id="-206201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00296"/>
@@ -4222,10 +4239,10 @@
     <nd ref="-206204"/>
     <nd ref="-206201"/>
+    <tag k="amenity" v="cinema"/>
+    <tag k="name" v="cinema"/>
+  </way>
+  <node id="-206400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00300">
     <tag k="amenity" v="arts_centre"/>
     <tag k="name" v="arts_centre"/>
-  </way>
-  <node id="-206400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00300">
-    <tag k="amenity" v="courthouse"/>
-    <tag k="name" v="courthouse"/>
   </node>
   <node id="-206401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00296"/>
@@ -4239,10 +4256,10 @@
     <nd ref="-206404"/>
     <nd ref="-206401"/>
+    <tag k="amenity" v="arts_centre"/>
+    <tag k="name" v="arts_centre"/>
+  </way>
+  <node id="-206600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00300">
     <tag k="amenity" v="courthouse"/>
     <tag k="name" v="courthouse"/>
-  </way>
-  <node id="-206600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00300">
-    <tag k="amenity" v="prison"/>
-    <tag k="name" v="prison"/>
   </node>
   <node id="-206601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00296"/>
@@ -4256,10 +4273,10 @@
     <nd ref="-206604"/>
     <nd ref="-206601"/>
+    <tag k="amenity" v="courthouse"/>
+    <tag k="name" v="courthouse"/>
+  </way>
+  <node id="-206800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00300">
     <tag k="amenity" v="prison"/>
     <tag k="name" v="prison"/>
-  </way>
-  <node id="-206800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00300">
-    <tag k="amenity" v="bank"/>
-    <tag k="name" v="bank"/>
   </node>
   <node id="-206801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00296"/>
@@ -4273,10 +4290,10 @@
     <nd ref="-206804"/>
     <nd ref="-206801"/>
+    <tag k="amenity" v="prison"/>
+    <tag k="name" v="prison"/>
+  </way>
+  <node id="-207000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00300">
     <tag k="amenity" v="bank"/>
     <tag k="name" v="bank"/>
-  </way>
-  <node id="-207000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00300">
-    <tag k="amenity" v="bureau_de_change"/>
-    <tag k="name" v="bureau_de_change"/>
   </node>
   <node id="-207001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00296"/>
@@ -4290,10 +4307,10 @@
     <nd ref="-207004"/>
     <nd ref="-207001"/>
+    <tag k="amenity" v="bank"/>
+    <tag k="name" v="bank"/>
+  </way>
+  <node id="-207200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00300">
     <tag k="amenity" v="bureau_de_change"/>
     <tag k="name" v="bureau_de_change"/>
-  </way>
-  <node id="-207200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00300">
-    <tag k="amenity" v="atm"/>
-    <tag k="name" v="atm"/>
   </node>
   <node id="-207201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00296"/>
@@ -4307,10 +4324,10 @@
     <nd ref="-207204"/>
     <nd ref="-207201"/>
+    <tag k="amenity" v="bureau_de_change"/>
+    <tag k="name" v="bureau_de_change"/>
+  </way>
+  <node id="-207400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00300">
     <tag k="amenity" v="atm"/>
     <tag k="name" v="atm"/>
-  </way>
-  <node id="-207400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00300">
-    <tag k="amenity" v="bench"/>
-    <tag k="name" v="bench"/>
   </node>
   <node id="-207401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00296"/>
@@ -4324,10 +4341,10 @@
     <nd ref="-207404"/>
     <nd ref="-207401"/>
+    <tag k="amenity" v="atm"/>
+    <tag k="name" v="atm"/>
+  </way>
+  <node id="-207600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00300">
     <tag k="amenity" v="bench"/>
     <tag k="name" v="bench"/>
-  </way>
-  <node id="-207600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00300">
-    <tag k="amenity" v="bbq"/>
-    <tag k="name" v="bbq"/>
   </node>
   <node id="-207601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00296"/>
@@ -4341,10 +4358,10 @@
     <nd ref="-207604"/>
     <nd ref="-207601"/>
+    <tag k="amenity" v="bench"/>
+    <tag k="name" v="bench"/>
+  </way>
+  <node id="-207800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00300">
     <tag k="amenity" v="bbq"/>
     <tag k="name" v="bbq"/>
-  </way>
-  <node id="-207800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00300">
-    <tag k="amenity" v="shelter"/>
-    <tag k="name" v="shelter"/>
   </node>
   <node id="-207801" user="overview-creator" visible="true" lat="-0.00386" lon="0.00296"/>
@@ -4358,10 +4375,10 @@
     <nd ref="-207804"/>
     <nd ref="-207801"/>
+    <tag k="amenity" v="bbq"/>
+    <tag k="name" v="bbq"/>
+  </way>
+  <node id="-208000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00300">
     <tag k="amenity" v="shelter"/>
     <tag k="name" v="shelter"/>
-  </way>
-  <node id="-208000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00300">
-    <tag k="amenity" v="hunting_stand"/>
-    <tag k="name" v="hunting_stand"/>
   </node>
   <node id="-208001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00296"/>
@@ -4375,10 +4392,10 @@
     <nd ref="-208004"/>
     <nd ref="-208001"/>
+    <tag k="amenity" v="shelter"/>
+    <tag k="name" v="shelter"/>
+  </way>
+  <node id="-208200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00300">
     <tag k="amenity" v="hunting_stand"/>
     <tag k="name" v="hunting_stand"/>
-  </way>
-  <node id="-208200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00300">
-    <tag k="amenity" v="marketplace"/>
-    <tag k="name" v="marketplace"/>
   </node>
   <node id="-208201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00296"/>
@@ -4392,10 +4409,10 @@
     <nd ref="-208204"/>
     <nd ref="-208201"/>
+    <tag k="amenity" v="hunting_stand"/>
+    <tag k="name" v="hunting_stand"/>
+  </way>
+  <node id="-225800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00330">
     <tag k="amenity" v="marketplace"/>
     <tag k="name" v="marketplace"/>
-  </way>
-  <node id="-225800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00330">
-    <tag k="amenity" v="wlan"/>
-    <tag k="name" v="wlan"/>
   </node>
   <node id="-225801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00326"/>
@@ -4409,10 +4426,10 @@
     <nd ref="-225804"/>
     <nd ref="-225801"/>
+    <tag k="amenity" v="marketplace"/>
+    <tag k="name" v="marketplace"/>
+  </way>
+  <node id="-226000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00330">
     <tag k="amenity" v="wlan"/>
     <tag k="name" v="wlan"/>
-  </way>
-  <node id="-226000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00330">
-    <tag k="amenity" v="vending_machine"/>
-    <tag k="name" v="vending_machine"/>
   </node>
   <node id="-226001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00326"/>
@@ -4426,4 +4443,21 @@
     <nd ref="-226004"/>
     <nd ref="-226001"/>
+    <tag k="amenity" v="wlan"/>
+    <tag k="name" v="wlan"/>
+  </way>
+  <node id="-226200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00330">
+    <tag k="amenity" v="vending_machine"/>
+    <tag k="name" v="vending_machine"/>
+  </node>
+  <node id="-226201" user="overview-creator" visible="true" lat="-0.00306" lon="0.00326"/>
+  <node id="-226202" user="overview-creator" visible="true" lat="-0.00306" lon="0.00354"/>
+  <node id="-226203" user="overview-creator" visible="true" lat="-0.00314" lon="0.00354"/>
+  <node id="-226204" user="overview-creator" visible="true" lat="-0.00314" lon="0.00326"/>
+  <way id="-226204" user="overview-creator" visible="true">
+    <nd ref="-226201"/>
+    <nd ref="-226202"/>
+    <nd ref="-226203"/>
+    <nd ref="-226204"/>
+    <nd ref="-226201"/>
     <tag k="amenity" v="vending_machine"/>
     <tag k="name" v="vending_machine"/>
@@ -5036,73 +5070,73 @@
     <tag k="name" v="zoroastrian"/>
   </way>
-  <node id="-203200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00300">
+  <node id="-226600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00330">
     <tag k="tourism" v="information"/>
     <tag k="name" v="information"/>
   </node>
-  <node id="-203400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00300">
+  <node id="-226800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00330">
     <tag k="information" v="guidepost"/>
     <tag k="name" v="guidepost"/>
   </node>
-  <node id="-203401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00296"/>
-  <node id="-203402" user="overview-creator" visible="true" lat="-0.00166" lon="0.00324"/>
-  <node id="-203403" user="overview-creator" visible="true" lat="-0.00174" lon="0.00324"/>
-  <node id="-203404" user="overview-creator" visible="true" lat="-0.00174" lon="0.00296"/>
-  <way id="-203404" user="overview-creator" visible="true">
-    <nd ref="-203401"/>
-    <nd ref="-203402"/>
-    <nd ref="-203403"/>
-    <nd ref="-203404"/>
-    <nd ref="-203401"/>
+  <node id="-226801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00326"/>
+  <node id="-226802" user="overview-creator" visible="true" lat="-0.00336" lon="0.00354"/>
+  <node id="-226803" user="overview-creator" visible="true" lat="-0.00344" lon="0.00354"/>
+  <node id="-226804" user="overview-creator" visible="true" lat="-0.00344" lon="0.00326"/>
+  <way id="-226804" user="overview-creator" visible="true">
+    <nd ref="-226801"/>
+    <nd ref="-226802"/>
+    <nd ref="-226803"/>
+    <nd ref="-226804"/>
+    <nd ref="-226801"/>
     <tag k="information" v="guidepost"/>
     <tag k="name" v="guidepost"/>
   </way>
-  <node id="-203600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00300">
+  <node id="-227000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00330">
     <tag k="information" v="office"/>
     <tag k="name" v="office"/>
   </node>
-  <node id="-203601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00296"/>
-  <node id="-203602" user="overview-creator" visible="true" lat="-0.00176" lon="0.00324"/>
-  <node id="-203603" user="overview-creator" visible="true" lat="-0.00184" lon="0.00324"/>
-  <node id="-203604" user="overview-creator" visible="true" lat="-0.00184" lon="0.00296"/>
-  <way id="-203604" user="overview-creator" visible="true">
-    <nd ref="-203601"/>
-    <nd ref="-203602"/>
-    <nd ref="-203603"/>
-    <nd ref="-203604"/>
-    <nd ref="-203601"/>
+  <node id="-227001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00326"/>
+  <node id="-227002" user="overview-creator" visible="true" lat="-0.00346" lon="0.00354"/>
+  <node id="-227003" user="overview-creator" visible="true" lat="-0.00354" lon="0.00354"/>
+  <node id="-227004" user="overview-creator" visible="true" lat="-0.00354" lon="0.00326"/>
+  <way id="-227004" user="overview-creator" visible="true">
+    <nd ref="-227001"/>
+    <nd ref="-227002"/>
+    <nd ref="-227003"/>
+    <nd ref="-227004"/>
+    <nd ref="-227001"/>
     <tag k="information" v="office"/>
     <tag k="name" v="office"/>
   </way>
-  <node id="-203800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00300">
+  <node id="-227200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00330">
     <tag k="information" v="map"/>
     <tag k="name" v="map"/>
   </node>
-  <node id="-203801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00296"/>
-  <node id="-203802" user="overview-creator" visible="true" lat="-0.00186" lon="0.00324"/>
-  <node id="-203803" user="overview-creator" visible="true" lat="-0.00194" lon="0.00324"/>
-  <node id="-203804" user="overview-creator" visible="true" lat="-0.00194" lon="0.00296"/>
-  <way id="-203804" user="overview-creator" visible="true">
-    <nd ref="-203801"/>
-    <nd ref="-203802"/>
-    <nd ref="-203803"/>
-    <nd ref="-203804"/>
-    <nd ref="-203801"/>
+  <node id="-227201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00326"/>
+  <node id="-227202" user="overview-creator" visible="true" lat="-0.00356" lon="0.00354"/>
+  <node id="-227203" user="overview-creator" visible="true" lat="-0.00364" lon="0.00354"/>
+  <node id="-227204" user="overview-creator" visible="true" lat="-0.00364" lon="0.00326"/>
+  <way id="-227204" user="overview-creator" visible="true">
+    <nd ref="-227201"/>
+    <nd ref="-227202"/>
+    <nd ref="-227203"/>
+    <nd ref="-227204"/>
+    <nd ref="-227201"/>
     <tag k="information" v="map"/>
     <tag k="name" v="map"/>
   </way>
-  <node id="-204000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00300">
+  <node id="-227400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00330">
     <tag k="information" v="board"/>
     <tag k="name" v="board"/>
   </node>
-  <node id="-204001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00296"/>
-  <node id="-204002" user="overview-creator" visible="true" lat="-0.00196" lon="0.00324"/>
-  <node id="-204003" user="overview-creator" visible="true" lat="-0.00204" lon="0.00324"/>
-  <node id="-204004" user="overview-creator" visible="true" lat="-0.00204" lon="0.00296"/>
-  <way id="-204004" user="overview-creator" visible="true">
-    <nd ref="-204001"/>
-    <nd ref="-204002"/>
-    <nd ref="-204003"/>
-    <nd ref="-204004"/>
-    <nd ref="-204001"/>
+  <node id="-227401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00326"/>
+  <node id="-227402" user="overview-creator" visible="true" lat="-0.00366" lon="0.00354"/>
+  <node id="-227403" user="overview-creator" visible="true" lat="-0.00374" lon="0.00354"/>
+  <node id="-227404" user="overview-creator" visible="true" lat="-0.00374" lon="0.00326"/>
+  <way id="-227404" user="overview-creator" visible="true">
+    <nd ref="-227401"/>
+    <nd ref="-227402"/>
+    <nd ref="-227403"/>
+    <nd ref="-227404"/>
+    <nd ref="-227401"/>
     <tag k="information" v="board"/>
     <tag k="name" v="board"/>
@@ -5384,11 +5418,185 @@
     <tag k="name" v="works"/>
   </way>
-  <node id="-224600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00330">
+  <node id="-204000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00300">
     <tag k="tourism" v="information"/>
     <tag k="name" v="power"/>
   </node>
-  <node id="-224800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00330">
+  <node id="-204200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00300">
     <tag k="power" v="tower"/>
     <tag k="name" v="tower"/>
+  </node>
+  <node id="-204201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00296"/>
+  <node id="-204202" user="overview-creator" visible="true" lat="-0.00206" lon="0.00324"/>
+  <node id="-204203" user="overview-creator" visible="true" lat="-0.00214" lon="0.00324"/>
+  <node id="-204204" user="overview-creator" visible="true" lat="-0.00214" lon="0.00296"/>
+  <way id="-204204" user="overview-creator" visible="true">
+    <nd ref="-204201"/>
+    <nd ref="-204202"/>
+    <nd ref="-204203"/>
+    <nd ref="-204204"/>
+    <nd ref="-204201"/>
+    <tag k="power" v="tower"/>
+    <tag k="name" v="tower"/>
+  </way>
+  <node id="-204400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00300">
+    <tag k="power" v="pole"/>
+    <tag k="name" v="pole"/>
+  </node>
+  <node id="-204401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00296"/>
+  <node id="-204402" user="overview-creator" visible="true" lat="-0.00216" lon="0.00324"/>
+  <node id="-204403" user="overview-creator" visible="true" lat="-0.00224" lon="0.00324"/>
+  <node id="-204404" user="overview-creator" visible="true" lat="-0.00224" lon="0.00296"/>
+  <way id="-204404" user="overview-creator" visible="true">
+    <nd ref="-204401"/>
+    <nd ref="-204402"/>
+    <nd ref="-204403"/>
+    <nd ref="-204404"/>
+    <nd ref="-204401"/>
+    <tag k="power" v="pole"/>
+    <tag k="name" v="pole"/>
+  </way>
+  <node id="-204600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00300">
+    <tag k="power" v="line"/>
+    <tag k="name" v="line"/>
+  </node>
+  <node id="-204601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00296"/>
+  <node id="-204602" user="overview-creator" visible="true" lat="-0.00226" lon="0.00324"/>
+  <node id="-204603" user="overview-creator" visible="true" lat="-0.00234" lon="0.00324"/>
+  <node id="-204604" user="overview-creator" visible="true" lat="-0.00234" lon="0.00296"/>
+  <way id="-204604" user="overview-creator" visible="true">
+    <nd ref="-204601"/>
+    <nd ref="-204602"/>
+    <nd ref="-204603"/>
+    <nd ref="-204604"/>
+    <nd ref="-204601"/>
+    <tag k="power" v="line"/>
+    <tag k="name" v="line"/>
+  </way>
+  <node id="-204800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00300">
+    <tag k="power" v="minor_line"/>
+    <tag k="name" v="minor_line"/>
+  </node>
+  <node id="-204801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00296"/>
+  <node id="-204802" user="overview-creator" visible="true" lat="-0.00236" lon="0.00324"/>
+  <node id="-204803" user="overview-creator" visible="true" lat="-0.00244" lon="0.00324"/>
+  <node id="-204804" user="overview-creator" visible="true" lat="-0.00244" lon="0.00296"/>
+  <way id="-204804" user="overview-creator" visible="true">
+    <nd ref="-204801"/>
+    <nd ref="-204802"/>
+    <nd ref="-204803"/>
+    <nd ref="-204804"/>
+    <nd ref="-204801"/>
+    <tag k="power" v="minor_line"/>
+    <tag k="name" v="minor_line"/>
+  </way>
+  <node id="-205000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00300">
+    <tag k="power" v="station"/>
+    <tag k="name" v="station"/>
+  </node>
+  <node id="-205001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00296"/>
+  <node id="-205002" user="overview-creator" visible="true" lat="-0.00246" lon="0.00324"/>
+  <node id="-205003" user="overview-creator" visible="true" lat="-0.00254" lon="0.00324"/>
+  <node id="-205004" user="overview-creator" visible="true" lat="-0.00254" lon="0.00296"/>
+  <way id="-205004" user="overview-creator" visible="true">
+    <nd ref="-205001"/>
+    <nd ref="-205002"/>
+    <nd ref="-205003"/>
+    <nd ref="-205004"/>
+    <nd ref="-205001"/>
+    <tag k="power" v="station"/>
+    <tag k="name" v="station"/>
+  </way>
+  <node id="-205200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00300">
+    <tag k="power" v="sub_station"/>
+    <tag k="name" v="sub_station"/>
+  </node>
+  <node id="-205201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00296"/>
+  <node id="-205202" user="overview-creator" visible="true" lat="-0.00256" lon="0.00324"/>
+  <node id="-205203" user="overview-creator" visible="true" lat="-0.00264" lon="0.00324"/>
+  <node id="-205204" user="overview-creator" visible="true" lat="-0.00264" lon="0.00296"/>
+  <way id="-205204" user="overview-creator" visible="true">
+    <nd ref="-205201"/>
+    <nd ref="-205202"/>
+    <nd ref="-205203"/>
+    <nd ref="-205204"/>
+    <nd ref="-205201"/>
+    <tag k="power" v="sub_station"/>
+    <tag k="name" v="sub_station"/>
+  </way>
+  <node id="-205400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00300">
+    <tag k="power" v="generator"/>
+    <tag k="name" v="generator"/>
+  </node>
+  <node id="-205401" user="overview-creator" visible="true" lat="-0.00266" lon="0.00296"/>
+  <node id="-205402" user="overview-creator" visible="true" lat="-0.00266" lon="0.00324"/>
+  <node id="-205403" user="overview-creator" visible="true" lat="-0.00274" lon="0.00324"/>
+  <node id="-205404" user="overview-creator" visible="true" lat="-0.00274" lon="0.00296"/>
+  <way id="-205404" user="overview-creator" visible="true">
+    <nd ref="-205401"/>
+    <nd ref="-205402"/>
+    <nd ref="-205403"/>
+    <nd ref="-205404"/>
+    <nd ref="-205401"/>
+    <tag k="power" v="generator"/>
+    <tag k="name" v="generator"/>
+  </way>
+  <node id="-224000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00330">
+    <tag k="tourism" v="information"/>
+    <tag k="name" v="power_source"/>
+  </node>
+  <node id="-224200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00330">
+    <tag k="power_source" v="wind"/>
+    <tag k="name" v="wind"/>
+  </node>
+  <node id="-224201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00326"/>
+  <node id="-224202" user="overview-creator" visible="true" lat="-0.00206" lon="0.00354"/>
+  <node id="-224203" user="overview-creator" visible="true" lat="-0.00214" lon="0.00354"/>
+  <node id="-224204" user="overview-creator" visible="true" lat="-0.00214" lon="0.00326"/>
+  <way id="-224204" user="overview-creator" visible="true">
+    <nd ref="-224201"/>
+    <nd ref="-224202"/>
+    <nd ref="-224203"/>
+    <nd ref="-224204"/>
+    <nd ref="-224201"/>
+    <tag k="power_source" v="wind"/>
+    <tag k="name" v="wind"/>
+  </way>
+  <node id="-224400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00330">
+    <tag k="power_source" v="hydro"/>
+    <tag k="name" v="hydro"/>
+  </node>
+  <node id="-224401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00326"/>
+  <node id="-224402" user="overview-creator" visible="true" lat="-0.00216" lon="0.00354"/>
+  <node id="-224403" user="overview-creator" visible="true" lat="-0.00224" lon="0.00354"/>
+  <node id="-224404" user="overview-creator" visible="true" lat="-0.00224" lon="0.00326"/>
+  <way id="-224404" user="overview-creator" visible="true">
+    <nd ref="-224401"/>
+    <nd ref="-224402"/>
+    <nd ref="-224403"/>
+    <nd ref="-224404"/>
+    <nd ref="-224401"/>
+    <tag k="power_source" v="hydro"/>
+    <tag k="name" v="hydro"/>
+  </way>
+  <node id="-224600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00330">
+    <tag k="power_source" v="fossil"/>
+    <tag k="name" v="fossil"/>
+  </node>
+  <node id="-224601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00326"/>
+  <node id="-224602" user="overview-creator" visible="true" lat="-0.00226" lon="0.00354"/>
+  <node id="-224603" user="overview-creator" visible="true" lat="-0.00234" lon="0.00354"/>
+  <node id="-224604" user="overview-creator" visible="true" lat="-0.00234" lon="0.00326"/>
+  <way id="-224604" user="overview-creator" visible="true">
+    <nd ref="-224601"/>
+    <nd ref="-224602"/>
+    <nd ref="-224603"/>
+    <nd ref="-224604"/>
+    <nd ref="-224601"/>
+    <tag k="power_source" v="fossil"/>
+    <tag k="name" v="fossil"/>
+  </way>
+  <node id="-224800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00330">
+    <tag k="power_source" v="coal"/>
+    <tag k="name" v="coal"/>
   </node>
   <node id="-224801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00326"/>
@@ -5402,10 +5610,10 @@
     <nd ref="-224804"/>
     <nd ref="-224801"/>
-    <tag k="power" v="tower"/>
-    <tag k="name" v="tower"/>
+    <tag k="power_source" v="coal"/>
+    <tag k="name" v="coal"/>
   </way>
   <node id="-225000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00330">
-    <tag k="power" v="pole"/>
-    <tag k="name" v="pole"/>
+    <tag k="power_source" v="gas"/>
+    <tag k="name" v="gas"/>
   </node>
   <node id="-225001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00326"/>
@@ -5419,10 +5627,10 @@
     <nd ref="-225004"/>
     <nd ref="-225001"/>
-    <tag k="power" v="pole"/>
-    <tag k="name" v="pole"/>
+    <tag k="power_source" v="gas"/>
+    <tag k="name" v="gas"/>
   </way>
   <node id="-225200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00330">
-    <tag k="power" v="line"/>
-    <tag k="name" v="line"/>
+    <tag k="power_source" v="photovoltaic"/>
+    <tag k="name" v="photovoltaic"/>
   </node>
   <node id="-225201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00326"/>
@@ -5436,10 +5644,10 @@
     <nd ref="-225204"/>
     <nd ref="-225201"/>
-    <tag k="power" v="line"/>
-    <tag k="name" v="line"/>
+    <tag k="power_source" v="photovoltaic"/>
+    <tag k="name" v="photovoltaic"/>
   </way>
   <node id="-225400" user="overview-creator" visible="true" lat="-0.00270" lon="0.00330">
-    <tag k="power" v="minor_line"/>
-    <tag k="name" v="minor_line"/>
+    <tag k="power_source" v="nuclear"/>
+    <tag k="name" v="nuclear"/>
   </node>
   <node id="-225401" user="overview-creator" visible="true" lat="-0.00266" lon="0.00326"/>
@@ -5453,199 +5661,25 @@
     <nd ref="-225404"/>
     <nd ref="-225401"/>
-    <tag k="power" v="minor_line"/>
-    <tag k="name" v="minor_line"/>
-  </way>
-  <node id="-225600" user="overview-creator" visible="true" lat="-0.00280" lon="0.00330">
-    <tag k="power" v="station"/>
-    <tag k="name" v="station"/>
-  </node>
-  <node id="-225601" user="overview-creator" visible="true" lat="-0.00276" lon="0.00326"/>
-  <node id="-225602" user="overview-creator" visible="true" lat="-0.00276" lon="0.00354"/>
-  <node id="-225603" user="overview-creator" visible="true" lat="-0.00284" lon="0.00354"/>
-  <node id="-225604" user="overview-creator" visible="true" lat="-0.00284" lon="0.00326"/>
-  <way id="-225604" user="overview-creator" visible="true">
-    <nd ref="-225601"/>
-    <nd ref="-225602"/>
-    <nd ref="-225603"/>
-    <nd ref="-225604"/>
-    <nd ref="-225601"/>
-    <tag k="power" v="station"/>
-    <tag k="name" v="station"/>
-  </way>
-  <node id="-225800" user="overview-creator" visible="true" lat="-0.00290" lon="0.00330">
-    <tag k="power" v="sub_station"/>
-    <tag k="name" v="sub_station"/>
-  </node>
-  <node id="-225801" user="overview-creator" visible="true" lat="-0.00286" lon="0.00326"/>
-  <node id="-225802" user="overview-creator" visible="true" lat="-0.00286" lon="0.00354"/>
-  <node id="-225803" user="overview-creator" visible="true" lat="-0.00294" lon="0.00354"/>
-  <node id="-225804" user="overview-creator" visible="true" lat="-0.00294" lon="0.00326"/>
-  <way id="-225804" user="overview-creator" visible="true">
-    <nd ref="-225801"/>
-    <nd ref="-225802"/>
-    <nd ref="-225803"/>
-    <nd ref="-225804"/>
-    <nd ref="-225801"/>
-    <tag k="power" v="sub_station"/>
-    <tag k="name" v="sub_station"/>
-  </way>
-  <node id="-226000" user="overview-creator" visible="true" lat="-0.00300" lon="0.00330">
-    <tag k="power" v="generator"/>
-    <tag k="name" v="generator"/>
-  </node>
-  <node id="-226001" user="overview-creator" visible="true" lat="-0.00296" lon="0.00326"/>
-  <node id="-226002" user="overview-creator" visible="true" lat="-0.00296" lon="0.00354"/>
-  <node id="-226003" user="overview-creator" visible="true" lat="-0.00304" lon="0.00354"/>
-  <node id="-226004" user="overview-creator" visible="true" lat="-0.00304" lon="0.00326"/>
-  <way id="-226004" user="overview-creator" visible="true">
-    <nd ref="-226001"/>
-    <nd ref="-226002"/>
-    <nd ref="-226003"/>
-    <nd ref="-226004"/>
-    <nd ref="-226001"/>
-    <tag k="power" v="generator"/>
-    <tag k="name" v="generator"/>
-  </way>
-  <node id="-226200" user="overview-creator" visible="true" lat="-0.00310" lon="0.00330">
-    <tag k="tourism" v="information"/>
-    <tag k="name" v="power_source"/>
-  </node>
-  <node id="-226400" user="overview-creator" visible="true" lat="-0.00320" lon="0.00330">
-    <tag k="power_source" v="wind"/>
-    <tag k="name" v="wind"/>
-  </node>
-  <node id="-226401" user="overview-creator" visible="true" lat="-0.00316" lon="0.00326"/>
-  <node id="-226402" user="overview-creator" visible="true" lat="-0.00316" lon="0.00354"/>
-  <node id="-226403" user="overview-creator" visible="true" lat="-0.00324" lon="0.00354"/>
-  <node id="-226404" user="overview-creator" visible="true" lat="-0.00324" lon="0.00326"/>
-  <way id="-226404" user="overview-creator" visible="true">
-    <nd ref="-226401"/>
-    <nd ref="-226402"/>
-    <nd ref="-226403"/>
-    <nd ref="-226404"/>
-    <nd ref="-226401"/>
-    <tag k="power_source" v="wind"/>
-    <tag k="name" v="wind"/>
-  </way>
-  <node id="-226600" user="overview-creator" visible="true" lat="-0.00330" lon="0.00330">
-    <tag k="power_source" v="hydro"/>
-    <tag k="name" v="hydro"/>
-  </node>
-  <node id="-226601" user="overview-creator" visible="true" lat="-0.00326" lon="0.00326"/>
-  <node id="-226602" user="overview-creator" visible="true" lat="-0.00326" lon="0.00354"/>
-  <node id="-226603" user="overview-creator" visible="true" lat="-0.00334" lon="0.00354"/>
-  <node id="-226604" user="overview-creator" visible="true" lat="-0.00334" lon="0.00326"/>
-  <way id="-226604" user="overview-creator" visible="true">
-    <nd ref="-226601"/>
-    <nd ref="-226602"/>
-    <nd ref="-226603"/>
-    <nd ref="-226604"/>
-    <nd ref="-226601"/>
-    <tag k="power_source" v="hydro"/>
-    <tag k="name" v="hydro"/>
-  </way>
-  <node id="-226800" user="overview-creator" visible="true" lat="-0.00340" lon="0.00330">
-    <tag k="power_source" v="fossil"/>
-    <tag k="name" v="fossil"/>
-  </node>
-  <node id="-226801" user="overview-creator" visible="true" lat="-0.00336" lon="0.00326"/>
-  <node id="-226802" user="overview-creator" visible="true" lat="-0.00336" lon="0.00354"/>
-  <node id="-226803" user="overview-creator" visible="true" lat="-0.00344" lon="0.00354"/>
-  <node id="-226804" user="overview-creator" visible="true" lat="-0.00344" lon="0.00326"/>
-  <way id="-226804" user="overview-creator" visible="true">
-    <nd ref="-226801"/>
-    <nd ref="-226802"/>
-    <nd ref="-226803"/>
-    <nd ref="-226804"/>
-    <nd ref="-226801"/>
-    <tag k="power_source" v="fossil"/>
-    <tag k="name" v="fossil"/>
-  </way>
-  <node id="-227000" user="overview-creator" visible="true" lat="-0.00350" lon="0.00330">
-    <tag k="power_source" v="coal"/>
-    <tag k="name" v="coal"/>
-  </node>
-  <node id="-227001" user="overview-creator" visible="true" lat="-0.00346" lon="0.00326"/>
-  <node id="-227002" user="overview-creator" visible="true" lat="-0.00346" lon="0.00354"/>
-  <node id="-227003" user="overview-creator" visible="true" lat="-0.00354" lon="0.00354"/>
-  <node id="-227004" user="overview-creator" visible="true" lat="-0.00354" lon="0.00326"/>
-  <way id="-227004" user="overview-creator" visible="true">
-    <nd ref="-227001"/>
-    <nd ref="-227002"/>
-    <nd ref="-227003"/>
-    <nd ref="-227004"/>
-    <nd ref="-227001"/>
-    <tag k="power_source" v="coal"/>
-    <tag k="name" v="coal"/>
-  </way>
-  <node id="-227200" user="overview-creator" visible="true" lat="-0.00360" lon="0.00330">
-    <tag k="power_source" v="gas"/>
-    <tag k="name" v="gas"/>
-  </node>
-  <node id="-227201" user="overview-creator" visible="true" lat="-0.00356" lon="0.00326"/>
-  <node id="-227202" user="overview-creator" visible="true" lat="-0.00356" lon="0.00354"/>
-  <node id="-227203" user="overview-creator" visible="true" lat="-0.00364" lon="0.00354"/>
-  <node id="-227204" user="overview-creator" visible="true" lat="-0.00364" lon="0.00326"/>
-  <way id="-227204" user="overview-creator" visible="true">
-    <nd ref="-227201"/>
-    <nd ref="-227202"/>
-    <nd ref="-227203"/>
-    <nd ref="-227204"/>
-    <nd ref="-227201"/>
-    <tag k="power_source" v="gas"/>
-    <tag k="name" v="gas"/>
-  </way>
-  <node id="-227400" user="overview-creator" visible="true" lat="-0.00370" lon="0.00330">
-    <tag k="power_source" v="photovoltaic"/>
-    <tag k="name" v="photovoltaic"/>
-  </node>
-  <node id="-227401" user="overview-creator" visible="true" lat="-0.00366" lon="0.00326"/>
-  <node id="-227402" user="overview-creator" visible="true" lat="-0.00366" lon="0.00354"/>
-  <node id="-227403" user="overview-creator" visible="true" lat="-0.00374" lon="0.00354"/>
-  <node id="-227404" user="overview-creator" visible="true" lat="-0.00374" lon="0.00326"/>
-  <way id="-227404" user="overview-creator" visible="true">
-    <nd ref="-227401"/>
-    <nd ref="-227402"/>
-    <nd ref="-227403"/>
-    <nd ref="-227404"/>
-    <nd ref="-227401"/>
-    <tag k="power_source" v="photovoltaic"/>
-    <tag k="name" v="photovoltaic"/>
-  </way>
-  <node id="-227600" user="overview-creator" visible="true" lat="-0.00380" lon="0.00330">
     <tag k="power_source" v="nuclear"/>
     <tag k="name" v="nuclear"/>
-  </node>
-  <node id="-227601" user="overview-creator" visible="true" lat="-0.00376" lon="0.00326"/>
-  <node id="-227602" user="overview-creator" visible="true" lat="-0.00376" lon="0.00354"/>
-  <node id="-227603" user="overview-creator" visible="true" lat="-0.00384" lon="0.00354"/>
-  <node id="-227604" user="overview-creator" visible="true" lat="-0.00384" lon="0.00326"/>
-  <way id="-227604" user="overview-creator" visible="true">
-    <nd ref="-227601"/>
-    <nd ref="-227602"/>
-    <nd ref="-227603"/>
-    <nd ref="-227604"/>
-    <nd ref="-227601"/>
-    <tag k="power_source" v="nuclear"/>
-    <tag k="name" v="nuclear"/>
-  </way>
-  <node id="-227800" user="overview-creator" visible="true" lat="-0.00390" lon="0.00330">
+  </way>
+  <node id="-228000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00330">
     <tag k="tourism" v="information"/>
     <tag k="name" v="vending"/>
   </node>
-  <node id="-228000" user="overview-creator" visible="true" lat="-0.00400" lon="0.00330">
+  <node id="-228200" user="overview-creator" visible="true" lat="-0.00410" lon="0.00330">
     <tag k="vending" v="excrement_bags"/>
     <tag k="name" v="excrement_bags"/>
   </node>
-  <node id="-228001" user="overview-creator" visible="true" lat="-0.00396" lon="0.00326"/>
-  <node id="-228002" user="overview-creator" visible="true" lat="-0.00396" lon="0.00354"/>
-  <node id="-228003" user="overview-creator" visible="true" lat="-0.00404" lon="0.00354"/>
-  <node id="-228004" user="overview-creator" visible="true" lat="-0.00404" lon="0.00326"/>
-  <way id="-228004" user="overview-creator" visible="true">
-    <nd ref="-228001"/>
-    <nd ref="-228002"/>
-    <nd ref="-228003"/>
-    <nd ref="-228004"/>
-    <nd ref="-228001"/>
+  <node id="-228201" user="overview-creator" visible="true" lat="-0.00406" lon="0.00326"/>
+  <node id="-228202" user="overview-creator" visible="true" lat="-0.00406" lon="0.00354"/>
+  <node id="-228203" user="overview-creator" visible="true" lat="-0.00414" lon="0.00354"/>
+  <node id="-228204" user="overview-creator" visible="true" lat="-0.00414" lon="0.00326"/>
+  <way id="-228204" user="overview-creator" visible="true">
+    <nd ref="-228201"/>
+    <nd ref="-228202"/>
+    <nd ref="-228203"/>
+    <nd ref="-228204"/>
+    <nd ref="-228201"/>
     <tag k="vending" v="excrement_bags"/>
     <tag k="name" v="excrement_bags"/>
@@ -7784,6 +7818,6 @@
   </way>
   <node id="-321200" user="overview-creator" visible="true" lat="-0.00060" lon="0.00480">
-    <tag k="landuse" v="quarry"/>
-    <tag k="name" v="quarry"/>
+    <tag k="landuse" v="orchard"/>
+    <tag k="name" v="orchard"/>
   </node>
   <node id="-321201" user="overview-creator" visible="true" lat="-0.00056" lon="0.00476"/>
@@ -7797,10 +7831,10 @@
     <nd ref="-321204"/>
     <nd ref="-321201"/>
+    <tag k="landuse" v="orchard"/>
+    <tag k="name" v="orchard"/>
+  </way>
+  <node id="-321400" user="overview-creator" visible="true" lat="-0.00070" lon="0.00480">
     <tag k="landuse" v="quarry"/>
     <tag k="name" v="quarry"/>
-  </way>
-  <node id="-321400" user="overview-creator" visible="true" lat="-0.00070" lon="0.00480">
-    <tag k="landuse" v="landfill"/>
-    <tag k="name" v="landfill"/>
   </node>
   <node id="-321401" user="overview-creator" visible="true" lat="-0.00066" lon="0.00476"/>
@@ -7814,10 +7848,10 @@
     <nd ref="-321404"/>
     <nd ref="-321401"/>
+    <tag k="landuse" v="quarry"/>
+    <tag k="name" v="quarry"/>
+  </way>
+  <node id="-321600" user="overview-creator" visible="true" lat="-0.00080" lon="0.00480">
     <tag k="landuse" v="landfill"/>
     <tag k="name" v="landfill"/>
-  </way>
-  <node id="-321600" user="overview-creator" visible="true" lat="-0.00080" lon="0.00480">
-    <tag k="landuse" v="basin"/>
-    <tag k="name" v="basin"/>
   </node>
   <node id="-321601" user="overview-creator" visible="true" lat="-0.00076" lon="0.00476"/>
@@ -7831,10 +7865,10 @@
     <nd ref="-321604"/>
     <nd ref="-321601"/>
+    <tag k="landuse" v="landfill"/>
+    <tag k="name" v="landfill"/>
+  </way>
+  <node id="-321800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00480">
     <tag k="landuse" v="basin"/>
     <tag k="name" v="basin"/>
-  </way>
-  <node id="-321800" user="overview-creator" visible="true" lat="-0.00090" lon="0.00480">
-    <tag k="landuse" v="reservoir"/>
-    <tag k="name" v="reservoir"/>
   </node>
   <node id="-321801" user="overview-creator" visible="true" lat="-0.00086" lon="0.00476"/>
@@ -7848,10 +7882,10 @@
     <nd ref="-321804"/>
     <nd ref="-321801"/>
+    <tag k="landuse" v="basin"/>
+    <tag k="name" v="basin"/>
+  </way>
+  <node id="-322000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00480">
     <tag k="landuse" v="reservoir"/>
     <tag k="name" v="reservoir"/>
-  </way>
-  <node id="-322000" user="overview-creator" visible="true" lat="-0.00100" lon="0.00480">
-    <tag k="landuse" v="forest"/>
-    <tag k="name" v="forest"/>
   </node>
   <node id="-322001" user="overview-creator" visible="true" lat="-0.00096" lon="0.00476"/>
@@ -7865,10 +7899,10 @@
     <nd ref="-322004"/>
     <nd ref="-322001"/>
+    <tag k="landuse" v="reservoir"/>
+    <tag k="name" v="reservoir"/>
+  </way>
+  <node id="-322200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00480">
     <tag k="landuse" v="forest"/>
     <tag k="name" v="forest"/>
-  </way>
-  <node id="-322200" user="overview-creator" visible="true" lat="-0.00110" lon="0.00480">
-    <tag k="landuse" v="allotments"/>
-    <tag k="name" v="allotments"/>
   </node>
   <node id="-322201" user="overview-creator" visible="true" lat="-0.00106" lon="0.00476"/>
@@ -7882,10 +7916,10 @@
     <nd ref="-322204"/>
     <nd ref="-322201"/>
+    <tag k="landuse" v="forest"/>
+    <tag k="name" v="forest"/>
+  </way>
+  <node id="-322400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00480">
     <tag k="landuse" v="allotments"/>
     <tag k="name" v="allotments"/>
-  </way>
-  <node id="-322400" user="overview-creator" visible="true" lat="-0.00120" lon="0.00480">
-    <tag k="landuse" v="grass"/>
-    <tag k="name" v="grass"/>
   </node>
   <node id="-322401" user="overview-creator" visible="true" lat="-0.00116" lon="0.00476"/>
@@ -7899,10 +7933,10 @@
     <nd ref="-322404"/>
     <nd ref="-322401"/>
+    <tag k="landuse" v="allotments"/>
+    <tag k="name" v="allotments"/>
+  </way>
+  <node id="-322600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00480">
     <tag k="landuse" v="grass"/>
     <tag k="name" v="grass"/>
-  </way>
-  <node id="-322600" user="overview-creator" visible="true" lat="-0.00130" lon="0.00480">
-    <tag k="landuse" v="residential"/>
-    <tag k="name" v="residential"/>
   </node>
   <node id="-322601" user="overview-creator" visible="true" lat="-0.00126" lon="0.00476"/>
@@ -7916,10 +7950,10 @@
     <nd ref="-322604"/>
     <nd ref="-322601"/>
+    <tag k="landuse" v="grass"/>
+    <tag k="name" v="grass"/>
+  </way>
+  <node id="-322800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00480">
     <tag k="landuse" v="residential"/>
     <tag k="name" v="residential"/>
-  </way>
-  <node id="-322800" user="overview-creator" visible="true" lat="-0.00140" lon="0.00480">
-    <tag k="landuse" v="farmyard"/>
-    <tag k="name" v="farmyard"/>
   </node>
   <node id="-322801" user="overview-creator" visible="true" lat="-0.00136" lon="0.00476"/>
@@ -7933,10 +7967,10 @@
     <nd ref="-322804"/>
     <nd ref="-322801"/>
+    <tag k="landuse" v="residential"/>
+    <tag k="name" v="residential"/>
+  </way>
+  <node id="-323000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00480">
     <tag k="landuse" v="farmyard"/>
     <tag k="name" v="farmyard"/>
-  </way>
-  <node id="-323000" user="overview-creator" visible="true" lat="-0.00150" lon="0.00480">
-    <tag k="landuse" v="retail"/>
-    <tag k="name" v="retail"/>
   </node>
   <node id="-323001" user="overview-creator" visible="true" lat="-0.00146" lon="0.00476"/>
@@ -7950,10 +7984,10 @@
     <nd ref="-323004"/>
     <nd ref="-323001"/>
+    <tag k="landuse" v="farmyard"/>
+    <tag k="name" v="farmyard"/>
+  </way>
+  <node id="-323200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00480">
     <tag k="landuse" v="retail"/>
     <tag k="name" v="retail"/>
-  </way>
-  <node id="-323200" user="overview-creator" visible="true" lat="-0.00160" lon="0.00480">
-    <tag k="landuse" v="commercial"/>
-    <tag k="name" v="commercial"/>
   </node>
   <node id="-323201" user="overview-creator" visible="true" lat="-0.00156" lon="0.00476"/>
@@ -7967,10 +8001,10 @@
     <nd ref="-323204"/>
     <nd ref="-323201"/>
+    <tag k="landuse" v="retail"/>
+    <tag k="name" v="retail"/>
+  </way>
+  <node id="-323400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00480">
     <tag k="landuse" v="commercial"/>
     <tag k="name" v="commercial"/>
-  </way>
-  <node id="-323400" user="overview-creator" visible="true" lat="-0.00170" lon="0.00480">
-    <tag k="landuse" v="industrial"/>
-    <tag k="name" v="industrial"/>
   </node>
   <node id="-323401" user="overview-creator" visible="true" lat="-0.00166" lon="0.00476"/>
@@ -7984,10 +8018,10 @@
     <nd ref="-323404"/>
     <nd ref="-323401"/>
+    <tag k="landuse" v="commercial"/>
+    <tag k="name" v="commercial"/>
+  </way>
+  <node id="-323600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00480">
     <tag k="landuse" v="industrial"/>
     <tag k="name" v="industrial"/>
-  </way>
-  <node id="-323600" user="overview-creator" visible="true" lat="-0.00180" lon="0.00480">
-    <tag k="landuse" v="brownfield"/>
-    <tag k="name" v="brownfield"/>
   </node>
   <node id="-323601" user="overview-creator" visible="true" lat="-0.00176" lon="0.00476"/>
@@ -8001,10 +8035,10 @@
     <nd ref="-323604"/>
     <nd ref="-323601"/>
+    <tag k="landuse" v="industrial"/>
+    <tag k="name" v="industrial"/>
+  </way>
+  <node id="-323800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00480">
     <tag k="landuse" v="brownfield"/>
     <tag k="name" v="brownfield"/>
-  </way>
-  <node id="-323800" user="overview-creator" visible="true" lat="-0.00190" lon="0.00480">
-    <tag k="landuse" v="greenfield"/>
-    <tag k="name" v="greenfield"/>
   </node>
   <node id="-323801" user="overview-creator" visible="true" lat="-0.00186" lon="0.00476"/>
@@ -8018,10 +8052,10 @@
     <nd ref="-323804"/>
     <nd ref="-323801"/>
+    <tag k="landuse" v="brownfield"/>
+    <tag k="name" v="brownfield"/>
+  </way>
+  <node id="-324000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00480">
     <tag k="landuse" v="greenfield"/>
     <tag k="name" v="greenfield"/>
-  </way>
-  <node id="-324000" user="overview-creator" visible="true" lat="-0.00200" lon="0.00480">
-    <tag k="landuse" v="railway"/>
-    <tag k="name" v="railway"/>
   </node>
   <node id="-324001" user="overview-creator" visible="true" lat="-0.00196" lon="0.00476"/>
@@ -8035,10 +8069,10 @@
     <nd ref="-324004"/>
     <nd ref="-324001"/>
+    <tag k="landuse" v="greenfield"/>
+    <tag k="name" v="greenfield"/>
+  </way>
+  <node id="-324200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00480">
     <tag k="landuse" v="railway"/>
     <tag k="name" v="railway"/>
-  </way>
-  <node id="-324200" user="overview-creator" visible="true" lat="-0.00210" lon="0.00480">
-    <tag k="landuse" v="construction"/>
-    <tag k="name" v="construction"/>
   </node>
   <node id="-324201" user="overview-creator" visible="true" lat="-0.00206" lon="0.00476"/>
@@ -8052,10 +8086,10 @@
     <nd ref="-324204"/>
     <nd ref="-324201"/>
+    <tag k="landuse" v="railway"/>
+    <tag k="name" v="railway"/>
+  </way>
+  <node id="-324400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00480">
     <tag k="landuse" v="construction"/>
     <tag k="name" v="construction"/>
-  </way>
-  <node id="-324400" user="overview-creator" visible="true" lat="-0.00220" lon="0.00480">
-    <tag k="landuse" v="military"/>
-    <tag k="name" v="military"/>
   </node>
   <node id="-324401" user="overview-creator" visible="true" lat="-0.00216" lon="0.00476"/>
@@ -8069,10 +8103,10 @@
     <nd ref="-324404"/>
     <nd ref="-324401"/>
+    <tag k="landuse" v="construction"/>
+    <tag k="name" v="construction"/>
+  </way>
+  <node id="-324600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00480">
     <tag k="landuse" v="military"/>
     <tag k="name" v="military"/>
-  </way>
-  <node id="-324600" user="overview-creator" visible="true" lat="-0.00230" lon="0.00480">
-    <tag k="landuse" v="cemetery"/>
-    <tag k="name" v="cemetery"/>
   </node>
   <node id="-324601" user="overview-creator" visible="true" lat="-0.00226" lon="0.00476"/>
@@ -8086,10 +8120,10 @@
     <nd ref="-324604"/>
     <nd ref="-324601"/>
+    <tag k="landuse" v="military"/>
+    <tag k="name" v="military"/>
+  </way>
+  <node id="-324800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00480">
     <tag k="landuse" v="cemetery"/>
     <tag k="name" v="cemetery"/>
-  </way>
-  <node id="-324800" user="overview-creator" visible="true" lat="-0.00240" lon="0.00480">
-    <tag k="landuse" v="village_green"/>
-    <tag k="name" v="village_green"/>
   </node>
   <node id="-324801" user="overview-creator" visible="true" lat="-0.00236" lon="0.00476"/>
@@ -8103,10 +8137,10 @@
     <nd ref="-324804"/>
     <nd ref="-324801"/>
+    <tag k="landuse" v="cemetery"/>
+    <tag k="name" v="cemetery"/>
+  </way>
+  <node id="-325000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00480">
     <tag k="landuse" v="village_green"/>
     <tag k="name" v="village_green"/>
-  </way>
-  <node id="-325000" user="overview-creator" visible="true" lat="-0.00250" lon="0.00480">
-    <tag k="landuse" v="recreation_ground"/>
-    <tag k="name" v="recreation_ground"/>
   </node>
   <node id="-325001" user="overview-creator" visible="true" lat="-0.00246" lon="0.00476"/>
@@ -8120,4 +8154,21 @@
     <nd ref="-325004"/>
     <nd ref="-325001"/>
+    <tag k="landuse" v="village_green"/>
+    <tag k="name" v="village_green"/>
+  </way>
+  <node id="-325200" user="overview-creator" visible="true" lat="-0.00260" lon="0.00480">
+    <tag k="landuse" v="recreation_ground"/>
+    <tag k="name" v="recreation_ground"/>
+  </node>
+  <node id="-325201" user="overview-creator" visible="true" lat="-0.00256" lon="0.00476"/>
+  <node id="-325202" user="overview-creator" visible="true" lat="-0.00256" lon="0.00504"/>
+  <node id="-325203" user="overview-creator" visible="true" lat="-0.00264" lon="0.00504"/>
+  <node id="-325204" user="overview-creator" visible="true" lat="-0.00264" lon="0.00476"/>
+  <way id="-325204" user="overview-creator" visible="true">
+    <nd ref="-325201"/>
+    <nd ref="-325202"/>
+    <nd ref="-325203"/>
+    <nd ref="-325204"/>
+    <nd ref="-325201"/>
     <tag k="landuse" v="recreation_ground"/>
     <tag k="name" v="recreation_ground"/>
Index: /trunk/styles/standard/overview.xsl
===================================================================
--- /trunk/styles/standard/overview.xsl	(revision 2739)
+++ /trunk/styles/standard/overview.xsl	(revision 2740)
@@ -538,4 +538,6 @@
     </xsl:call-template>
 
+	
+	
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'amenity'"/>
@@ -549,5 +551,4 @@
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
-	
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'parking'"/>
@@ -561,10 +562,9 @@
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
-
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'information'"/>
-		<xsl:with-param name="column" select="10"/>
-		<xsl:with-param name="row" select="16"/>
-    </xsl:call-template>
+<xsl:call-template name="topic">
+	<xsl:with-param name="key" select="'information'"/>
+	<xsl:with-param name="column" select="11"/>
+	<xsl:with-param name="row" select="33"/>
+</xsl:call-template>
 	
     <xsl:call-template name="topic">
@@ -573,18 +573,18 @@
 		<xsl:with-param name="row" select="1"/>
     </xsl:call-template>
-    <xsl:call-template name="topic">
-		<xsl:with-param name="key" select="'power'"/>
-		<xsl:with-param name="column" select="11"/>
-		<xsl:with-param name="row" select="23"/>
-    </xsl:call-template>
+<xsl:call-template name="topic">
+	<xsl:with-param name="key" select="'power'"/>
+	<xsl:with-param name="column" select="10"/>
+	<xsl:with-param name="row" select="20"/>
+</xsl:call-template>
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'power_source'"/>
 		<xsl:with-param name="column" select="11"/>
-		<xsl:with-param name="row" select="31"/>
+		<xsl:with-param name="row" select="20"/>
     </xsl:call-template>
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'vending'"/>
 		<xsl:with-param name="column" select="11"/>
-		<xsl:with-param name="row" select="39"/>
+		<xsl:with-param name="row" select="40"/>
     </xsl:call-template>
 
@@ -619,5 +619,4 @@
 
 
-	
     <xsl:call-template name="topic">
 		<xsl:with-param name="key" select="'landuse'"/>