Changeset 14653 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2019-01-06T13:17:37+01:00 (5 years ago)

Author:

simon04

Message:

fix #16874 – Keep the id on the POI if unglueing

When unglueing a node from a way, retain the history on the node which gets assigned the tags.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UnGlueAction.java (modified) (6 diffs)
• gui/dialogs/PropertiesMembershipChoiceDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
@@ -192 +194 @@
     }
 
-    private static void updateMemberships(ExistingBothNew memberships, Node existingNode, List<Node> newNodes, Collection<Command> cmds) {
-        if (ExistingBothNew.BOTH.equals(memberships)) {
-            fixRelations(existingNode, cmds, newNodes, false);
-        } else if (ExistingBothNew.NEW.equals(memberships)) {
-            fixRelations(existingNode, cmds, newNodes, true);
-        }
-    }
-
     /**
      * Assumes there is one tagged Node stored in selectedNode that it will try to unglue.
@@ -214 +208 @@
         }
 
-        final Node n = new Node(selectedNode, true);
+        final Node unglued = new Node(selectedNode, true);
+        boolean moveSelectedNode = false;
 
         List<Command> cmds = new LinkedList<>();
-        cmds.add(new AddCommand(selectedNode.getDataSet(), n));
-        if (dialog != null) {
-            update(dialog, selectedNode, Collections.singletonList(n), cmds);
+        cmds.add(new AddCommand(selectedNode.getDataSet(), unglued));
+        if (dialog != null && ExistingBothNew.NEW.equals(dialog.getTags())) {
+            // unglued node gets the ID and history, thus replace way node with a fresh one
+            final Way way = selectedNode.getParentWays().get(0);
+            final List<Node> newWayNodes = way.getNodes();
+            newWayNodes.replaceAll(n -> selectedNode.equals(n) ? unglued : n);
+            cmds.add(new ChangeNodesCommand(way, newWayNodes));
+            updateMemberships(dialog.getMemberships().opposite(), selectedNode, Collections.singletonList(unglued), cmds);
+            updateProperties(dialog.getTags().opposite(), selectedNode, Collections.singletonList(unglued), cmds);
+            moveSelectedNode = true;
+        } else if (dialog != null) {
+            update(dialog, selectedNode, Collections.singletonList(unglued), cmds);
         }
 
@@ -225 +229 @@
         MapView mv = MainApplication.getMap().mapView;
         if (e.getSource() instanceof JPanel) {
-            n.setCoor(mv.getLatLon(mv.lastMEvent.getX(), mv.lastMEvent.getY()));
+            final LatLon latLon = mv.getLatLon(mv.lastMEvent.getX(), mv.lastMEvent.getY());
+            if (moveSelectedNode) {
+                cmds.add(new MoveCommand(selectedNode, latLon));
+            } else {
+                unglued.setCoor(latLon);
+            }
         }
 
         UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Unglued Node"), cmds));
-        getLayerManager().getEditDataSet().setSelected(n);
+        getLayerManager().getEditDataSet().setSelected(moveSelectedNode ? selectedNode : unglued);
         mv.repaint();
     }
@@ -371 +380 @@
     /**
      * put all newNodes into the same relation(s) that originalNode is in
+     * @param memberships where the memberships should be places
      * @param originalNode original node to duplicate
      * @param cmds List of commands that will contain the new "change relation" commands
      * @param newNodes List of nodes that contain the new node
-     * @param removeOldMember whether the membership of the "old node" should be removed
-     */
-    private static void fixRelations(Node originalNode, Collection<Command> cmds, List<Node> newNodes, boolean removeOldMember) {
+     */
+    private static void updateMemberships(ExistingBothNew memberships, Node originalNode, List<Node> newNodes, Collection<Command> cmds) {
+        if (ExistingBothNew.OLD.equals(memberships)) {
+            return;
+        }
         // modify all relations containing the node
         for (Relation r : OsmPrimitive.getFilteredList(originalNode.getReferrers(), Relation.class)) {
@@ -403 +415 @@
                             newRel.addMember(role.getValue() + 1, new RelationMember(role.getKey(), n));
                         }
-                        if (removeOldMember) {
+                        if (ExistingBothNew.NEW.equals(memberships)) {
+                            // remove old member
                             newRel.removeMember(role.getValue());
                         }

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesMembershipChoiceDialog.java

@@ -31 +31 @@
     private final transient ExistingBothNewChoice memberships;
 
+    /**
+     * Represents the user choice: the existing node, the new nodes, or all of them
+     */
     public enum ExistingBothNew {
-        OLD, BOTH, NEW
+        OLD, BOTH, NEW;
+
+        /**
+         * Returns the opposite/inverted user choice.
+         * @return the opposite/inverted user choice
+         */
+        public ExistingBothNew opposite() {
+            return equals(OLD) ? NEW : equals(NEW) ? OLD : this;
+        }
     }