Changeset 71 in josm for src/org/openstreetmap/josm/command

Timestamp:

2006-03-25T16:21:09+01:00 (19 years ago)

Author:

imi

Message:

• refactored GpsPoint to be immutable and added LatLon and NorthEast
• refactored Bounding Box calculations
• various other renames

File:

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

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -22 +24 @@
          * The objects that should be moved.
          */
-        public List<Node> objects = new LinkedList<Node>();
+        public Collection<Node> objects = new LinkedList<Node>();
         /**
          * x difference movement. Coordinates are in northern/eastern 
@@ -53 +55 @@
                 this.x = x;
                 this.y = y;
-                this.objects = getAffectedNodes(objects);
+                this.objects = AllNodesVisitor.getAllNodes(objects);
                 for (Node n : this.objects) {
                         OldState os = new OldState();
-                        os.x = n.coor.x;
-                        os.y = n.coor.y;
-                        os.lat = n.coor.lat;
-                        os.lon = n.coor.lon;
+                        os.x = n.eastNorth.east();
+                        os.y = n.eastNorth.north();
+                        os.lat = n.coor.lat();
+                        os.lon = n.coor.lon();
                         os.modified = n.modified;
                         oldState.add(os);
@@ -65 +67 @@
         }
 
-        /**
-         * @return a list of all nodes that will be moved if using the given set of
-         * objects.
-         */
-        public static List<Node> getAffectedNodes(Collection<OsmPrimitive> objects) {
-                AllNodesVisitor visitor = new AllNodesVisitor();
-                for (OsmPrimitive osm : objects)
-                        osm.visit(visitor);
-                return new LinkedList<Node>(visitor.nodes);
-        }
-        
         /**
          * Move the same set of objects again by the specified vector. The vectors
@@ -86 +77 @@
         public void moveAgain(double x, double y) {
                 for (Node n : objects) {
-                        n.coor.x += x;
-                        n.coor.y += y;
-                        Main.pref.getProjection().xy2latlon(n.coor);
+                        n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y);
+                        n.coor = Main.pref.getProjection().eastNorth2latlon(n.eastNorth);
                 }
                 this.x += x;
@@ -96 +86 @@
         public void executeCommand() {
                 for (Node n : objects) {
-                        n.coor.x += x;
-                        n.coor.y += y;
-                        Main.pref.getProjection().xy2latlon(n.coor);
+                        n.eastNorth = new EastNorth(n.eastNorth.east()+x, n.eastNorth.north()+y);
+                        n.coor = Main.pref.getProjection().eastNorth2latlon(n.eastNorth);
                         n.modified = true;
                 }
@@ -107 +96 @@
                 for (Node n : objects) {
                         OldState os = it.next();
-                        n.coor.x = os.x;
-                        n.coor.y = os.y;
-                        n.coor.lat = os.lat;
-                        n.coor.lon = os.lon;
+                        n.eastNorth = new EastNorth(os.x, os.y);
+                        n.coor = new LatLon(os.lat, os.lon);
                         n.modified = os.modified;
                 }