Ignore:
Timestamp:
2014-01-06T12:27:11+01:00 (6 years ago)
Author:
simon04
Message:

fix #9544 - Skip nodes outside of download area for BarriersEntrances and WayConnectedToArea validation tests

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r6380 r6639  
    88import java.awt.event.ActionEvent;
    99import java.awt.event.KeyEvent;
    10 import java.awt.geom.Area;
    1110import java.util.ArrayList;
    1211import java.util.Collection;
     
    338337
    339338        // TODO: Only display this warning when nodes outside dataSourceArea are deleted
    340         Area dataSourceArea = Main.main.getCurrentDataSet().getDataSourceArea();
    341339        boolean ok = Command.checkAndConfirmOutlyingOperation("joinarea", tr("Join area confirmation"),
    342340                trn("The selected way has nodes outside of the downloaded data region.",
     
    347345                    + tr("Please abort if you are not sure"),
    348346                tr("The selected area is incomplete. Continue?"),
    349                 dataSourceArea, allNodes, null);
     347                allNodes, null);
    350348        if(!ok) return;
    351349
  • trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

    r6411 r6639  
    4949
    5050    protected boolean confirmWayWithNodesOutsideBoundingBox(List<? extends OsmPrimitive> primitives) {
    51         return DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getEditLayer(), primitives, null);
     51        return DeleteCommand.checkAndConfirmOutlyingDelete(primitives, null);
    5252    }
    5353
  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r6507 r6639  
    438438                        + "This will cause problems because you don''t see the real object."
    439439                        + "<br>" + "Do you really want to unglue?"),
    440                 getEditLayer().data.getDataSourceArea(), primitives, null);
     440                primitives, null);
    441441    }
    442442}
Note: See TracChangeset for help on using the changeset viewer.