Changeset 15628 in josm


Ignore:
Timestamp:
2020-01-02T22:34:59+01:00 (11 months ago)
Author:
GerdP
Message:

fix #18501 and #18495 : revert changes from r15617

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r15617 r15628  
    117117        ways = new LinkedHashSet<>(ways);
    118118        // remove incomplete ways
    119         ways.removeIf(w -> w.isIncomplete() || w.isOutsideDownloadArea());
     119        ways.removeIf(OsmPrimitive::isIncomplete);
    120120        // we need at least two ways
    121121        if (ways.size() < 2)
     
    326326        if (OsmUtils.isOsmCollectionEditable(selection)) {
    327327            for (OsmPrimitive osm : selection) {
    328                 if (osm instanceof Way && !osm.isIncomplete() && !((Way) osm).isOutsideDownloadArea()
    329                         && ++numWays >= 2) {
     328                if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {
    330329                    break;
    331330                }
Note: See TracChangeset for help on using the changeset viewer.