Changeset 15617 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2019-12-26T08:59:06+01:00 (4 years ago)

Author:

GerdP

Message:

fix #18083: Combine way: No warning about data outside of download area
Ignore ways with nodes outside download area so that action is disabled when the selection doesn't contain enough "good" ways.

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(OsmPrimitive::isIncomplete);
+        ways.removeIf(w -> w.isIncomplete() || w.isOutsideDownloadArea());
         // 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() && ++numWays >= 2) {
+                if (osm instanceof Way && !osm.isIncomplete() && !((Way) osm).isOutsideDownloadArea()
+                        && ++numWays >= 2) {
                     break;
                 }