Changeset 18988 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

Timestamp:

2024-02-16T11:13:51+01:00 (3 months ago)

Author:

GerdP

Message:

fix #23305: conflict detection not working for combine way with one null and one tag set
(23305-alt.patch)

• adds code to check if a conflict exists where one or more tagged ways don't have the same tag value and - if so - show the conflict dialog.
• adds a preference combine-conflict-precise . If set to false the old behaviour is restored.
• changes the preference for the non-expert relation member ship warning popup from combine_tags to combine_relation_member, so that both dialogs have separate settings

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) (2 diffs)

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

@@ -276 +276 @@
      * 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) {
@@ -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 xxx
+     */
+    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.