Changeset 5352 in josm for trunk

Timestamp:

2012-07-19T21:54:10+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7874 - do not warn about "untagged ways" that are relation members with role "outer", "inner", "perimeter", "edge" or "outline"

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -5 +5 @@
 
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
@@ -11 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -39 +39 @@
     protected static final int COMMENTED_WAY = 306;
 
-    private LinkedList<Way> multipolygonways;
+    private Set<Way> waysUsedInRelations;
 
     /** Ways that must have a name */
@@ -51 +51 @@
         NAMED_WAYS.add( "residential" );
         NAMED_WAYS.add( "pedestrian" ); ;
+    }
+    
+    /** Whitelist of roles allowed to reference an untagged way */
+    public static final Set<String> WHITELIST = new HashSet<String>();
+    static {
+        WHITELIST.add( "outer" );
+        WHITELIST.add( "inner" );
+        WHITELIST.add( "perimeter" );
+        WHITELIST.add( "edge" );
+        WHITELIST.add( "outline" );
     }
 
@@ -93 +103 @@
         }
 
-        if (!w.isTagged() && !multipolygonways.contains(w)) {
+        if (!w.isTagged() && !waysUsedInRelations.contains(w)) {
             if (w.hasKeys()) {
                 errors.add(new TestError(this, Severity.WARNING, tr("Untagged ways (commented)"), COMMENTED_WAY, w));
@@ -111 +121 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
-        multipolygonways = new LinkedList<Way>();
+        waysUsedInRelations = new HashSet<Way>();
         for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
-            if (r.isUsable() && r.isMultipolygon()) {
+            if (r.isUsable()) {
                 for (RelationMember m : r.getMembers()) {
-                    if (m.getMember() != null && m.getMember() instanceof Way &&
-                            m.getMember().isUsable() && !m.getMember().isTagged()) {
-                        multipolygonways.add((Way)m.getMember());
+                    if (r.isMultipolygon() || WHITELIST.contains(m.getRole())) {
+                        OsmPrimitive member = m.getMember();
+                        if (member != null && member instanceof Way && member.isUsable() && !member.isTagged()) {
+                            waysUsedInRelations.add((Way)member);
+                        }
                     }
                 }
@@ -126 +138 @@
     @Override
     public void endTest() {
-        multipolygonways = null;
+        waysUsedInRelations = null;
         super.endTest();
     }