Ticket #14228: 14228.patch

src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -15 +15 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -33 +33 @@
 import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.actions.AdaptableAction;
+import org.openstreetmap.josm.actions.CreateMultipolygonAction;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -45 +46 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
@@ -52 +54 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
@@ -67 +70 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
 import org.openstreetmap.josm.tools.template_engine.TemplateEntry;
@@ -413 +417 @@
                 UndoRedoHandler.getInstance().add(cmd);
             }
         } else if (answer == DIALOG_ANSWER_NEW_RELATION) {
-            final Relation r = new Relation();
-            final Collection<RelationMember> members = new HashSet<>();
+            Relation calculated = null;
+            if (getChangedTags().stream().anyMatch(t -> "boundary".equals(t.get("type")) || "multipolygon".equals(t.get("type")))) {
+                Pair<SequenceCommand, Relation> res = CreateMultipolygonAction.createMultipolygonCommand(ds.getSelectedWays(), null);
+                if (res != null) {
+                    calculated = res.b;
+                }
+            }
+            final Relation r = calculated != null ? calculated : new Relation();
+            final Collection<RelationMember> members = new LinkedHashSet<>();
+            members.addAll(r.getMembers());
             for (Tag t : getChangedTags()) {
                 r.put(t.getKey(), t.getValue());
             }
             for (OsmPrimitive osm : ds.getSelected()) {
+                if (r == calculated && osm instanceof Way)
+                    continue;
                 String role = suggestRoleForOsmPrimitive(osm);
                 RelationMember rm = new RelationMember(role == null ? "" : role, osm);
                 r.addMember(rm);
                 members.add(rm);
             }
+            if (r.isMultipolygon() && r != calculated) {
+                r.setMembers(RelationSorter.sortMembersByConnectivity(r.getMembers()));
+            }
             SwingUtilities.invokeLater(() -> RelationEditor.getEditor(
                     MainApplication.getLayerManager().getEditLayer(), r, members).setVisible(true));
         }