Index: /trunk/styles/icon_overview.osm
===================================================================
--- /trunk/styles/icon_overview.osm	(revision 518)
+++ /trunk/styles/icon_overview.osm	(revision 519)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.5' generator='JOSM'>
-  <node id='-1' action='modify' visible='true' lat='9.698380668211763' lon='-61.532815380411606'>
+  <node id='-1' action='modify' visible='true' lat='9.727541135311126' lon='-61.542535536111394'>
     <tag k='name' v='tower' />
     <tag k='power' v='tower' />
@@ -65,5 +65,5 @@
     <tag k='note' v='man_made' />
   </node>
-  <node id='-17' action='modify' visible='true' lat='10.083156180779136' lon='-61.523172022808865'>
+  <node id='-17' action='modify' visible='true' lat='9.976234468081472' lon='-61.523172022808865'>
     <tag k='name' v='power' />
     <tag k='tourism' v='attraction' />
@@ -129,631 +129,675 @@
     <tag k='historic' v='monument' />
   </node>
-  <node id='-33' action='modify' visible='true' lat='14.151639867700228' lon='-54.94437484752179'>
+  <node id='-33' action='modify' visible='true' lat='13.786089874111747' lon='-54.96103775085638'>
+    <tag k='name' v='archaeological_site' />
+    <tag k='historic' v='archaeological_site' />
+  </node>
+  <node id='-34' action='modify' visible='true' lat='15.537748117418648' lon='-57.9091380685049'>
+    <tag k='name' v='amenity' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-35' action='modify' visible='true' lat='13.50362957447378' lon='-54.952229117089864'>
+    <tag k='name' v='ruins' />
+    <tag k='historic' v='ruins' />
+  </node>
+  <node id='-36' action='modify' visible='true' lat='14.151639867700228' lon='-54.94437484752179'>
     <tag k='name' v='museum' />
     <tag k='historic' v='museum' />
   </node>
-  <node id='-34' action='modify' visible='true' lat='13.786089874111747' lon='-54.96103775085638'>
-    <tag k='name' v='archaeological_site' />
-    <tag k='historic' v='archaeological_site' />
-  </node>
-  <node id='-35' action='modify' visible='true' lat='13.468081391347974' lon='-54.96643824612964'>
-    <tag k='name' v='icon' />
-    <tag k='historic' v='icon' />
-  </node>
-  <node id='-36' action='modify' visible='true' lat='13.153703969281427' lon='-54.961949272789646'>
-    <tag k='name' v='ruins' />
-    <tag k='historic' v='ruins' />
-  </node>
-  <node id='-37' action='modify' visible='true' lat='15.541660089368929' lon='-56.93144935560759'>
-    <tag k='name' v='tourism' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-38' action='modify' visible='true' lat='15.509015338788325' lon='-54.994824355526276'>
+  <node id='-37' action='modify' visible='true' lat='15.509015338788325' lon='-54.994824355526276'>
     <tag k='name' v='historic' />
     <tag k='tourism' v='attraction' />
   </node>
-  <node id='-39' action='modify' visible='true' lat='15.537748117418648' lon='-57.9091380685049'>
-    <tag k='name' v='amenity' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-40' action='modify' visible='true' lat='14.151195424939079' lon='-57.88196285856068'>
+  <node id='-38' action='modify' visible='true' lat='14.941681983365038' lon='-57.90301312651305'>
+    <tag k='name' v='biergarten' />
+    <tag k='amenity' v='biergarten' />
+  </node>
+  <node id='-39' action='modify' visible='true' lat='14.151195424939079' lon='-57.88196285856068'>
     <tag k='name' v='restaurant' />
     <tag k='amenity' v='restaurant' />
   </node>
-  <node id='-41' action='modify' visible='true' lat='15.21680807406248' lon='-57.91821444279333'>
+  <node id='-40' action='modify' visible='true' lat='15.541660089368929' lon='-56.93144935560759'>
+    <tag k='name' v='tourism' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-41' action='modify' visible='true' lat='13.868534389023997' lon='-57.87654982597123'>
+    <tag k='name' v='fast_food' />
+    <tag k='amenity' v='fast_food' />
+  </node>
+  <node id='-42' action='modify' visible='true' lat='12.001652590712562' lon='-57.89626862524517'>
+    <tag k='name' v='fuel' />
+    <tag k='amenity' v='fuel' />
+  </node>
+  <node id='-43' action='modify' visible='true' lat='13.557762158664245' lon='-57.87507082977705'>
+    <tag k='name' v='parking' />
+    <tag k='amenity' v='parking' />
+  </node>
+  <node id='-44' action='modify' visible='true' lat='15.21680807406248' lon='-57.91821444279333'>
     <tag k='name' v='pub' />
     <tag k='amenity' v='pub' />
   </node>
-  <node id='-42' action='modify' visible='true' lat='13.868534389023997' lon='-57.87654982597123'>
-    <tag k='name' v='fast_food' />
-    <tag k='amenity' v='fast_food' />
-  </node>
-  <node id='-43' action='modify' visible='true' lat='14.941681983365038' lon='-57.90301312651305'>
-    <tag k='name' v='biergarten' />
-    <tag k='amenity' v='biergarten' />
-  </node>
-  <node id='-44' action='modify' visible='true' lat='13.557762158664245' lon='-57.87507082977705'>
-    <tag k='name' v='parking' />
-    <tag k='amenity' v='parking' />
-  </node>
-  <node id='-45' action='modify' visible='true' lat='14.664019387170635' lon='-57.91243221644405'>
+  <node id='-45' action='modify' visible='true' lat='13.276171483206038' lon='-57.870788782115795'>
+    <tag k='name' v='bicycle_parking' />
+    <tag k='amenity' v='bicycle_parking' />
+  </node>
+  <node id='-46' action='modify' visible='true' lat='10.69926395609017' lon='-57.879696549767395'>
+    <tag k='name' v='place_of_worship' />
+    <tag k='amenity' v='place_of_worship' />
+  </node>
+  <node id='-47' action='modify' visible='true' lat='11.745850001125033' lon='-57.89142749132068'>
+    <tag k='name' v='telephone' />
+    <tag k='amenity' v='telephone' />
+  </node>
+  <node id='-48' action='modify' visible='true' lat='14.664019387170635' lon='-57.91243221644405'>
     <tag k='name' v='cafe' />
     <tag k='amenity' v='cafe' />
   </node>
-  <node id='-46' action='modify' visible='true' lat='13.276171483206038' lon='-57.870788782115795'>
-    <tag k='name' v='bicycle_parking' />
-    <tag k='amenity' v='bicycle_parking' />
-  </node>
-  <node id='-47' action='modify' visible='true' lat='12.001652590712562' lon='-57.89626862524517'>
-    <tag k='name' v='fuel' />
-    <tag k='amenity' v='fuel' />
-  </node>
-  <node id='-48' action='modify' visible='true' lat='11.745850001125033' lon='-57.89142749132068'>
-    <tag k='name' v='telephone' />
-    <tag k='amenity' v='telephone' />
-  </node>
-  <node id='-49' action='modify' visible='true' lat='11.48668834081103' lon='-57.88603256675643'>
+  <node id='-49' action='modify' visible='true' lat='9.517295808459288' lon='-57.89762233647667'>
+    <tag k='name' v='school' />
+    <tag k='amenity' v='school' />
+  </node>
+  <node id='-50' action='modify' visible='true' lat='11.48668834081103' lon='-57.88603256675643'>
     <tag k='name' v='toilets' />
     <tag k='amenity' v='toilets' />
   </node>
-  <node id='-50' action='modify' visible='true' lat='11.217051217941203' lon='-57.88046363655918'>
+  <node id='-51' action='modify' visible='true' lat='11.217051217941203' lon='-57.88046363655918'>
     <tag k='name' v='recycling' />
     <tag k='amenity' v='recycling' />
   </node>
-  <node id='-51' action='modify' visible='true' lat='10.959671686607768' lon='-57.87525860449831'>
+  <node id='-52' action='modify' visible='true' lat='10.959671686607768' lon='-57.87525860449831'>
     <tag k='name' v='public_building' />
     <tag k='amenity' v='public_building' />
   </node>
-  <node id='-52' action='modify' visible='true' lat='10.69926395609017' lon='-57.879696549767395'>
-    <tag k='name' v='place_of_worship' />
-    <tag k='amenity' v='place_of_worship' />
-  </node>
-  <node id='-53' action='modify' visible='true' lat='10.407763245926418' lon='-57.90467555849157'>
+  <node id='-53' action='modify' visible='true' lat='7.401008596827448' lon='-57.869941338497384'>
+    <tag k='name' v='bus_station' />
+    <tag k='amenity' v='bus_station' />
+  </node>
+  <node id='-54' action='modify' visible='true' lat='10.407763245926418' lon='-57.90467555849157'>
     <tag k='name' v='grave_yard' />
     <tag k='amenity' v='grave_yard' />
   </node>
-  <node id='-54' action='modify' visible='true' lat='10.107784397037626' lon='-57.89893262266133'>
+  <node id='-55' action='modify' visible='true' lat='10.107784397037626' lon='-57.89893262266133'>
     <tag k='name' v='post_office' />
     <tag k='amenity' v='post_office' />
   </node>
-  <node id='-55' action='modify' visible='true' lat='9.826810439408915' lon='-57.89283108431814'>
+  <node id='-56' action='modify' visible='true' lat='9.826810439408915' lon='-57.89283108431814'>
     <tag k='name' v='post_box' />
     <tag k='amenity' v='post_box' />
   </node>
-  <node id='-56' action='modify' visible='true' lat='9.517295808459288' lon='-57.89762233647667'>
-    <tag k='name' v='school' />
-    <tag k='amenity' v='school' />
-  </node>
-  <node id='-57' action='modify' visible='true' lat='9.25619870158788' lon='-57.891171952985836'>
+  <node id='-57' action='modify' visible='true' lat='14.429513508966567' lon='-55.94676477514592'>
+    <tag k='shop' v='bicycle' />
+    <tag k='name' v='bicycle' />
+  </node>
+  <node id='-58' action='modify' visible='true' lat='9.25619870158788' lon='-57.891171952985836'>
     <tag k='name' v='university' />
     <tag k='amenity' v='university' />
   </node>
-  <node id='-58' action='modify' visible='true' lat='9.432046236596808' lon='-56.94041128468561'>
+  <node id='-59' action='modify' visible='true' lat='9.432046236596808' lon='-56.94041128468561'>
     <tag k='name' v='cinema' />
     <tag k='amenity' v='cinema' />
   </node>
-  <node id='-59' action='modify' visible='true' lat='9.66887545181026' lon='-56.94041128468561'>
+  <node id='-60' action='modify' visible='true' lat='9.66887545181026' lon='-56.94041128468561'>
     <tag k='name' v='theatre' />
     <tag k='amenity' v='theatre' />
   </node>
-  <node id='-60' action='modify' visible='true' lat='7.401008596827448' lon='-57.869941338497384'>
-    <tag k='name' v='bus_station' />
-    <tag k='amenity' v='bus_station' />
-  </node>
-  <node id='-61' action='modify' visible='true' lat='8.170153697626427' lon='-57.88590828750968'>
+  <node id='-61' action='modify' visible='true' lat='8.423533658975048' lon='-57.88003531504976'>
+    <tag k='name' v='hospital' />
+    <tag k='amenity' v='hospital' />
+  </node>
+  <node id='-62' action='modify' visible='true' lat='8.170153697626427' lon='-57.88590828750968'>
     <tag k='name' v='library' />
     <tag k='amenity' v='library' />
   </node>
-  <node id='-62' action='modify' visible='true' lat='7.9894454643708075' lon='-56.93951734386691'>
+  <node id='-63' action='modify' visible='true' lat='7.9894454643708075' lon='-56.93951734386691'>
     <tag k='name' v='atm' />
     <tag k='amenity' v='atm' />
   </node>
-  <node id='-63' action='modify' visible='true' lat='15.495894591099034' lon='-55.966886961301064'>
+  <node id='-64' action='modify' visible='true' lat='15.495894591099034' lon='-55.966886961301064'>
     <tag k='name' v='shop' />
     <tag k='tourism' v='attraction' />
   </node>
-  <node id='-64' action='modify' visible='true' lat='14.429513508966567' lon='-55.94676477514592'>
-    <tag k='shop' v='bicycle' />
-    <tag k='name' v='bicycle' />
-  </node>
-  <node id='-65' action='modify' visible='true' lat='14.665948405935293' lon='-55.957124957501705'>
+  <node id='-65' action='modify' visible='true' lat='8.978086655670456' lon='-57.89597163670712'>
+    <tag k='name' v='college' />
+    <tag k='amenity' v='college' />
+  </node>
+  <node id='-66' action='modify' visible='true' lat='15.170700277231463' lon='-55.977109089602486'>
+    <tag k='shop' v='supermarket' />
+    <tag k='name' v='supermarket' />
+  </node>
+  <node id='-67' action='modify' visible='true' lat='8.709242964401689' lon='-57.8850518273061'>
+    <tag k='name' v='pharmacy' />
+    <tag k='amenity' v='pharmacy' />
+  </node>
+  <node id='-68' action='modify' visible='true' lat='8.412983820272357' lon='-56.93005110232982'>
+    <tag k='name' v='bank' />
+    <tag k='amenity' v='bank' />
+  </node>
+  <node id='-69' action='modify' visible='true' lat='8.511397758297234' lon='-62.41544790165894'>
+    <tag k='name' v='town' />
+    <tag k='place' v='town' />
+  </node>
+  <node id='-70' action='modify' visible='true' lat='8.788090998014093' lon='-62.43877215506213'>
+    <tag k='name' v='city' />
+    <tag k='place' v='city' />
+  </node>
+  <node id='-71' action='modify' visible='true' lat='7.99025821815939' lon='-62.421744727770204'>
+    <tag k='name' v='hamlet' />
+    <tag k='place' v='hamlet' />
+  </node>
+  <node id='-72' action='modify' visible='true' lat='14.665948405935293' lon='-55.957124957501705'>
     <tag k='shop' v='butcher' />
     <tag k='name' v='butcher' />
   </node>
-  <node id='-66' action='modify' visible='true' lat='8.978086655670456' lon='-57.89597163670712'>
-    <tag k='name' v='college' />
-    <tag k='amenity' v='college' />
-  </node>
-  <node id='-67' action='modify' visible='true' lat='15.170700277231463' lon='-55.977109089602486'>
-    <tag k='shop' v='supermarket' />
-    <tag k='name' v='supermarket' />
-  </node>
-  <node id='-68' action='modify' visible='true' lat='8.709242964401689' lon='-57.8850518273061'>
-    <tag k='name' v='pharmacy' />
-    <tag k='amenity' v='pharmacy' />
-  </node>
-  <node id='-69' action='modify' visible='true' lat='8.423533658975048' lon='-57.88003531504976'>
-    <tag k='name' v='hospital' />
-    <tag k='amenity' v='hospital' />
-  </node>
-  <node id='-70' action='modify' visible='true' lat='8.511397758297234' lon='-62.41544790165894'>
-    <tag k='name' v='town' />
-    <tag k='place' v='town' />
-  </node>
-  <node id='-71' action='modify' visible='true' lat='8.788090998014093' lon='-62.43877215506213'>
-    <tag k='name' v='city' />
-    <tag k='place' v='city' />
-  </node>
-  <node id='-72' action='modify' visible='true' lat='7.99025821815939' lon='-62.421744727770204'>
-    <tag k='name' v='hamlet' />
-    <tag k='place' v='hamlet' />
-  </node>
-  <node id='-73' action='modify' visible='true' lat='8.266919323469583' lon='-62.41339225118162'>
+  <node id='-73' action='modify' visible='true' lat='9.18090876770067' lon='-56.94041128468561'>
+    <tag k='name' v='arts_centre' />
+    <tag k='amenity' v='arts_centre' />
+  </node>
+  <node id='-74' action='modify' visible='true' lat='8.912310601974704' lon='-56.94041128468561'>
+    <tag k='name' v='courthouse' />
+    <tag k='amenity' v='courthouse' />
+  </node>
+  <node id='-75' action='modify' visible='true' lat='8.669802570053378' lon='-56.94041128468561'>
+    <tag k='name' v='prison' />
+    <tag k='amenity' v='prison' />
+  </node>
+  <node id='-76' action='modify' visible='true' lat='9.370830049354144' lon='-63.54057758901389'>
+    <tag k='name' v='railway' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-77' action='modify' visible='true' lat='13.078142659065788' lon='-63.52520023630875'>
+    <tag k='highway' v='gate' />
+    <tag k='name' v='gate' />
+  </node>
+  <node id='-78' action='modify' visible='true' lat='12.760376245778543' lon='-63.526697196163205'>
+    <tag k='highway' v='stile' />
+    <tag k='name' v='stile' />
+  </node>
+  <node id='-79' action='modify' visible='true' lat='12.420643253996031' lon='-63.52829763796155'>
+    <tag k='highway' v='cattle_grid' />
+    <tag k='name' v='cattle_grid' />
+  </node>
+  <node id='-80' action='modify' visible='true' lat='8.266919323469583' lon='-62.41339225118162'>
     <tag k='name' v='village' />
     <tag k='place' v='village' />
   </node>
-  <node id='-74' action='modify' visible='true' lat='9.18090876770067' lon='-56.94041128468561'>
-    <tag k='name' v='arts_centre' />
-    <tag k='amenity' v='arts_centre' />
-  </node>
-  <node id='-75' action='modify' visible='true' lat='8.912310601974704' lon='-56.94041128468561'>
-    <tag k='name' v='courthouse' />
-    <tag k='amenity' v='courthouse' />
-  </node>
-  <node id='-76' action='modify' visible='true' lat='8.669802570053378' lon='-56.94041128468561'>
-    <tag k='name' v='prison' />
-    <tag k='amenity' v='prison' />
-  </node>
-  <node id='-77' action='modify' visible='true' lat='8.412983820272357' lon='-56.93005110232982'>
-    <tag k='name' v='bank' />
-    <tag k='amenity' v='bank' />
-  </node>
-  <node id='-78' action='modify' visible='true' lat='13.078142659065788' lon='-63.52520023630875'>
-    <tag k='highway' v='gate' />
-    <tag k='name' v='gate' />
-  </node>
-  <node id='-79' action='modify' visible='true' lat='12.760376245778543' lon='-63.526697196163205'>
-    <tag k='highway' v='stile' />
-    <tag k='name' v='stile' />
-  </node>
-  <node id='-80' action='modify' visible='true' lat='12.420643253996031' lon='-63.52829763796155'>
-    <tag k='highway' v='cattle_grid' />
-    <tag k='name' v='cattle_grid' />
-  </node>
-  <node id='-81' action='modify' visible='true' lat='12.091898578139235' lon='-63.52984631510786'>
+  <node id='-81' action='modify' visible='true' lat='10.53166919727134' lon='-63.537196370523546'>
+    <tag k='highway' v='services' />
+    <tag k='name' v='services' />
+  </node>
+  <node id='-82' action='modify' visible='true' lat='12.091898578139235' lon='-63.52984631510786'>
     <tag k='highway' v='toll_booth' />
     <tag k='name' v='toll_booth' />
   </node>
-  <node id='-82' action='modify' visible='true' lat='10.34484238267235' lon='-62.472428439472466'>
-    <tag k='name' v='place' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-83' action='modify' visible='true' lat='9.965443465444649' lon='-63.53986379273578'>
+  <node id='-83' action='modify' visible='true' lat='15.185328199844479' lon='-60.561222325880365'>
+    <tag k='name' v='sports_centre' />
+    <tag k='leisure' v='sports_centre' />
+  </node>
+  <node id='-84' action='modify' visible='true' lat='9.965443465444649' lon='-63.53986379273578'>
     <tag k='highway' v='bus_stop' />
     <tag k='name' v='bus_stop' />
   </node>
-  <node id='-84' action='modify' visible='true' lat='10.53166919727134' lon='-63.537196370523546'>
-    <tag k='highway' v='services' />
-    <tag k='name' v='services' />
-  </node>
-  <node id='-85' action='modify' visible='true' lat='9.009199296821107' lon='-63.54307535004868'>
+  <node id='-85' action='modify' visible='true' lat='14.840170652965137' lon='-63.51689953158036'>
+    <tag k='name' v='highway' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-86' action='modify' visible='true' lat='9.009199296821107' lon='-63.54307535004868'>
     <tag k='railway' v='station' />
     <tag k='name' v='station' />
   </node>
-  <node id='-86' action='modify' visible='true' lat='9.370830049354144' lon='-63.54057758901389'>
-    <tag k='name' v='railway' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-87' action='modify' visible='true' lat='7.7325207168998125' lon='-62.40867376709108'>
+  <node id='-87' action='modify' visible='true' lat='10.34484238267235' lon='-62.472428439472466'>
+    <tag k='name' v='place' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-88' action='modify' visible='true' lat='7.7325207168998125' lon='-62.40867376709108'>
     <tag k='name' v='suburb' />
     <tag k='place' v='suburb' />
   </node>
-  <node id='-88' action='modify' visible='true' lat='14.840170652965137' lon='-63.51689953158036'>
-    <tag k='name' v='highway' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-89' action='modify' visible='true' lat='14.120306303521074' lon='-63.52029072708345'>
+  <node id='-89' action='modify' visible='true' lat='14.407501134114327' lon='-60.56319669021589'>
+    <tag k='name' v='stadium' />
+    <tag k='leisure' v='stadium' />
+  </node>
+  <node id='-90' action='modify' visible='true' lat='14.120306303521074' lon='-63.52029072708345'>
     <tag k='highway' v='stop' />
     <tag k='name' v='stop' />
   </node>
-  <node id='-90' action='modify' visible='true' lat='13.813477939376908' lon='-63.52173615908673'>
+  <node id='-91' action='modify' visible='true' lat='12.27070312888544' lon='-60.56862049190189'>
+    <tag k='name' v='fishing' />
+    <tag k='leisure' v='fishing' />
+  </node>
+  <node id='-92' action='modify' visible='true' lat='14.83475166565153' lon='-60.56211219812513'>
+    <tag k='name' v='golf_course' />
+    <tag k='leisure' v='golf_course' />
+  </node>
+  <node id='-93' action='modify' visible='true' lat='7.649433018980002' lon='-63.561113142414044'>
+    <tag k='railway' v='level_crossing' />
+    <tag k='name' v='level_crossing' />
+  </node>
+  <node id='-94' action='modify' visible='true' lat='15.525030188941788' lon='-60.560360054781704'>
+    <tag k='name' v='leisure' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-95' action='modify' visible='true' lat='13.813477939376908' lon='-63.52173615908673'>
     <tag k='highway' v='traffic_signals' />
     <tag k='name' v='traffic_signals' />
   </node>
-  <node id='-91' action='modify' visible='true' lat='14.83475166565153' lon='-60.56211219812513'>
-    <tag k='name' v='golf_course' />
-    <tag k='leisure' v='golf_course' />
-  </node>
-  <node id='-92' action='modify' visible='true' lat='14.407501134114327' lon='-60.56319669021589'>
-    <tag k='name' v='stadium' />
-    <tag k='leisure' v='stadium' />
-  </node>
-  <node id='-93' action='modify' visible='true' lat='15.525030188941788' lon='-60.560360054781704'>
-    <tag k='name' v='leisure' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-94' action='modify' visible='true' lat='15.185328199844479' lon='-60.561222325880365'>
-    <tag k='name' v='sports_centre' />
-    <tag k='leisure' v='sports_centre' />
-  </node>
-  <node id='-95' action='modify' visible='true' lat='11.500755655576096' lon='-62.460687881865354'>
+  <node id='-96' action='modify' visible='true' lat='11.500755655576096' lon='-62.460687881865354'>
     <tag k='aeroway' v='aerodrome' />
     <tag k='name' v='aerodrome' />
   </node>
-  <node id='-96' action='modify' visible='true' lat='7.804955510176603' lon='-63.551392986714255'>
-    <tag k='railway' v='level_crossing' />
-    <tag k='name' v='level_crossing' />
-  </node>
-  <node id='-97' action='modify' visible='true' lat='11.893403894781143' lon='-62.4603259454302'>
-    <tag k='name' v='aeroway' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-98' action='modify' visible='true' lat='11.931022107385186' lon='-60.56948269240939'>
+  <node id='-97' action='modify' visible='true' lat='11.931022107385186' lon='-60.56948269240939'>
     <tag k='name' v='nature_reserve' />
     <tag k='leisure' v='nature_reserve' />
   </node>
-  <node id='-99' action='modify' visible='true' lat='11.07939634941838' lon='-60.57048395751487'>
+  <node id='-98' action='modify' visible='true' lat='15.530330381084662' lon='-62.46112452243973'>
+    <tag k='name' v='waterway' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-99' action='modify' visible='true' lat='12.643283491848226' lon='-60.567674782044435'>
+    <tag k='name' v='slipway' />
+    <tag k='leisure' v='slipway' />
+  </node>
+  <node id='-100' action='modify' visible='true' lat='11.893403894781143' lon='-62.4603259454302'>
+    <tag k='name' v='aeroway' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-101' action='modify' visible='true' lat='13.444094481437942' lon='-63.523476280711655'>
+    <tag k='highway' v='crossing' />
+    <tag k='name' v='crossing' />
+  </node>
+  <node id='-102' action='modify' visible='true' lat='11.07939634941838' lon='-60.57048395751487'>
     <tag k='name' v='garden' />
     <tag k='leisure' v='garden' />
   </node>
-  <node id='-100' action='modify' visible='true' lat='12.643283491848226' lon='-60.567674782044435'>
-    <tag k='name' v='slipway' />
-    <tag k='leisure' v='slipway' />
-  </node>
-  <node id='-101' action='modify' visible='true' lat='14.493619089655267' lon='-63.51853209485981'>
+  <node id='-103' action='modify' visible='true' lat='13.377456453867989' lon='-60.565811245840294'>
+    <tag k='name' v='pitch' />
+    <tag k='leisure' v='pitch' />
+  </node>
+  <node id='-104' action='modify' visible='true' lat='14.493619089655267' lon='-63.51853209485981'>
     <tag k='highway' v='mini_roundabout' />
     <tag k='name' v='mini_roundabout' />
   </node>
-  <node id='-102' action='modify' visible='true' lat='13.444094481437942' lon='-63.523476280711655'>
-    <tag k='highway' v='crossing' />
-    <tag k='name' v='crossing' />
-  </node>
-  <node id='-103' action='modify' visible='true' lat='12.27070312888544' lon='-60.56862049190189'>
-    <tag k='name' v='fishing' />
-    <tag k='leisure' v='fishing' />
-  </node>
-  <node id='-104' action='modify' visible='true' lat='13.377456453867989' lon='-60.565811245840294'>
-    <tag k='name' v='pitch' />
-    <tag k='leisure' v='pitch' />
-  </node>
-  <node id='-105' action='modify' visible='true' lat='13.004877790650372' lon='-60.566756955697755'>
+  <node id='-105' action='modify' visible='true' lat='14.045882167363672' lon='-60.564114587153746'>
+    <tag k='name' v='marina' />
+    <tag k='leisure' v='marina' />
+  </node>
+  <node id='-106' action='modify' visible='true' lat='14.028491683428904' lon='-62.49028498953909'>
+    <tag k='name' v='water_point' />
+    <tag k='waterway' v='water_point' />
+  </node>
+  <node id='-107' action='modify' visible='true' lat='10.79083677053565' lon='-60.58167859804971'>
+    <tag k='name' v='common' />
+    <tag k='leisure' v='common' />
+  </node>
+  <node id='-108' action='modify' visible='true' lat='13.004877790650372' lon='-60.566756955697755'>
     <tag k='name' v='water_park' />
     <tag k='leisure' v='water_park' />
   </node>
-  <node id='-106' action='modify' visible='true' lat='14.045882167363672' lon='-60.564114587153746'>
-    <tag k='name' v='marina' />
-    <tag k='leisure' v='marina' />
-  </node>
-  <node id='-107' action='modify' visible='true' lat='13.706177079713163' lon='-60.56497685825241'>
+  <node id='-109' action='modify' visible='true' lat='15.106668027719513' lon='-62.46112452243973'>
+    <tag k='name' v='lock_gate' />
+    <tag k='waterway' v='lock_gate' />
+  </node>
+  <node id='-110' action='modify' visible='true' lat='13.706177079713163' lon='-60.56497685825241'>
     <tag k='name' v='track' />
     <tag k='leisure' v='track' />
   </node>
-  <node id='-108' action='modify' visible='true' lat='10.79083677053565' lon='-60.58167859804971'>
-    <tag k='name' v='common' />
-    <tag k='leisure' v='common' />
-  </node>
-  <node id='-109' action='modify' visible='true' lat='14.713198267182063' lon='-62.46112452243973'>
+  <node id='-111' action='modify' visible='true' lat='10.264758564701124' lon='-63.53845375483157'>
+    <tag k='highway' v='ford' />
+    <tag k='name' v='ford' />
+  </node>
+  <node id='-112' action='modify' visible='true' lat='14.839560291279303' lon='-62.46112452243973'>
     <tag k='name' v='turning_point' />
     <tag k='waterway' v='turning_point' />
   </node>
-  <node id='-110' action='modify' visible='true' lat='15.106668027719513' lon='-62.46112452243973'>
-    <tag k='name' v='lock_gate' />
-    <tag k='waterway' v='lock_gate' />
-  </node>
-  <node id='-111' action='modify' visible='true' lat='15.530330381084662' lon='-62.46112452243973'>
-    <tag k='name' v='waterway' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-112' action='modify' visible='true' lat='10.264758564701124' lon='-63.53845375483157'>
-    <tag k='highway' v='ford' />
-    <tag k='name' v='ford' />
-  </node>
-  <node id='-113' action='modify' visible='true' lat='10.866018065020553' lon='-63.53562129269444'>
+  <node id='-113' action='modify' visible='true' lat='10.930076763883921' lon='-62.4749809438268'>
+    <tag k='aeroway' v='helipad' />
+    <tag k='name' v='helipad' />
+  </node>
+  <node id='-114' action='modify' visible='true' lat='10.866018065020553' lon='-63.53562129269444'>
     <tag k='highway' v='motorway_junction' />
     <tag k='name' v='motorway_junction' />
   </node>
-  <node id='-114' action='modify' visible='true' lat='11.192098876583414' lon='-63.53408516469661'>
+  <node id='-115' action='modify' visible='true' lat='11.192098876583414' lon='-63.53408516469661'>
     <tag k='highway' v='viaduct' />
     <tag k='name' v='viaduct' />
   </node>
-  <node id='-115' action='modify' visible='true' lat='11.477467590701208' lon='-63.53274082655737'>
+  <node id='-116' action='modify' visible='true' lat='11.477467590701208' lon='-63.53274082655737'>
     <tag k='highway' v='incline_steep' />
     <tag k='name' v='incline_steep' />
   </node>
-  <node id='-116' action='modify' visible='true' lat='11.803548402264068' lon='-63.53120469855955'>
+  <node id='-117' action='modify' visible='true' lat='11.803548402264068' lon='-63.53120469855955'>
     <tag k='highway' v='incline' />
     <tag k='name' v='incline' />
   </node>
-  <node id='-117' action='modify' visible='true' lat='12.411576934418385' lon='-62.46112452243973'>
+  <node id='-118' action='modify' visible='true' lat='13.198909546101179' lon='-62.50000514523888'>
     <tag k='name' v='weir' />
     <tag k='waterway' v='weir' />
   </node>
-  <node id='-118' action='modify' visible='true' lat='12.785241386511707' lon='-62.46112452243973'>
+  <node id='-119' action='modify' visible='true' lat='13.494812752596202' lon='-62.50000514523888'>
     <tag k='name' v='mooring' />
     <tag k='waterway' v='mooring' />
   </node>
-  <node id='-119' action='modify' visible='true' lat='13.13865209732298' lon='-62.46112452243973'>
+  <node id='-120' action='modify' visible='true' lat='13.78018237350896' lon='-62.49028498953909'>
     <tag k='name' v='waste_disposal' />
     <tag k='waterway' v='waste_disposal' />
   </node>
-  <node id='-120' action='modify' visible='true' lat='13.542483898439524' lon='-62.46112452243973'>
-    <tag k='name' v='water_point' />
-    <tag k='waterway' v='water_point' />
-  </node>
-  <node id='-121' action='modify' visible='true' lat='13.926058862828727' lon='-62.46112452243973'>
+  <node id='-121' action='modify' visible='true' lat='14.919933768737462' lon='-55.9760670403642'>
+    <tag k='shop' v='convenience' />
+    <tag k='name' v='convenience' />
+  </node>
+  <node id='-122' action='modify' visible='true' lat='14.305144935120444' lon='-62.47084467813952'>
     <tag k='name' v='boatyard' />
     <tag k='waterway' v='boatyard' />
   </node>
-  <node id='-122' action='modify' visible='true' lat='14.329753430503995' lon='-62.46112452243973'>
+  <node id='-123' action='modify' visible='true' lat='14.572757322998687' lon='-62.46112452243973'>
     <tag k='name' v='aqueduct' />
     <tag k='waterway' v='aqueduct' />
   </node>
-  <node id='-123' action='modify' visible='true' lat='8.69840753663645' lon='-63.54522196933668'>
+  <node id='-124' action='modify' visible='true' lat='8.717847848036026' lon='-63.55494212503647'>
     <tag k='railway' v='halt' />
     <tag k='name' v='halt' />
   </node>
-  <node id='-124' action='modify' visible='true' lat='8.373493845709318' lon='-63.54746612791883'>
+  <node id='-125' action='modify' visible='true' lat='8.217971354512716' lon='-63.55718628361862'>
     <tag k='railway' v='viaduct' />
     <tag k='name' v='viaduct' />
   </node>
-  <node id='-125' action='modify' visible='true' lat='8.099336963549076' lon='-63.54935971239107'>
+  <node id='-126' action='modify' visible='true' lat='7.943814472352475' lon='-63.55907986809086'>
     <tag k='railway' v='crossing' />
     <tag k='name' v='crossing' />
   </node>
-  <node id='-126' action='modify' visible='true' lat='7.485346012766044' lon='-63.556556824071954'>
+  <node id='-127' action='modify' visible='true' lat='7.388144455768169' lon='-63.56627697977174'>
     <tag k='railway' v='subway_entrance' />
     <tag k='name' v='subway_entrance' />
   </node>
-  <node id='-127' action='modify' visible='true' lat='11.215100355769977' lon='-62.46462076147101'>
+  <node id='-128' action='modify' visible='true' lat='11.215100355769977' lon='-62.46462076147101'>
     <tag k='aeroway' v='terminal' />
     <tag k='name' v='terminal' />
   </node>
-  <node id='-128' action='modify' visible='true' lat='10.930076763883921' lon='-62.4749809438268'>
-    <tag k='aeroway' v='helipad' />
-    <tag k='name' v='helipad' />
-  </node>
-  <node id='-129' action='modify' visible='true' lat='10.809770087119379' lon='-61.54386071127052'>
+  <node id='-129' action='modify' visible='true' lat='14.39874326925126' lon='-57.91581411294176'>
+    <tag k='name' v='nightclub' />
+    <tag k='amenity' v='nightclub' />
+  </node>
+  <node id='-130' action='modify' visible='true' lat='10.809770087119379' lon='-61.54386071127052'>
     <tag k='name' v='pier' />
     <tag k='man_made' v='pier' />
   </node>
-  <node id='-130' action='modify' visible='true' lat='11.68421166166496' lon='-60.593710133608724'>
+  <node id='-131' action='modify' visible='true' lat='12.788476991243762' lon='-57.88961567677941'>
+    <tag k='name' v='car_rental' />
+    <tag k='amenity' v='car_rental' />
+  </node>
+  <node id='-132' action='modify' visible='true' lat='11.41014859676806' lon='-60.583349951252934'>
+    <tag k='name' v='playground' />
+    <tag k='leisure' v='playground' />
+  </node>
+  <node id='-133' action='modify' visible='true' lat='8.194585929414627' lon='-56.93408592800167'>
+    <tag k='name' v='bureau_de_change' />
+    <tag k='amenity' v='bureau_de_change' />
+  </node>
+  <node id='-134' action='modify' visible='true' lat='12.999683255226259' lon='-57.8847335658744'>
+    <tag k='name' v='bicycle_rental' />
+    <tag k='amenity' v='bicycle_rental' />
+  </node>
+  <node id='-135' action='modify' visible='true' lat='12.313942734080834' lon='-59.67518884548175'>
+    <tag k='name' v='industrial' />
+    <tag k='landuse' v='industrial' />
+  </node>
+  <node id='-136' action='modify' visible='true' lat='12.555997347712044' lon='-57.88931769650652'>
+    <tag k='name' v='car_sharing' />
+    <tag k='amenity' v='car_sharing' />
+  </node>
+  <node id='-137' action='modify' visible='true' lat='13.90650427370336' lon='-55.93980640211894'>
+    <tag k='shop' v='outdoor' />
+    <tag k='name' v='outdoor' />
+  </node>
+  <node id='-138' action='modify' visible='true' lat='7.7431409910984845' lon='-56.91884363474089'>
+    <tag k='name' v='townhall' />
+    <tag k='amenity' v='townhall' />
+  </node>
+  <node id='-139' action='modify' visible='true' lat='15.529721166037483' lon='-59.70871086194106'>
+    <tag k='name' v='landuse' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-140' action='modify' visible='true' lat='14.166958400515915' lon='-55.94927264365604'>
+    <tag k='shop' v='doityourself' />
+    <tag k='name' v='doityourself' />
+  </node>
+  <node id='-141' action='modify' visible='true' lat='14.879886423323788' lon='-59.70871086194105'>
+    <tag k='name' v='quarry' />
+    <tag k='landuse' v='quarry' />
+  </node>
+  <node id='-142' action='modify' visible='true' lat='14.519127756081257' lon='-54.971129351852795'>
+    <tag k='name' v='memorial' />
+    <tag k='historic' v='memorial' />
+  </node>
+  <node id='-143' action='modify' visible='true' lat='11.68421166166496' lon='-60.593710133608724'>
     <tag k='name' v='park' />
     <tag k='leisure' v='park' />
   </node>
-  <node id='-131' action='modify' visible='true' lat='11.41014859676806' lon='-60.583349951252934'>
-    <tag k='name' v='playground' />
-    <tag k='leisure' v='playground' />
-  </node>
-  <node id='-132' action='modify' visible='true' lat='14.39874326925126' lon='-57.91581411294176'>
-    <tag k='name' v='nightclub' />
-    <tag k='amenity' v='nightclub' />
-  </node>
-  <node id='-133' action='modify' visible='true' lat='12.999683255226259' lon='-57.8847335658744'>
-    <tag k='name' v='bicycle_rental' />
-    <tag k='amenity' v='bicycle_rental' />
-  </node>
-  <node id='-134' action='modify' visible='true' lat='12.788476991243762' lon='-57.88961567677941'>
-    <tag k='name' v='car_rental' />
-    <tag k='amenity' v='car_rental' />
-  </node>
-  <node id='-135' action='modify' visible='true' lat='12.555997347712044' lon='-57.88931769650652'>
-    <tag k='name' v='car_sharing' />
-    <tag k='amenity' v='car_sharing' />
-  </node>
-  <node id='-136' action='modify' visible='true' lat='8.194585929414627' lon='-56.93408592800167'>
-    <tag k='name' v='bureau_de_change' />
-    <tag k='amenity' v='bureau_de_change' />
-  </node>
-  <node id='-137' action='modify' visible='true' lat='7.7431409910984845' lon='-56.91884363474089'>
-    <tag k='name' v='townhall' />
-    <tag k='amenity' v='townhall' />
-  </node>
-  <node id='-138' action='modify' visible='true' lat='14.919933768737462' lon='-55.9760670403642'>
-    <tag k='shop' v='convenience' />
-    <tag k='name' v='convenience' />
-  </node>
-  <node id='-139' action='modify' visible='true' lat='14.166958400515915' lon='-55.94927264365604'>
-    <tag k='shop' v='doityourself' />
-    <tag k='name' v='doityourself' />
-  </node>
-  <node id='-140' action='modify' visible='true' lat='13.90650427370336' lon='-55.93980640211894'>
-    <tag k='shop' v='outdoor' />
-    <tag k='name' v='outdoor' />
-  </node>
-  <node id='-141' action='modify' visible='true' lat='14.519127756081257' lon='-54.971129351852795'>
-    <tag k='name' v='memorial' />
-    <tag k='historic' v='memorial' />
-  </node>
-  <node id='-142' action='modify' visible='true' lat='15.529721166037483' lon='-59.70871086194106'>
-    <tag k='name' v='landuse' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-143' action='modify' visible='true' lat='15.210052882615486' lon='-59.70353077076316'>
+  <node id='-144' action='modify' visible='true' lat='15.210052882615486' lon='-59.70353077076316'>
     <tag k='name' v='farm' />
     <tag k='landuse' v='farm' />
   </node>
-  <node id='-144' action='modify' visible='true' lat='14.879886423323788' lon='-59.70871086194105'>
-    <tag k='name' v='quarry' />
-    <tag k='landuse' v='quarry' />
-  </node>
-  <node id='-145' action='modify' visible='true' lat='14.569268664807336' lon='-59.70871086194105'>
+  <node id='-145' action='modify' visible='true' lat='14.268253436987077' lon='-59.68799049722948'>
+    <tag k='name' v='basin' />
+    <tag k='landuse' v='basin' />
+  </node>
+  <node id='-146' action='modify' visible='true' lat='13.986942401156575' lon='-59.67763031487369'>
+    <tag k='name' v='reservoir' />
+    <tag k='landuse' v='reservoir' />
+  </node>
+  <node id='-147' action='modify' visible='true' lat='13.695221496584454' lon='-59.67802847474979'>
+    <tag k='name' v='forest' />
+    <tag k='landuse' v='forest' />
+  </node>
+  <node id='-148' action='modify' visible='true' lat='13.426158933516174' lon='-59.68674222819746'>
+    <tag k='name' v='allotments' />
+    <tag k='landuse' v='allotments' />
+  </node>
+  <node id='-149' action='modify' visible='true' lat='13.158973685219692' lon='-59.69829561091318'>
+    <tag k='name' v='residential' />
+    <tag k='landuse' v='residential' />
+  </node>
+  <node id='-150' action='modify' visible='true' lat='12.901789721723086' lon='-59.69730149049129'>
+    <tag k='name' v='retail' />
+    <tag k='landuse' v='retail' />
+  </node>
+  <node id='-151' action='modify' visible='true' lat='12.603125027038642' lon='-59.67618296590362'>
+    <tag k='name' v='commercial' />
+    <tag k='landuse' v='commercial' />
+  </node>
+  <node id='-152' action='modify' visible='true' lat='13.477664852926468' lon='-58.766098167790204'>
+    <tag k='name' v='heath' />
+    <tag k='natural' v='heath' />
+  </node>
+  <node id='-153' action='modify' visible='true' lat='12.035741134084109' lon='-59.67469178527081'>
+    <tag k='name' v='brownfield' />
+    <tag k='landuse' v='brownfield' />
+  </node>
+  <node id='-154' action='modify' visible='true' lat='11.746426660077914' lon='-59.66413252297697'>
+    <tag k='name' v='greenfield' />
+    <tag k='landuse' v='greenfield' />
+  </node>
+  <node id='-155' action='modify' visible='true' lat='10.778281622562828' lon='-59.66329341638292'>
+    <tag k='name' v='cemetery' />
+    <tag k='landuse' v='cemetery' />
+  </node>
+  <node id='-156' action='modify' visible='true' lat='10.558987979276605' lon='-59.673510632293656'>
+    <tag k='name' v='village_green' />
+    <tag k='landuse' v='village_green' />
+  </node>
+  <node id='-157' action='modify' visible='true' lat='10.310319587182159' lon='-59.663945490421696'>
+    <tag k='name' v='recreation_ground' />
+    <tag k='landuse' v='recreation_ground' />
+  </node>
+  <node id='-158' action='modify' visible='true' lat='9.055609124899473' lon='-61.547762437501056'>
+    <tag k='name' v='military' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-159' action='modify' visible='true' lat='8.728068070247632' lon='-61.54258234632316'>
+    <tag k='name' v='airfield' />
+    <tag k='military' v='airfield' />
+  </node>
+  <node id='-160' action='modify' visible='true' lat='14.569268664807336' lon='-59.70871086194105'>
     <tag k='name' v='landfill' />
     <tag k='landuse' v='landfill' />
   </node>
-  <node id='-146' action='modify' visible='true' lat='14.268253436987077' lon='-59.68799049722948'>
-    <tag k='name' v='basin' />
-    <tag k='landuse' v='basin' />
-  </node>
-  <node id='-147' action='modify' visible='true' lat='13.986942401156575' lon='-59.67763031487369'>
-    <tag k='name' v='reservoir' />
-    <tag k='landuse' v='reservoir' />
-  </node>
-  <node id='-148' action='modify' visible='true' lat='13.695221496584454' lon='-59.67802847474979'>
-    <tag k='name' v='forest' />
-    <tag k='landuse' v='forest' />
-  </node>
-  <node id='-149' action='modify' visible='true' lat='13.426158933516174' lon='-59.68674222819746'>
-    <tag k='name' v='allotments' />
-    <tag k='landuse' v='allotments' />
-  </node>
-  <node id='-150' action='modify' visible='true' lat='13.158973685219692' lon='-59.69829561091318'>
-    <tag k='name' v='residential' />
-    <tag k='landuse' v='residential' />
-  </node>
-  <node id='-151' action='modify' visible='true' lat='12.901789721723086' lon='-59.69730149049129'>
-    <tag k='name' v='retail' />
-    <tag k='landuse' v='retail' />
-  </node>
-  <node id='-152' action='modify' visible='true' lat='12.603125027038642' lon='-59.67618296590362'>
-    <tag k='name' v='commercial' />
-    <tag k='landuse' v='commercial' />
-  </node>
-  <node id='-153' action='modify' visible='true' lat='12.313942734080834' lon='-59.67518884548175'>
-    <tag k='name' v='industrial' />
-    <tag k='landuse' v='industrial' />
-  </node>
-  <node id='-154' action='modify' visible='true' lat='12.035741134084109' lon='-59.67469178527081'>
-    <tag k='name' v='brownfield' />
-    <tag k='landuse' v='brownfield' />
-  </node>
-  <node id='-155' action='modify' visible='true' lat='11.746426660077914' lon='-59.66413252297697'>
-    <tag k='name' v='greenfield' />
-    <tag k='landuse' v='greenfield' />
-  </node>
-  <node id='-156' action='modify' visible='true' lat='11.48785298864732' lon='-59.65357326068313'>
-    <tag k='name' v='cemetery' />
-    <tag k='landuse' v='cemetery' />
-  </node>
-  <node id='-157' action='modify' visible='true' lat='11.239398878261735' lon='-59.65407032089408'>
-    <tag k='name' v='village_green' />
-    <tag k='landuse' v='village_green' />
-  </node>
-  <node id='-158' action='modify' visible='true' lat='10.990730486167289' lon='-59.64450517902212'>
-    <tag k='name' v='recreation_ground' />
-    <tag k='landuse' v='recreation_ground' />
-  </node>
-  <node id='-159' action='modify' visible='true' lat='9.055609124899473' lon='-61.547762437501056'>
-    <tag k='name' v='military' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-160' action='modify' visible='true' lat='8.728068070247632' lon='-61.54258234632316'>
-    <tag k='name' v='airfield' />
-    <tag k='military' v='airfield' />
-  </node>
-  <node id='-161' action='modify' visible='true' lat='8.514147526408193' lon='-61.545172391912104'>
+  <node id='-161' action='modify' visible='true' lat='14.348782548548265' lon='-58.7786456709278'>
+    <tag k='name' v='cliff' />
+    <tag k='natural' v='cliff' />
+  </node>
+  <node id='-162' action='modify' visible='true' lat='8.514147526408193' lon='-61.545172391912104'>
     <tag k='name' v='bunker' />
     <tag k='military' v='bunker' />
   </node>
-  <node id='-162' action='modify' visible='true' lat='8.274378213869138' lon='-61.55424047357312'>
+  <node id='-163' action='modify' visible='true' lat='8.274378213869138' lon='-61.544520317873335'>
     <tag k='name' v='barracks' />
     <tag k='military' v='barracks' />
   </node>
-  <node id='-163' action='modify' visible='true' lat='8.02302275597842' lon='-61.545172391912104'>
+  <node id='-164' action='modify' visible='true' lat='8.052183223077783' lon='-61.545172391912104'>
     <tag k='name' v='danger_area' />
     <tag k='military' v='danger_area' />
   </node>
-  <node id='-164' action='modify' visible='true' lat='7.824312331632587' lon='-61.53461312961827'>
+  <node id='-165' action='modify' visible='true' lat='9.06717472163057' lon='-62.45182052690857'>
+    <tag k='name' v='county' />
+    <tag k='place' v='county' />
+  </node>
+  <node id='-166' action='modify' visible='true' lat='15.178836424433342' lon='-58.776055625338856'>
+    <tag k='name' v='spring' />
+    <tag k='natural' v='spring' />
+  </node>
+  <node id='-167' action='modify' visible='true' lat='15.498552498487225' lon='-58.78123571651675'>
+    <tag k='name' v='natural' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-168' action='modify' visible='true' lat='14.971843662536147' lon='-58.7786456709278'>
+    <tag k='name' v='peak' />
+    <tag k='natural' v='peak' />
+  </node>
+  <node id='-169' action='modify' visible='true' lat='12.634126821660344' lon='-58.76032147643235'>
+    <tag k='name' v='coastline' />
+    <tag k='natural' v='coastline' />
+  </node>
+  <node id='-170' action='modify' visible='true' lat='14.144458781919827' lon='-58.7786456709278'>
+    <tag k='name' v='scree' />
+    <tag k='natural' v='scree' />
+  </node>
+  <node id='-171' action='modify' visible='true' lat='13.928270445567895' lon='-58.77665743008404'>
+    <tag k='name' v='scrub' />
+    <tag k='natural' v='scrub' />
+  </node>
+  <node id='-172' action='modify' visible='true' lat='13.703078930238334' lon='-58.766098167790204'>
+    <tag k='name' v='fell' />
+    <tag k='natural' v='fell' />
+  </node>
+  <node id='-173' action='modify' visible='true' lat='7.85347279873195' lon='-61.54433328531806'>
     <tag k='name' v='range' />
     <tag k='military' v='range' />
   </node>
-  <node id='-165' action='modify' visible='true' lat='15.178836424433342' lon='-58.776055625338856'>
-    <tag k='name' v='spring' />
-    <tag k='natural' v='spring' />
-  </node>
-  <node id='-166' action='modify' visible='true' lat='15.498552498487225' lon='-58.78123571651675'>
-    <tag k='name' v='natural' />
-    <tag k='tourism' v='attraction' />
-  </node>
-  <node id='-167' action='modify' visible='true' lat='14.971843662536147' lon='-58.7786456709278'>
-    <tag k='name' v='peak' />
-    <tag k='natural' v='peak' />
-  </node>
-  <node id='-168' action='modify' visible='true' lat='14.747308932239555' lon='-58.7786456709278'>
-    <tag k='name' v='cliff' />
-    <tag k='natural' v='cliff' />
-  </node>
-  <node id='-169' action='modify' visible='true' lat='14.542985165611118' lon='-58.7786456709278'>
-    <tag k='name' v='scree' />
-    <tag k='natural' v='scree' />
-  </node>
-  <node id='-170' action='modify' visible='true' lat='14.326796829259186' lon='-58.77665743008404'>
-    <tag k='name' v='scrub' />
-    <tag k='natural' v='scrub' />
-  </node>
-  <node id='-171' action='modify' visible='true' lat='14.101605313929625' lon='-58.766098167790204'>
-    <tag k='name' v='fell' />
-    <tag k='natural' v='fell' />
-  </node>
-  <node id='-172' action='modify' visible='true' lat='13.876191236617759' lon='-58.766098167790204'>
-    <tag k='name' v='heath' />
-    <tag k='natural' v='heath' />
-  </node>
-  <node id='-173' action='modify' visible='true' lat='13.660818642761978' lon='-58.766098167790204'>
+  <node id='-174' action='modify' visible='true' lat='13.262292259070687' lon='-58.766098167790204'>
     <tag k='name' v='wood' />
     <tag k='natural' v='wood' />
   </node>
-  <node id='-174' action='modify' visible='true' lat='13.445249101993868' lon='-58.766098167790204'>
+  <node id='-175' action='modify' visible='true' lat='13.046722718302577' lon='-58.766098167790204'>
     <tag k='name' v='marsh' />
     <tag k='natural' v='marsh' />
   </node>
-  <node id='-175' action='modify' visible='true' lat='13.24859119821432' lon='-58.76032147643235'>
+  <node id='-176' action='modify' visible='true' lat='12.85006481452303' lon='-58.76032147643235'>
     <tag k='name' v='water' />
     <tag k='natural' v='water' />
   </node>
-  <node id='-176' action='modify' visible='true' lat='13.032653205351634' lon='-58.76032147643235'>
-    <tag k='name' v='coastline' />
-    <tag k='natural' v='coastline' />
-  </node>
-  <node id='-177' action='modify' visible='true' lat='12.607123746055352' lon='-58.7497622141385'>
+  <node id='-177' action='modify' visible='true' lat='14.559924363690381' lon='-58.77417820650728'>
+    <tag k='name' v='volcano' />
+    <tag k='natural' v='volcano' />
+  </node>
+  <node id='-178' action='modify' visible='true' lat='12.429265570601125' lon='-58.759824416221406'>
+    <tag k='name' v='mud' />
+    <tag k='natural' v='mud' />
+  </node>
+  <node id='-179' action='modify' visible='true' lat='12.286258156325172' lon='-57.898146301677485'>
+    <tag k='name' v='taxi' />
+    <tag k='amenity' v='taxi' />
+  </node>
+  <node id='-180' action='modify' visible='true' lat='9.817870671768294' lon='-62.46237978920239'>
+    <tag k='name' v='country' />
+    <tag k='place' v='country' />
+  </node>
+  <node id='-181' action='modify' visible='true' lat='10.982907066168545' lon='-59.678152686587524'>
+    <tag k='name' v='military' />
+    <tag k='landuse' v='military' />
+  </node>
+  <node id='-182' action='modify' visible='true' lat='11.235631114363022' lon='-59.65871237518795'>
+    <tag k='name' v='construction' />
+    <tag k='landuse' v='construction' />
+  </node>
+  <node id='-183' action='modify' visible='true' lat='9.505443399800829' lon='-61.53470242524696'>
+    <tag k='name' v='sub_station' />
+    <tag k='power' v='sub_station' />
+  </node>
+  <node id='-184' action='modify' visible='true' lat='14.764413122250945' lon='-58.77892268123787'>
+    <tag k='name' v='glacier' />
+    <tag k='natural' v='glacier' />
+  </node>
+  <node id='-185' action='modify' visible='true' lat='11.744472140842124' lon='-58.74976221413853'>
+    <tag k='name' v='land' />
+    <tag k='natural' v='land' />
+  </node>
+  <node id='-186' action='modify' visible='true' lat='9.348869677897953' lon='-62.45182052690857'>
+    <tag k='name' v='region' />
+    <tag k='place' v='region' />
+  </node>
+  <node id='-187' action='modify' visible='true' lat='11.99210828707474' lon='-58.749762214138514'>
+    <tag k='name' v='bay' />
+    <tag k='natural' v='bay' />
+  </node>
+  <node id='-188' action='modify' visible='true' lat='9.578237061014912' lon='-62.45182052690857'>
+    <tag k='name' v='state' />
+    <tag k='place' v='state' />
+  </node>
+  <node id='-189' action='modify' visible='true' lat='10.067744887673063' lon='-62.45182052690857'>
+    <tag k='name' v='continent' />
+    <tag k='place' v='continent' />
+  </node>
+  <node id='-190' action='modify' visible='true' lat='7.221206810350744' lon='-62.41030768886983'>
+    <tag k='name' v='island' />
+    <tag k='place' v='island' />
+  </node>
+  <node id='-191' action='modify' visible='true' lat='12.208597362364062' lon='-58.7497622141385'>
     <tag k='name' v='beach' />
     <tag k='natural' v='beach' />
   </node>
-  <node id='-178' action='modify' visible='true' lat='10.067744887673063' lon='-62.45182052690857'>
-    <tag k='name' v='continent' />
-    <tag k='place' v='continent' />
-  </node>
-  <node id='-179' action='modify' visible='true' lat='9.348869677897953' lon='-62.45182052690857'>
-    <tag k='name' v='region' />
-    <tag k='place' v='region' />
-  </node>
-  <node id='-180' action='modify' visible='true' lat='12.390634670766032' lon='-58.749762214138514'>
-    <tag k='name' v='bay' />
-    <tag k='natural' v='bay' />
-  </node>
-  <node id='-181' action='modify' visible='true' lat='9.817870671768294' lon='-62.46237978920239'>
-    <tag k='name' v='country' />
-    <tag k='place' v='country' />
-  </node>
-  <node id='-182' action='modify' visible='true' lat='11.926127657912964' lon='-58.749762214138514'>
-    <tag k='name' v='glacier' />
-    <tag k='natural' v='glacier' />
-  </node>
-  <node id='-183' action='modify' visible='true' lat='7.221206810350744' lon='-62.41030768886983'>
-    <tag k='name' v='island' />
-    <tag k='place' v='island' />
-  </node>
-  <node id='-184' action='modify' visible='true' lat='12.286258156325172' lon='-57.898146301677485'>
-    <tag k='name' v='taxi' />
-    <tag k='amenity' v='taxi' />
-  </node>
-  <node id='-185' action='modify' visible='true' lat='12.827791954292415' lon='-58.759824416221406'>
-    <tag k='name' v='mud' />
-    <tag k='natural' v='mud' />
-  </node>
-  <node id='-186' action='modify' visible='true' lat='9.578237061014912' lon='-62.45182052690857'>
-    <tag k='name' v='state' />
-    <tag k='place' v='state' />
-  </node>
-  <node id='-187' action='modify' visible='true' lat='12.142998524533414' lon='-58.74976221413853'>
-    <tag k='name' v='land' />
-    <tag k='natural' v='land' />
-  </node>
-  <node id='-188' action='modify' visible='true' lat='9.06717472163057' lon='-62.45182052690857'>
-    <tag k='name' v='county' />
-    <tag k='place' v='county' />
-  </node>
-  <node id='-189' action='modify' visible='true' lat='7.467083089281543' lon='-62.40751725726832'>
+  <node id='-192' action='modify' visible='true' lat='7.467083089281543' lon='-62.40751725726832'>
     <tag k='name' v='locality' />
     <tag k='place' v='locality' />
   </node>
+  <node id='-193' action='modify' visible='true' lat='11.673038120853464' lon='-54.94443686079097'>
+    <tag k='name' v='properties' />
+    <tag k='tourism' v='attraction' />
+  </node>
+  <node id='-194' action='modify' visible='true' lat='7.512811481344372' lon='-56.92734862354764'>
+    <tag k='name' v='fountain' />
+    <tag k='amenity' v='fountain' />
+  </node>
+  <node id='-195' action='modify' visible='true' lat='11.420314072658988' lon='-54.94443686079097'>
+    <tag k='mountain_pass' v='yes' />
+    <tag k='name' v='mountain_pass' />
+  </node>
+  <node id='-196' action='modify' visible='true' lat='13.67539019500971' lon='-55.95533305356887'>
+    <tag k='shop' v='kiosk' />
+    <tag k='name' v='kiosk' />
+  </node>
+  <node id='-197' action='modify' visible='true' lat='8.49454720702292' lon='-63.566214966502564'>
+    <tag k='railway' v='tram_stop' />
+    <tag k='name' v='tram_stop' />
+  </node>
+  <node id='-198' action='modify' visible='true' lat='10.895425664870455' lon='-56.89818815644828'>
+    <tag k='name' v='artwork' />
+    <tag k='tourism' v='artwork' />
+  </node>
+  <node id='-199' action='modify' visible='true' lat='10.584380682477253' lon='-61.53470242524696'>
+    <tag k='name' v='wastewater_plant' />
+    <tag k='man_made' v='wastewater_plant' />
+  </node>
+  <node id='-200' action='modify' visible='true' lat='11.459194695458137' lon='-59.65871237518795'>
+    <tag k='name' v='railway' />
+    <tag k='landuse' v='railway' />
+  </node>
 </osm>
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 518)
+++ /trunk/styles/standard/elemstyles.xml	(revision 519)
@@ -94,4 +94,11 @@
     </rule>
 
+	<rule>
+		<condition k="highway" v="living_street"/>
+		<line width="1" realwidth="3" colour="#c0c0c0"/> 
+        <scale_min>1</scale_min>
+        <scale_max>40000</scale_max>
+    </rule>
+
     <rule>
         <condition k="highway" v="service"/>
@@ -389,4 +396,12 @@
 		<condition k="waterway" v="weir" />
 		<icon annotate="true" src="nautical/weir.png" />
+        <line width="2" colour="#D8D8D8" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="waterway" v="dam" />
+        <line width="2" colour="#D8D8D8" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -409,4 +424,11 @@
 
 	<rule>
+		<condition k="railway" v="tram_stop" />
+		<icon annotate="true" src="transport/railway_small.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="railway" v="viaduct" />
 		<icon annotate="true" src="vehicle/viaduct.png" />
@@ -517,5 +539,5 @@
     <rule>
         <condition k="aeroway" v="helipad"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="transport/airport/helipad.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -557,4 +579,11 @@
 		<condition k="power" v="line" />
         <line width="1" colour="#eeeeee" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="power" v="sub_station" />
+		<icon annotate="true" src="misc/landmark/power.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -661,4 +690,19 @@
 	</rule>
 
+	<rule>
+		<condition k="man_made" v="pipeline" />
+        <line width="2" colour="#660000" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="man_made" v="wastewater_plant" />
+        <area colour="#D8D8D8" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--leisure tags -->
 	<rule>
@@ -1039,4 +1083,12 @@
 	</rule>
 
+	<rule>
+		<condition k="amenity" v="fountain"/>
+		<icon annotate="true" src="misc/landmark/spring.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--shop tags -->
 
@@ -1071,5 +1123,5 @@
 	<rule>
 		<condition k="shop" v="doityourself" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/diy_store.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1078,5 +1130,12 @@
 	<rule>
 		<condition k="shop" v="outdoor" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/sports/outdoor.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="kiosk" />
+		<icon annotate="true" src="shopping/kiosk.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1092,4 +1151,32 @@
 
 	<rule>
+		<condition k="tourism" v="hotel" />
+		<icon annotate="true" src="accommodation.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="motel" />
+		<icon annotate="true" src="accommodation/motel.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="guest_house" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="hostel" />
+		<icon annotate="true" src="accommodation/hostel.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="tourism" v="camp_site" />
 		<icon annotate="true" src="accommodation/camping.png" />
@@ -1126,32 +1213,4 @@
 	</rule>
 
-	<rule>
-		<condition k="tourism" v="hotel" />
-		<icon annotate="true" src="accommodation.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="tourism" v="motel" />
-		<icon annotate="true" src="accommodation/motel.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="tourism" v="guest_house" />
-		<icon annotate="true" src="misc/no_icon.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="tourism" v="hostel" />
-		<icon annotate="true" src="accommodation/hostel.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
     <rule>
         <condition k="tourism" v="attraction"/>
@@ -1161,4 +1220,11 @@
     </rule>
 
+    <rule>
+        <condition k="tourism" v="artwork"/>
+        <icon annotate="true" src="public/arts_centre.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
 <!--historic tags -->
 	<rule>
@@ -1193,11 +1259,4 @@
 		<condition k="historic" v="archaeological_site" />
 		<icon annotate="true" src="sightseeing/archaeological.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="historic" v="icon" />
-		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1254,5 +1313,5 @@
 		<condition k="landuse" v="forest"/>
 		<area colour="#b1efc8" />
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/landmark/trees.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1262,5 +1321,5 @@
 		<condition k="landuse" v="allotments"/>
 		<area colour="#b1e0c2" />
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/landmark/plant.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1316,4 +1375,28 @@
 
 	<rule>
+		<condition k="landuse" v="railway"/>
+		<area colour="#b1ec5c"/>
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="construction"/>
+		<area colour="#b1ec5c"/>
+		<icon src="misc/construction.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="military"/>
+		<area colour="#b1ec5c"/>
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="landuse" v="cemetery"/>
 		<area colour="#bde3cb"/>
@@ -1326,5 +1409,5 @@
 		<condition k="landuse" v="village_green"/>
 		<area colour="#b1e0c2" />
-		<icon src="misc/no_icon.png" />
+		<icon src="recreation/common.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1334,5 +1417,5 @@
 		<condition k="landuse" v="recreation_ground"/>
 		<area colour="#b1e0c2" />
-		<icon src="misc/no_icon.png" />
+		<icon src="recreation/common.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1366,5 +1449,5 @@
 	<rule>
 		<condition k="military" v="danger_area" />
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/danger.png" />
 		<area colour="#b62c2c"/>
         <scale_min>1</scale_min>
@@ -1396,4 +1479,19 @@
     
     <rule>
+        <condition k="natural" v="glacier"/>
+        <icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="#ffffff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="natural" v="volcano"/>
+        <icon annotate="true" src="misc/no_icon.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
         <condition k="natural" v="cliff"/>
 		<icon src="misc/no_icon.png" />
@@ -1437,5 +1535,5 @@
 	<rule>
         <condition k="natural" v="wood"/>
-		<icon src="misc/no_icon.png" />
+		<icon src="misc/landmark/trees.png" />
         <area colour="#008000" />
         <scale_min>1</scale_min>
@@ -1495,12 +1593,4 @@
 		<icon src="misc/no_icon.png" />
 		<area colour="#002f00"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-    <rule>
-		<condition k="natural" v="glacier"/>
-		<icon src="misc/no_icon.png" />
-		<area colour="#ffffff"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1841,4 +1931,11 @@
 <!--properties tags -->
 
+	<rule>
+		<condition k="mountain_pass" v="yes" />
+		<icon src="misc/landmark/mountain_pass.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--restrictions tags -->
 
@@ -1927,5 +2024,5 @@
 	<rule>
 		<condition k="place" v="island" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="places/island.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1985,11 +2082,4 @@
 
 	<rule>
-		<condition k="shop" v="kiosk" />
-		<icon annotate="true" src="vehicle/caution.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="shop" v="motorcycle" />
 		<icon annotate="true" src="vehicle/caution.png" />