Changeset 16302 in josm for trunk/src/org

Timestamp:

2020-04-15T07:58:00+02:00 (5 years ago)

Author:

GerdP

Message:

see #18863:split ways: false positive warnings about missing members
Correct and simplify additional check introduced with r16242 : order of "!" and "(" was wrong
There is no need to look at other members when the parents of the end nodes of the split-way are known.

File:

• trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -542 +542 @@
                                     direction = Direction.IRRELEVANT;
                                 }
-                                if (direction == Direction.UNKNOWN && (!way.firstNode().isOutsideDownloadArea()
-                                        || way.lastNode().isOutsideDownloadArea())) {
-                                    // check if any other complete way in the relation is connected to the way
-                                    // if so, the order of the relation is broken
-                                    for (int i = 0; i < r.getMembersCount(); i++) {
-                                        if (i >= ir - 1 && i <= ir + 1)
-                                            continue;
-                                        RelationMember rmTest = r.getMember(i);
-                                        if (rmTest.isWay() && !rmTest.getMember().isIncomplete() &&
-                                            (way.isFirstLastNode(rmTest.getWay().firstNode())
-                                                    || way.isFirstLastNode(rm.getWay().lastNode()))) {
-                                                direction = Direction.IRRELEVANT;
-                                                break;
-                                        }
-                                    }
+                                if (direction == Direction.UNKNOWN && !way.getDataSet().getDataSourceBounds().isEmpty()
+                                        && !(way.firstNode().isOutsideDownloadArea()
+                                                || way.lastNode().isOutsideDownloadArea())) {
+                                    // we know the connected ways, downloading more members will not help
+                                    direction = Direction.IRRELEVANT;
                                 }
                             }