Changeset 12890 in osm for applications

Timestamp:

2009-01-03T23:00:06+01:00 (16 years ago)

Author:

stoecker

Message:

fixed #1487

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java (modified) (4 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java

@@ -4 +4 @@
 
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.validator.Severity;
@@ -29 +33 @@
     /** One node way error */
     protected static final int ONE_NODE_WAY = 304;
+
+    private LinkedList<Way> multipolygonways;
 
     /** Ways that must have a name */
@@ -79 +85 @@
         }
 
-        if(!w.tagged)
+        if(!w.tagged && !multipolygonways.contains(w))
         {
             errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w) );
@@ -93 +99 @@
         }
 
+    }
+
+    @Override
+    public void startTest()
+    {
+        multipolygonways = new LinkedList<Way>();
+        for (final Relation r : Main.ds.relations)
+        {
+            if(!r.deleted && !r.incomplete && r.keys != null
+            && "multipolygon".equals(r.keys.get("type")))
+            {
+                for (RelationMember m : r.members)
+                {
+                    if(m.member != null && m.member instanceof Way &&
+                    !m.member.deleted && !m.member.incomplete
+                    && !m.member.tagged)
+                        multipolygonways.add((Way)m.member);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void endTest()
+    {
+        multipolygonways = null;
     }