Ignore:
Timestamp:
2010-12-05T17:56:01+01:00 (9 years ago)
Author:
bastiK
Message:

fixed #4742 - validator: do not warn about deleting a "out-of-downloaded-area node" with id:0 when repairing "doubled nodes"

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

    r3674 r3700  
    375375        }
    376376
    377         if(checkAndConfirmOutlyingDeletes(nodes))
     377        if(checkAndConfirmOutlyingDeletes(nodes, target))
    378378            return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
    379379
     
    390390     * Request confirmation if he is.
    391391     */
    392     private static boolean checkAndConfirmOutlyingDeletes(LinkedHashSet<Node> del) {
     392    private static boolean checkAndConfirmOutlyingDeletes(LinkedHashSet<Node> del, Node ignore) {
    393393        Area a = Main.main.getCurrentDataSet().getDataSourceArea();
    394394        if (a != null) {
    395395            for (OsmPrimitive osm : del) {
    396                 if (osm instanceof Node && !osm.isNew()) {
     396                if (osm instanceof Node && !osm.isNew() && osm != ignore) {
    397397                    Node n = (Node) osm;
    398398                    if (!a.contains(n.getCoor())) {
Note: See TracChangeset for help on using the changeset viewer.