Changeset 2594 in josm for trunk/src/org

Timestamp:

2009-12-08T08:08:53+01:00 (15 years ago)

Author:

jttt

Message:

Fix #4124 relation - download incomplete results in error

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DatasetConsistencyTest.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

@@ -48 +48 @@
     private void checkCompleteWaysWithIncompleteNodes() {
         for (Way way:dataSet.getWays()) {
-            if (!way.isIncomplete()) {
+            if (way.isUsable()) {
                 for (Node node:way.getNodes()) {
                     if (node.isIncomplete()) {
-                        writer.println(String.format("%s is complete but contains incomplete node '%s'", way, node));
+                        writer.println(String.format("%s is usable but contains incomplete node '%s'", way, node));
                     }
                 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -170 +170 @@
     public void drawWay(Way w, int fillAreas) {
         if(w.getNodesCount() < 2)
+            return;
+
+        if (w.hasIncompleteNodes())
             return;
 
@@ -1311 +1314 @@
     boolean drawable(OsmPrimitive osm)
     {
-        return osm.isUsable() && !osm.isFiltered();
+        return !osm.isDeleted() && !osm.isIncomplete() && !osm.isFiltered();
     }
 
@@ -1412 +1415 @@
         /*** SELECTED  ***/
         for (final OsmPrimitive osm : data.getSelected()) {
-            if (!osm.isIncomplete() && !osm.isDeleted() && !(osm instanceof Node)
-                    && osm.mappaintDrawnCode != paintid
+            if (osm.isUsable() && !(osm instanceof Node) && osm.mappaintDrawnCode != paintid
             ) {
                 osm.visit(new AbstractVisitor() {