Changeset 2079 in josm


Ignore:
Timestamp:
08.09.2009 00:10:11 (3 years ago)
Author:
Gubaer
Message:

fixed #3433: New conflict resolution with way combining prevents any combining

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2070 r2079  
    138138        // 
    139139        TagCollection wayTags = TagCollection.unionOfAllPrimitives(ways); 
    140         completeTagCollectionWithMissingTags(wayTags, ways); 
     140 
    141141 
    142142        // try to build a new way out of the combination of ways 
    … …  
    163163        modifiedTargetWay.setNodes(path); 
    164164 
     165        TagCollection completeWayTags = new TagCollection(wayTags); 
     166        completeTagCollectionWithMissingTags(completeWayTags, ways); 
     167 
    165168        CombineWaysConflictResolverDialog dialog = CombineWaysConflictResolverDialog.getInstance(); 
    166         dialog.getTagConflictResolverModel().populate(wayTags); 
     169        dialog.getTagConflictResolverModel().populate(completeWayTags); 
    167170        dialog.setTargetWay(targetWay); 
    168171        dialog.getRelationMemberConflictResolverModel().populate( 
Note: See TracChangeset for help on using the changeset viewer.