Changeset 15628 in josm

Timestamp:

2020-01-02T22:34:59+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18501 and #18495 : revert changes from r15617

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -117 +117 @@
         ways = new LinkedHashSet<>(ways);
         // remove incomplete ways
-        ways.removeIf(w -> w.isIncomplete() || w.isOutsideDownloadArea());
+        ways.removeIf(OsmPrimitive::isIncomplete);
         // we need at least two ways
         if (ways.size() < 2)
@@ -326 +326 @@
         if (OsmUtils.isOsmCollectionEditable(selection)) {
             for (OsmPrimitive osm : selection) {
-                if (osm instanceof Way && !osm.isIncomplete() && !((Way) osm).isOutsideDownloadArea()
-                        && ++numWays >= 2) {
+                if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {
                     break;
                 }