Changeset 17761 in josm

Timestamp:

2021-04-12T21:33:48+02:00 (4 years ago)

Author:

GerdP

Message:

see #20729:Alert user if validation action is performed with data filters enabled

• replace isDrawable() by more appropriate methods to make results of validator independent of filter settings

TODO: use MultipolygonCache.get() instead of new Multipolygon() in more places to improve performance.

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/visitor/paint/relations/Multipolygon.java (modified) (1 diff)
• validation/tests/LongSegment.java (modified) (1 diff)
• validation/tests/UnconnectedWays.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -514 +514 @@
             if (m.getMember().isIncomplete()) {
                 this.incomplete = true;
-            } else if (m.getMember().isDrawable() && m.isWay()) {
+            } else if (!m.getMember().isDeleted() && m.isWay()) {
                 Way w = m.getWay();
 
-                if (w.getNodesCount() < 2) {
+                if (!w.hasOnlyLocatableNodes() || w.getNodesCount() < 2) {
                     continue;
                 }

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

@@ -136 +136 @@
     private static boolean isUsableNode(OsmPrimitive p) {
         // test changed nodes - ways referred by them may not be checked automatically.
-        return p instanceof Node && p.isDrawable();
+        return p instanceof Node && ((Node) p).isLatLonKnown();
     }
 

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

@@ -595 +595 @@
             Node a = w.getNode(i-1);
             Node b = w.getNode(i);
-            if (a.isDrawable() && b.isDrawable()) {
+            if (a.isLatLonKnown() && b.isLatLonKnown()) {
                 MyWaySegment ws = new MyWaySegment(w, a, b, concersArea);
                 ret.add(ws);