Changeset 19022 in josm

Timestamp:

2024-03-28T09:29:34+01:00 (6 weeks ago)

Author:

GerdP

Message:

see #23305 and #23555:
-revert most of the changes in r18988, it caused too many problems with plugins which relied on the old behaviour

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• CombinePrimitiveResolverDialog.java (modified) (4 diffs)
• TagConflictResolverModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -17 +17 @@
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -47 +46 @@
 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;
@@ -519 +517 @@
         tagModel.populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues(), false);
         relModel.populate(parentRelations, primitives, false);
-        if (Config.getPref().getBoolean("combine-conflict-precise", true)) {
-            tagModel.prepareDefaultTagDecisions(getResolvableKeys(tagsOfPrimitives.getKeys(), primitives));
-        } else {
-            tagModel.prepareDefaultTagDecisions(false);
-        }
+        tagModel.prepareDefaultTagDecisions(false);
         relModel.prepareDefaultRelationDecisions(false);
 
@@ -649 +643 @@
     }
 
-    /**
-     * 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<String> getResolvableKeys(Set<String> keysToDecide, Collection<? extends OsmPrimitive> primitives) {
-        Set<String> 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<String> 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() {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -293 +293 @@
 
     /**
-     * Prepare the default decisions for the current model.
-     * @param decidedKeys set of tag keys for which the first value should be used
-     * @since 18988
-     */
-    public void prepareDefaultTagDecisions(Set<String> decidedKeys) {
-        for (MultiValueResolutionDecision decision : decisions.values()) {
-            if (!decidedKeys.contains(decision.getKey()))
-                continue;
-            List<String> 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.