Index: trunk/nodist/data/multipolygon.osm
===================================================================
--- trunk/nodist/data/multipolygon.osm	(revision 16015)
+++ trunk/nodist/data/multipolygon.osm	(revision 16406)
@@ -3754,4 +3754,5 @@
     <member type='way' ref='-41419' role='outer' />
     <member type='way' ref='-41421' role='outer' />
+    <tag k='josm_error_codes' v='1606,1610,1617' />
     <tag k='name' v='old style' />
     <tag k='type' v='multipolygon' />
@@ -3784,4 +3785,5 @@
     <member type='way' ref='-41585' role='inner' />
     <member type='way' ref='-41809' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 1 (02)' />
     <tag k='type' v='multipolygon' />
@@ -3800,4 +3802,5 @@
     <member type='way' ref='-41667' role='outer' />
     <member type='way' ref='-41727' role='inner' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 3 (02)' />
     <tag k='type' v='multipolygon' />
@@ -3848,4 +3851,5 @@
     <member type='way' ref='-41575' role='inner' />
     <member type='way' ref='-41545' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 2 (04)' />
     <tag k='type' v='multipolygon' />
@@ -3857,4 +3861,5 @@
     <member type='way' ref='-41761' role='inner' />
     <member type='way' ref='-41655' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 5 (02)' />
     <tag k='type' v='multipolygon' />
@@ -3864,4 +3869,5 @@
     <member type='way' ref='-41473' role='inner' />
     <member type='way' ref='-41671' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 2 (02)' />
     <tag k='type' v='multipolygon' />
@@ -3902,4 +3908,5 @@
     <member type='way' ref='-41567' role='inner' />
     <member type='way' ref='-41495' role='inner' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 6 (02)' />
     <tag k='type' v='multipolygon' />
@@ -3913,5 +3920,5 @@
     <member type='way' ref='-41659' role='outer' />
     <member type='way' ref='-41651' role='outer' />
-    <tag k='josm_error_codes' v='1606,1617' />
+    <tag k='josm_error_codes' v='1606,1610,1617' />
     <tag k='name' v='07/04 - Mixed Geometry' />
     <tag k='type' v='multipolygon' />
@@ -3979,4 +3986,5 @@
     <member type='way' ref='-41845' role='outer' />
     <member type='way' ref='-41769' role='inner' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 7 (04) Inner' />
     <tag k='type' v='multipolygon' />
@@ -3993,4 +4001,5 @@
     <member type='way' ref='-41741' role='inner' />
     <member type='way' ref='-41447' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 1 (04)' />
     <tag k='type' v='multipolygon' />
@@ -4002,4 +4011,5 @@
     <member type='way' ref='-41753' role='outer' />
     <member type='way' ref='-41521' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 5 (04)' />
     <tag k='type' v='multipolygon' />
@@ -4021,5 +4031,5 @@
     <member type='way' ref='-41737' role='' />
     <member type='relation' ref='-42089' role='' />
-    <tag k='josm_error_codes' v='1601,1602' />
+    <tag k='josm_error_codes' v='1601,1602,1610' />
     <tag k='name' v='06/05 - wrong roles' />
     <tag k='type' v='multipolygon' />
@@ -4050,4 +4060,5 @@
     <member type='way' ref='-41787' role='outer' />
     <member type='way' ref='-41839' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 6 (04) Inner' />
     <tag k='type' v='multipolygon' />
@@ -4064,4 +4075,5 @@
     <member type='way' ref='-41653' role='inner' />
     <member type='way' ref='-41833' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 8 (04) Inner' />
     <tag k='type' v='multipolygon' />
@@ -4088,4 +4100,5 @@
     <member type='way' ref='-41543' role='outer' />
     <member type='way' ref='-41477' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 6 (04)' />
     <tag k='type' v='multipolygon' />
@@ -4095,4 +4108,5 @@
     <member type='way' ref='-41687' role='outer' />
     <member type='way' ref='-41769' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 7 (04)' />
     <tag k='type' v='multipolygon' />
@@ -4101,4 +4115,5 @@
     <member type='way' ref='-41819' role='outer' />
     <member type='way' ref='-41439' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 4 (02)' />
     <tag k='type' v='multipolygon' />
@@ -4133,4 +4148,5 @@
     <member type='way' ref='-41801' role='inner' />
     <member type='way' ref='-41437' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 7 (02)' />
     <tag k='type' v='multipolygon' />
@@ -4143,5 +4159,5 @@
     <member type='way' ref='-41777' role='outer' />
     <tag k='comment' v='For this test the display style depends on the order of ways and is unpredictable' />
-    <tag k='josm_error_codes' v='1607' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='06/04 - Mismatching way styles' />
     <tag k='type' v='multipolygon' />
@@ -4160,4 +4176,5 @@
     <member type='way' ref='-41711' role='outer' />
     <member type='way' ref='-41765' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 5 (04) inner' />
     <tag k='type' v='multipolygon' />
@@ -4182,4 +4199,5 @@
     <member type='way' ref='-41493' role='outer' />
     <member type='way' ref='-41457' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 4 (04)' />
     <tag k='type' v='multipolygon' />
@@ -4205,4 +4223,5 @@
     <member type='way' ref='-41505' role='outer' />
     <member type='way' ref='-41459' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 8 (02)' />
     <tag k='type' v='multipolygon' />
@@ -4229,4 +4248,5 @@
     <member type='way' ref='-41515' role='outer' />
     <member type='way' ref='-41657' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 3 (04)' />
     <tag k='type' v='multipolygon' />
@@ -4244,4 +4264,5 @@
     <member type='way' ref='-41597' role='outer' />
     <member type='way' ref='-41653' role='outer' />
+    <tag k='josm_error_codes' v='1610' />
     <tag k='name' v='Example 8 (04)' />
     <tag k='type' v='multipolygon' />