Ticket #18083: 18083.patch
File 18083.patch, 1.1 KB (added by , 6 years ago) |
---|
-
src/org/openstreetmap/josm/actions/CombineWayAction.java
116 116 // remove duplicates, preserving order 117 117 ways = new LinkedHashSet<>(ways); 118 118 // remove incomplete ways 119 ways.removeIf( OsmPrimitive::isIncomplete);119 ways.removeIf(w -> w.isIncomplete() || w.isOutsideDownloadArea()); 120 120 // we need at least two ways 121 121 if (ways.size() < 2) 122 122 return null; … … 325 325 int numWays = 0; 326 326 if (OsmUtils.isOsmCollectionEditable(selection)) { 327 327 for (OsmPrimitive osm : selection) { 328 if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) { 328 if (osm instanceof Way && !osm.isIncomplete() && !((Way) osm).isOutsideDownloadArea() 329 && ++numWays >= 2) { 329 330 break; 330 331 } 331 332 }