Ticket #18675: 18675.patch

src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -62 +62 @@
     private DataSet ds;
     private final transient List<Relation> addedRelations = new LinkedList<>();
     private final boolean addUndoRedo;
+    private boolean tagConflictsResolved;
 
     /**
      * This helper class describes join areas action result.
@@ -484 +485 @@
 
     private void clearFields() {
         ds = null;
+        tagConflictsResolved = false;
         cmdsCount = 0;
         cmds.clear();
         addedRelations.clear();
@@ -570 +572 @@
                         allWays.addAll(pol.innerWays);
                     }
                     ds.setSelected(allWays);
+                    if (result.polygons.size() > 1 && tagConflictsResolved) {
+                        new Notification(tr("Selected ways were not joined to a single area but have the same tags now."
+                                + "<br>Please verify no errors have been introduced."))
+                                        .setIcon(JOptionPane.INFORMATION_MESSAGE).setDuration(Notification.TIME_LONG)
+                                        .show();
+                    }
                 }
             } else {
                 new Notification(
@@ -816 +824 @@
         TagCollection wayTags = TagCollection.unionOfAllPrimitives(ways);
         try {
             cmds.addAll(CombinePrimitiveResolverDialog.launchIfNecessary(wayTags, ways, ways));
+            tagConflictsResolved = (!cmds.isEmpty());
             commitCommands(marktr("Fix tag conflicts"));
             return true;
         } catch (UserCancelException ex) {