Changeset 9192 in josm for trunk/src/org

Timestamp:

2015-12-28T12:09:19+01:00 (9 years ago)

Author:

simon04

Message:

fix #12091 - Merging of nodes show conflict in case that one node is part of a relation

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (1 diff)

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

@@ -199 +199 @@
      */
     public void prepareDefaultRelationDecisions() {
+
+        if (Utils.forAll(primitives, OsmPrimitive.nodePredicate)) {
+            final Collection<OsmPrimitive> primitivesInDecisions = new HashSet<>();
+            for (final RelationMemberConflictDecision i : decisions) {
+                primitivesInDecisions.add(i.getOriginalPrimitive());
+            }
+            if (primitivesInDecisions.size() == 1) {
+                for (final RelationMemberConflictDecision i : decisions) {
+                    i.decide(RelationMemberConflictDecisionType.KEEP);
+                }
+                refresh();
+                return;
+            }
+        }
 
         for (final Relation relation : relations) {