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

Timestamp:

2009-06-06T13:38:32+02:00 (16 years ago)

Author:

stoecker

Message:

fix #2302 - patch by jttt - some code cleanup for better encapsulation

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• MoveCommand.java (modified) (4 diffs)
• RotateCommand.java (modified) (7 diffs)

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

@@ -15 +15 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -88 +87 @@
     public void moveAgain(double x, double y) {
         for (Node n : objects) {
-            n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y);
-            n.coor = Main.proj.eastNorth2latlon(n.eastNorth);
+            n.setEastNorth(n.eastNorth.add(x, y));
         }
         this.x += x;
@@ -97 +95 @@
     @Override public boolean executeCommand() {
         for (Node n : objects) {
-            n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y);
-            n.coor = Main.proj.eastNorth2latlon(n.eastNorth);
+            n.setEastNorth(n.eastNorth.add(x, y));
             n.modified = true;
         }
@@ -108 +105 @@
         for (Node n : objects) {
             OldState os = it.next();
-            n.eastNorth = os.eastNorth;
-            n.coor = os.latlon;
+            n.setEastNorth(os.eastNorth);
             n.modified = os.modified;
         }

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

@@ -13 +13 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -36 +34 @@
      * pivot point
      */
-    private Node pivot;
+    private EastNorth pivot;
 
     /**
@@ -62 +60 @@
 
         this.objects = AllNodesVisitor.getAllNodes(objects);
-        pivot = new Node(new LatLon(0,0));
-        pivot.eastNorth = new EastNorth(0,0);
+        pivot = new EastNorth(0,0);
 
         for (Node n : this.objects) {
@@ -71 +68 @@
             os.modified = n.modified;
             oldState.put(n, os);
-            pivot.eastNorth = new EastNorth(pivot.eastNorth.east()+os.eastNorth.east(), pivot.eastNorth.north()+os.eastNorth.north());
+            pivot = pivot.add(os.eastNorth.east(), os.eastNorth.north());
         }
-        pivot.eastNorth = new EastNorth(pivot.eastNorth.east()/this.objects.size(), pivot.eastNorth.north()/this.objects.size());
-        pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth);
+        pivot = new EastNorth(pivot.east()/this.objects.size(), pivot.north()/this.objects.size());
 
         rotationAngle = Math.PI/2;
@@ -87 +83 @@
     public void rotateAgain(EastNorth start, EastNorth end) {
         // compute angle
-        startAngle = Math.atan2(start.east()-pivot.eastNorth.east(), start.north()-pivot.eastNorth.north());
-        double endAngle = Math.atan2(end.east()-pivot.eastNorth.east(), end.north()-pivot.eastNorth.north());
+        startAngle = Math.atan2(start.east()-pivot.east(), start.north()-pivot.north());
+        double endAngle = Math.atan2(end.east()-pivot.east(), end.north()-pivot.north());
         rotationAngle += startAngle - endAngle;
         rotateNodes(false);
@@ -102 +98 @@
             double sinPhi = Math.sin(rotationAngle);
             EastNorth oldEastNorth = oldState.get(n).eastNorth;
-            double x = oldEastNorth.east() - pivot.eastNorth.east();
-            double y = oldEastNorth.north() - pivot.eastNorth.north();
-            double nx =  sinPhi * x + cosPhi * y + pivot.eastNorth.east();
-            double ny = -cosPhi * x + sinPhi * y + pivot.eastNorth.north();
-            n.eastNorth = new EastNorth(nx, ny);
-            n.coor = Main.proj.eastNorth2latlon(n.eastNorth);
+            double x = oldEastNorth.east() - pivot.east();
+            double y = oldEastNorth.north() - pivot.north();
+            double nx =  sinPhi * x + cosPhi * y + pivot.east();
+            double ny = -cosPhi * x + sinPhi * y + pivot.north();
+            n.setEastNorth(nx, ny);
             if (setModified)
                 n.modified = true;
@@ -121 +116 @@
         for (Node n : objects) {
             MoveCommand.OldState os = oldState.get(n);
-            n.eastNorth = os.eastNorth;
-            n.coor = os.latlon;
+            n.setEastNorth(os.eastNorth);
             n.modified = os.modified;
         }