Ticket #14374: plugin.diff

File plugin.diff, 3.0 KB (added by Tyndare, 8 years ago)

[PATCH] for plugins

  • plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

     
    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;
    66import static org.openstreetmap.josm.tools.I18n.tr;
    … …  
    543543        modifiedTargetWay.setNodes(path);
    544544
    545545        TagCollection completeWayTags = new TagCollection(wayTags);
    546         combineTigerTags(completeWayTags);
     546        applyAutomaticTagConflictResolution(completeWayTags);
    547547        normalizeTagCollectionBeforeEditing(completeWayTags, ways);
    548548        TagCollection tagsToEdit = new TagCollection(completeWayTags);
    549549        completeTagCollectionForEditing(tagsToEdit);

  • plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java

     
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.plugins.opendata.core.datasets;
    33
    4 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.combineTigerTags;
    54import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing;
    65import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing;
    76
    … …  
    2221import org.openstreetmap.josm.data.osm.TagCollection;
    2322import org.openstreetmap.josm.data.osm.Way;
    2423import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
     24import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil;
    2525import org.openstreetmap.josm.tools.UserCancelException;
    2626
    2727// FIXME: Try to refactor CombineWayAction instead of using this class
    … …  
    125125        modifiedTargetWay.setNodes(path);
    126126
    127127        TagCollection completeWayTags = new TagCollection(wayTags);
    128         combineTigerTags(completeWayTags);
     128        TagConflictResolutionUtil.applyAutomaticTagConflictResolution(completeWayTags);
    129129        normalizeTagCollectionBeforeEditing(completeWayTags, ways);
    130130        TagCollection tagsToEdit = new TagCollection(completeWayTags);
    131131        completeTagCollectionForEditing(tagsToEdit);