Index: src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 18982) +++ src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (working copy) @@ -16,6 +16,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -45,6 +46,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.AutoAdjustingSplitPane; +import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; @@ -516,7 +518,11 @@ tagModel.populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues(), false); relModel.populate(parentRelations, primitives, false); - tagModel.prepareDefaultTagDecisions(false); + if (Config.getPref().getBoolean("combine-conflict-precise", true)) { + tagModel.prepareDefaultTagDecisions(getResolvableKeys(tagsOfPrimitives.getKeys(), primitives)); + } else { + tagModel.prepareDefaultTagDecisions(false); + } relModel.prepareDefaultRelationDecisions(false); if (tagModel.isResolvedCompletely() && relModel.isResolvedCompletely()) { @@ -589,7 +595,7 @@ DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(parentRelations, 20)); if (!ConditionalOptionPaneUtil.showConfirmationDialog( - "combine_tags", + "combine_relation_member", MainApplication.getMainFrame(), "" + msg + "", tr("Combine confirmation"), @@ -642,6 +648,42 @@ return tr("{0} ({1})", key, values); } + /** + * See #23305: Find those tag keys for which no conflict exists. + * @param keysToDecide the keys of tags which might be shown in the conflict dialog + * @param primitives the collection of primitives + * @return the keys which can be resolved using the only available value + */ + private static Set getResolvableKeys(Set keysToDecide, Collection primitives) { + Set easyKeys = new HashSet<>(); + // determine the number of objects which have any of the tags which require a decision + int countTagged = 0; + for (OsmPrimitive p : primitives) { + for (String key : keysToDecide) { + if (p.hasTag(key)) { + ++countTagged; + break; + } + } + } + for (String key : keysToDecide) { + Set values = new HashSet<>(); + int num = 0; + for (OsmPrimitive p : primitives) { + String val = p.get(key); + if (val != null) { + num++; + values.add(val); + } + } + if (values.size() == 1 && num == countTagged) { + // there is only one value and all tagged objects have that value -> easy to solve + easyKeys.add(key); + } + } + return easyKeys; + } + @Override public void dispose() { setTargetPrimitive(null, false); Index: src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 18982) +++ src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (working copy) @@ -275,7 +275,7 @@ /** * Prepare the default decisions for the current model * @param fireEvent {@code true} to call {@code fireTableDataChanged} (can be a slow operation) - * @since 11626 + * @since 11627 */ void prepareDefaultTagDecisions(boolean fireEvent) { for (MultiValueResolutionDecision decision: decisions.values()) { @@ -292,6 +292,23 @@ } /** + * Prepare the default decisions for the current model. + * @param decidedKeys set of tag keys for which the first value should be used + * @since xxx + */ + public void prepareDefaultTagDecisions(Set decidedKeys) { + for (MultiValueResolutionDecision decision : decisions.values()) { + if (!decidedKeys.contains(decision.getKey())) + continue; + List values = decision.getValues(); + if (!values.isEmpty()) { + decision.keepOne(values.iterator().next()); + } + } + rebuild(false); + } + + /** * Returns the set of keys in conflict. * @return the set of keys in conflict. * @since 6616