Changeset 5418 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2012-08-10T21:01:12+02:00 (12 years ago)

Author:

akks

Message:

fix #7082 (?) - CTRL-drag in selection mode problem, see #7888: SelectAction and MoveCommand rework

File:

• trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -33 +33 @@
     private Collection<Node> nodes = new LinkedList<Node>();
     /**
+     * Starting position, base command point, current (mouse-drag) position = startEN + (x,y) = 
+     */
+    private EastNorth startEN;
+
+    /**
      * x difference movement. Coordinates are in northern/eastern
      */
@@ -40 +45 @@
      */
     private double y;
+
+    private double backupX;
+    private double backupY;
 
     /**
@@ -47 +55 @@
     public static class OldState {
         LatLon latlon;
+        EastNorth en; // cached EastNorth to be used for applying exact displacenment
         boolean modified;
     }
@@ -66 +75 @@
         this(objects, offset.getX(), offset.getY());
     }
-
+    
     /**
      * Create a MoveCommand and assign the initial object set and movement vector.
@@ -72 +81 @@
     public MoveCommand(Collection<OsmPrimitive> objects, double x, double y) {
         super();
+        startEN = null;
+        saveCheckpoint(); // (0,0) displacement will be saved
         this.x = x;
         this.y = y;
@@ -78 +89 @@
             OldState os = new OldState();
             os.latlon = new LatLon(n.getCoor());
+            os.en = n.getEastNorth();
             os.modified = n.isModified();
             oldState.add(os);
@@ -83 +95 @@
     }
 
+     public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
+         this(objects, end.getX()-start.getX(), end.getY()-start.getY());
+         startEN =  start;
+     }
+
+     public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
+         this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
+         startEN =  start;
+     }
+     
     /**
      * Move the same set of objects again by the specified vector. The vectors
@@ -102 +124 @@
         moveAgain(x - this.x, y - this.y);
     }
+    
+    /**
+     * Change the displacement vector to have endpoint @param currentEN 
+     * starting point is  startEN
+     */
+    public void applyVectorTo(EastNorth currentEN) {
+        if (startEN == null) 
+            return;
+        x = currentEN.getX() - startEN.getX();
+        y = currentEN.getY() - startEN.getY();
+        updateCoordinates();
+    }
+
+     /**
+     * Changes base point of movement
+     * @param newDraggedStartPoint - new starting point after movement (where user clicks to start new drag)
+     */
+    public void changeStartPoint(EastNorth newDraggedStartPoint) {
+        startEN = new EastNorth(newDraggedStartPoint.getX()-x, newDraggedStartPoint.getY()-y);
+     }
+
+    /**
+     * Save curent displacement to restore in case of some problems
+     */
+    public void saveCheckpoint() {
+        backupX = x;
+        backupY = y;
+    }
+
+    /**
+     * Restore old displacement in case of some problems
+     */
+    public void resetToCheckpoint() {
+        x = backupX;
+        y = backupY;
+        updateCoordinates();
+    }
+
+    private void updateCoordinates() {
+        Iterator<OldState> it = oldState.iterator();
+        for (Node n : nodes) {
+            OldState os = it.next();
+            n.setEastNorth(os.en.add(x, y));
+        }
+    }
 
     @Override public boolean executeCommand() {