Index: /trunk/data_nodist/multipolygon.osm
===================================================================
--- /trunk/data_nodist/multipolygon.osm	(revision 7558)
+++ /trunk/data_nodist/multipolygon.osm	(revision 7559)
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
+<osm version='0.6' generator='JOSM' upload='false'>
   <node id='-1' action='modify' visible='true' lat='84.6886106638523' lon='-176.64410351355278' />
   <node id='-2' action='modify' visible='true' lat='84.40349147298387' lon='-178.57369583802236' />
@@ -116,5 +116,5 @@
   <node id='-114' action='modify' visible='true' lat='84.97960003985216' lon='-179.25656344911687' />
   <node id='-115' action='modify' visible='true' lat='84.87707549360687' lon='-178.07230447210404'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='01 : Basic test with untagged ways and area tagging inside relation' />
   </node>
@@ -241,5 +241,5 @@
   <node id='-236' action='modify' visible='true' lat='83.44139608276137' lon='-169.1057395083643' />
   <node id='-237' action='modify' visible='true' lat='83.72291011287005' lon='-177.88230504962021'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='02 : Basic test with tagged inner and outer ways and no area tagging inside relation (very old style)' />
   </node>
@@ -415,5 +415,5 @@
   <node id='-407' action='modify' visible='true' lat='81.5592943085351' lon='-135.7937382464369' />
   <node id='-408' action='modify' visible='true' lat='82.12337440601868' lon='-177.37326746053688'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='03 : Basic test with untagged outer ways and area tagging inside relation - inner ways have different tagging' />
   </node>
@@ -497,5 +497,5 @@
   <node id='-486' action='modify' visible='true' lat='79.89196812781788' lon='-148.76283292589136' />
   <node id='-487' action='modify' visible='true' lat='80.3532083008329' lon='-177.18326803805306'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='04 : Basic test with differnt tagged inner and outer ways and no area tagging inside relation' />
   </node>
@@ -549,5 +549,5 @@
   <node id='-535' action='modify' visible='true' lat='77.52077279880578' lon='-168.23719356429848' />
   <node id='-536' action='modify' visible='true' lat='78.30873406730237' lon='-177.86939149237105'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='05 : Other tests' />
   </node>
@@ -631,5 +631,5 @@
   <node id='-614' action='modify' visible='true' lat='68.9027512635695' lon='-171.36643553077883' />
   <node id='-615' action='modify' visible='true' lat='73.85422060455194' lon='-177.72270827519228'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='06 : Errors' />
   </node>
@@ -646,5 +646,5 @@
   <node id='-626' action='modify' visible='true' lat='73.34344402190429' lon='-176.98929218929837'>
     <tag k='name' v='01 - Unclosed outer way' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-627' action='modify' visible='true' lat='70.23364509468118' lon='-174.69125512016433' />
@@ -652,13 +652,13 @@
   <node id='-629' action='modify' visible='true' lat='73.30134799947216' lon='-161.3430823568962'>
     <tag k='name' v='02 - Unclosed inner ways' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-630' action='modify' visible='true' lat='73.16060825580873' lon='-146.22209244105048'>
     <tag k='name' v='03 - Mismatching way styles' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-631' action='modify' visible='true' lat='77.88521869203151' lon='-177.7716026809185'>
     <tag k='name' v='01 - Different way styles' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-632' action='modify' visible='true' lat='71.68453816086635' lon='-173.4688949770079' />
@@ -695,5 +695,5 @@
   <node id='-663' action='modify' visible='true' lat='73.3374609545726' lon='-132.4312631469622'>
     <tag k='name' v='04 - Mismatching way styles' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-664' action='modify' visible='true' lat='68.9193448225867' lon='-130.4829305641561' />
@@ -711,5 +711,5 @@
   <node id='-676' action='modify' visible='true' lat='73.35322798782545' lon='-118.45780461826098'>
     <tag k='name' v='05 - Wrong roles' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-677' action='modify' visible='true' lat='71.95749708632174' lon='-108.301602856825' />
@@ -719,8 +719,8 @@
   <node id='-681' action='modify' visible='true' lat='66.12453808241878' lon='-177.07882360188503'>
     <tag k='name' v='01 - Inner/Outer reversed' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-682' action='modify' visible='true' lat='67.50117546793662' lon='-177.37647047289784'>
-    <tag k='traffic_sign' v='city_limit' />
+    <tag k='place' v='city' />
     <tag k='name' v='07 : Geometry Errors' />
   </node>
@@ -742,5 +742,5 @@
   <node id='-698' action='modify' visible='true' lat='66.10947453924523' lon='-161.45236287371142'>
     <tag k='name' v='02 - Inner/Outer intersect' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-699' visible='true' lat='63.26489891310659' lon='-168.89353464903218' />
@@ -772,5 +772,5 @@
   <node id='-725' action='modify' visible='true' lat='73.36201070015693' lon='-105.26691894004932'>
     <tag k='name' v='06 - No outer way' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-726' visible='true' lat='72.43184818958737' lon='-102.3633390449238' />
@@ -804,5 +804,5 @@
   <node id='-754' action='modify' visible='true' lat='66.15190859709286' lon='-130.6444018410983'>
     <tag k='name' v='04 - Mixed geometry' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-755' visible='true' lat='63.855497881124926' lon='-125.77981173348789' />
@@ -812,5 +812,5 @@
   <node id='-759' action='modify' visible='true' lat='66.27142148050997' lon='-145.83370556069866'>
     <tag k='name' v='03 - Inner/Outer share way' />
-    <tag k='amenity' v='fuel' />
+    <tag k='natural' v='peak' />
   </node>
   <node id='-760' action='modify' visible='true' lat='60.770136222180014' lon='-158.92236447010234' />