Changeset 6802 in josm for trunk

Timestamp:

2014-02-02T22:11:09+01:00 (11 years ago)

Author:

simon04

Message:

fix #9655 - Merge operations loosing tags (regression of r6770)

Drawback: when combining highway=X with highway=X tunnel=yes, tunnel=yes is auto selected for the conflict resolution (as it was before r6770.

Location:

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

Files:

• CombinePrimitiveResolverDialog.java (modified) (2 diffs)
• RelationMemberConflictResolverModel.java (modified) (1 diff)
• TagConflictResolverModel.java (modified) (1 diff)

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

@@ -234 +234 @@
     }
 
+    /**
+     * Replies true if all tag and relation member conflicts have been decided.
+     *
+     * @return true if all tag and relation member conflicts have been decided; false otherwise
+     */
+    public boolean isResolvedCompletely() {
+        return getTagConflictResolverModel().isResolvedCompletely()
+                && getRelationMemberConflictResolverModel().isResolvedCompletely();
+    }
+
     protected List<Command> buildTagChangeCommand(OsmPrimitive primitive, TagCollection tc) {
         LinkedList<Command> cmds = new LinkedList<Command>();
@@ -517 +527 @@
 
         // Resolve tag conflicts if necessary
-        if (!completeWayTags.isApplicableToPrimitive() || !parentRelations.isEmpty()) {
+        if (!dialog.isResolvedCompletely()) {
             dialog.setVisible(true);
             if (dialog.isCanceled()) {

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

@@ -37 +37 @@
     private int numConflicts;
     private PropertyChangeSupport support;
+
+    /**
+     * Replies true if each {@link MultiValueResolutionDecision} is decided.
+     *
+     * @return true if each {@link MultiValueResolutionDecision} is decided; false
+     * otherwise
+     */
+    public boolean isResolvedCompletely() {
+        return numConflicts == 0;
+    }
 
     /**

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

@@ -258 +258 @@
      */
     public void prepareDefaultTagDecisions() {
-        // Do not suggest to keep all values in order to reduce the wrong usage of semicolon values, see #9104!
-        // Do not suggest to keep the single value in order to avoid long highways to become tunnels+bridges+...
-
-        /*
         for (MultiValueResolutionDecision decision: decisions.values()) {
             List<String> values = decision.getValues();
             values.remove("");
             if (values.size() == 1) {
+                // TODO: Do not suggest to keep the single value in order to avoid long highways to become tunnels+bridges+... (only if both primitives are tagged)
                 decision.keepOne(values.get(0));
             } else {
-                decision.keepAll();
-            }
-        }
-        */
+                // Do not suggest to keep all values in order to reduce the wrong usage of semicolon values, see #9104!
+                //decision.keepAll();
+            }
+        }
         rebuild();
     }