Ticket #9104: 9104_1.patch

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

@@ -281 +281 @@
 
     protected void prepareDefaultTagDecisions() {
         TagConflictResolverModel model = getTagConflictResolverModel();
-        for (int i = 0; i < model.getRowCount(); i++) {
-            MultiValueResolutionDecision decision = model.getDecision(i);
-            List<String> values = decision.getValues();
-            values.remove("");
-            if (values.size() == 1) {
-                decision.keepOne(values.get(0));
-            } else {
-                decision.keepAll();
-            }
-        }
+        model.prepareDefaultTagDecisions();
         model.rebuild();
     }
 

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

@@ -257 +257 @@
      *
      */
     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("");
@@ -266 +270 @@
                 decision.keepAll();
             }
         }
+        */
         rebuild();
     }