Changeset 33153 in osm for applications/editors


Ignore:
Timestamp:
2017-02-25T00:54:50+01:00 (8 years ago)
Author:
donvip
Message:

see #josm14374 - update to JOSM 11606

Location:
applications/editors/josm/plugins/merge-overlap
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/merge-overlap/build.xml

    r32680 r33153  
    44    <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="10580"/>
     6    <property name="plugin.main.version" value="11606"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

    r32471 r33153  
    11package mergeoverlap;
    22
    3 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.combineTigerTags;
     3import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.applyAutomaticTagConflictResolution;
    44import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing;
    55import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing;
    … …  
    544544
    545545        TagCollection completeWayTags = new TagCollection(wayTags);
    546         combineTigerTags(completeWayTags);
     546        applyAutomaticTagConflictResolution(completeWayTags);
    547547        normalizeTagCollectionBeforeEditing(completeWayTags, ways);
    548548        TagCollection tagsToEdit = new TagCollection(completeWayTags);
Note: See TracChangeset for help on using the changeset viewer.