Changeset 33153 in osm for applications/editors/josm/plugins/merge-overlap/src

Timestamp:

2017-02-25T00:54:50+01:00 (8 years ago)

Author:

donvip

Message:

see #josm14374 - update to JOSM 11606

File:

• applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package mergeoverlap;
 
-import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.combineTigerTags;
+import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.applyAutomaticTagConflictResolution;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing;
@@ -544 +544 @@
 
         TagCollection completeWayTags = new TagCollection(wayTags);
-        combineTigerTags(completeWayTags);
+        applyAutomaticTagConflictResolution(completeWayTags);
         normalizeTagCollectionBeforeEditing(completeWayTags, ways);
         TagCollection tagsToEdit = new TagCollection(completeWayTags);