Changeset 15132 in josm

Timestamp:

2019-05-28T19:53:19+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17765: Move code for error "Area style way is not closed" to UnclosedWays
This simplifies the code. Method UnclosedWays.getCheckedKeys() is no longer needed
by any code in core or the plugins directory, but I did not dare to remove it.

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MultipolygonTest.java (modified) (5 diffs)
• UnclosedWays.java (modified) (4 diffs)

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
-import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -37 +36 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
@@ -62 +60 @@
     /** With the currently used mappaint style the style for inner way equals the multipolygon style */
     public static final int INNER_STYLE_MISMATCH = 1608;
-    /** Area style way is not closed */
-    public static final int NOT_CLOSED = 1609;
+    // no longer used: Area style way is not closed NOT_CLOSED = 1609
     /** No area style for multipolygon */
     public static final int NO_STYLE = 1610;
@@ -82 +79 @@
     private static final int FOUND_OUTSIDE = 2;
 
-    private final Set<String> keysCheckedByAnotherTest = new HashSet<>();
-
     /**
      * Constructs a new {@code MultipolygonTest}.
@@ -90 +85 @@
         super(tr("Multipolygon"),
                 tr("This test checks if multipolygons are valid."));
-    }
-
-    @Override
-    public void startTest(ProgressMonitor progressMonitor) {
-        super.startTest(progressMonitor);
-        keysCheckedByAnotherTest.clear();
-        for (Test t : OsmValidator.getEnabledTests(false)) {
-            if (t instanceof UnclosedWays) {
-                keysCheckedByAnotherTest.addAll(((UnclosedWays) t).getCheckedKeys());
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void endTest() {
-        keysCheckedByAnotherTest.clear();
-        super.endTest();
-    }
-
-    @Override
-    public void visit(Way w) {
-        if (!w.isArea() && ElemStyles.hasOnlyAreaElements(w)) {
-            List<Node> nodes = w.getNodes();
-            if (nodes.isEmpty()) return; // fix zero nodes bug
-            for (String key : keysCheckedByAnotherTest) {
-                if (w.hasKey(key)) {
-                    return;
-                }
-            }
-            errors.add(TestError.builder(this, Severity.WARNING, NOT_CLOSED)
-                    .message(tr("Area style way is not closed"))
-                    .primitives(w)
-                    .highlight(Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1)))
-                    .build());
-        }
     }
 

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

@@ -8 +8 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -17 +19 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 
 /**
@@ -156 +159 @@
         new UnclosedWaysBooleanCheck(1120, "building", marktr("building")),
         new UnclosedWaysBooleanCheck(1130, "area",     marktr("area")),
+        // 1131: Area style way is not closed
         // CHECKSTYLE.ON: SingleSpaceSeparator
     };
@@ -190 +194 @@
             }
         }
+        // code 1131: other area style ways
+        if (ElemStyles.hasOnlyAreaElements(w)) {
+            List<Node> nodes = w.getNodes();
+            if (nodes.isEmpty()) return; // fix zero nodes bug
+            errors.add(TestError.builder(this, Severity.WARNING, 1131)
+                    .message(tr("Unclosed way"), marktr("Area style way is not closed"), new Object())
+                    .primitives(w)
+                    .highlight(Arrays.asList(w.firstNode(), w.lastNode()))
+                    .build());
+        }
     }
 }