Changeset 2594 in josm for trunk


Ignore:
Timestamp:
2009-12-08T08:08:53+01:00 (12 years ago)
Author:
jttt
Message:

Fix #4124 relation - download incomplete results in error

Location:
trunk/src/org/openstreetmap/josm/data/osm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

    r2578 r2594  
    4848    private void checkCompleteWaysWithIncompleteNodes() {
    4949        for (Way way:dataSet.getWays()) {
    50             if (!way.isIncomplete()) {
     50            if (way.isUsable()) {
    5151                for (Node node:way.getNodes()) {
    5252                    if (node.isIncomplete()) {
    53                         writer.println(String.format("%s is complete but contains incomplete node '%s'", way, node));
     53                        writer.println(String.format("%s is usable but contains incomplete node '%s'", way, node));
    5454                    }
    5555                }
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

    r2590 r2594  
    170170    public void drawWay(Way w, int fillAreas) {
    171171        if(w.getNodesCount() < 2)
     172            return;
     173
     174        if (w.hasIncompleteNodes())
    172175            return;
    173176
     
    13111314    boolean drawable(OsmPrimitive osm)
    13121315    {
    1313         return osm.isUsable() && !osm.isFiltered();
     1316        return !osm.isDeleted() && !osm.isIncomplete() && !osm.isFiltered();
    13141317    }
    13151318
     
    14121415        /*** SELECTED  ***/
    14131416        for (final OsmPrimitive osm : data.getSelected()) {
    1414             if (!osm.isIncomplete() && !osm.isDeleted() && !(osm instanceof Node)
    1415                     && osm.mappaintDrawnCode != paintid
     1417            if (osm.isUsable() && !(osm instanceof Node) && osm.mappaintDrawnCode != paintid
    14161418            ) {
    14171419                osm.visit(new AbstractVisitor() {
Note: See TracChangeset for help on using the changeset viewer.