Changeset 748 in josm for trunk

Timestamp:

2008-08-06T08:49:51+02:00 (16 years ago)

Author:

stoecker

Message:

some cleanups

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInCircleAction.java (modified) (1 diff)
• command/RotateCommand.java (modified) (3 diffs)
• data/gpx/WayPoint.java (modified) (3 diffs)

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

@@ -54 +54 @@
                 // Get average position of all nodes
                 Node avn = new Node(new LatLon(0,0));
+                avn.eastNorth = new EastNorth(0,0);
                 for (Node n : nodes) {
                         avn.eastNorth = new EastNorth(avn.eastNorth.east()+n.eastNorth.east(), avn.eastNorth.north()+n.eastNorth.north());
-                        avn.coor = Main.proj.eastNorth2latlon(avn.eastNorth);
                 }
                 avn.eastNorth = new EastNorth(avn.eastNorth.east()/nodes.size(), avn.eastNorth.north()/nodes.size());

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

@@ -63 +63 @@
                 this.objects = AllNodesVisitor.getAllNodes(objects);
                 pivot = new Node(new LatLon(0,0));
-                        
+                pivot.eastNorth = new EastNorth(0,0);
+
                 for (Node n : this.objects) {
                         MoveCommand.OldState os = new MoveCommand.OldState();
@@ -71 +72 @@
                         oldState.put(n, os);
                         pivot.eastNorth = new EastNorth(pivot.eastNorth.east()+os.eastNorth.east(), pivot.eastNorth.north()+os.eastNorth.north());
-                        pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth);
                 }
                 pivot.eastNorth = new EastNorth(pivot.eastNorth.east()/this.objects.size(), pivot.eastNorth.north()/this.objects.size());
-                pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth);       
+                pivot.coor = Main.proj.eastNorth2latlon(pivot.eastNorth);
 
                 rotationAngle = Math.PI/2;
@@ -89 +89 @@
                 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());
-                rotationAngle += startAngle - endAngle;         
+                rotationAngle += startAngle - endAngle;
                 rotateNodes(false);
         }
-        
+
         /**
          * Helper for actually rotationg the nodes.

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 
-public class WayPoint extends WithAttributes implements Comparable{
-        
+public class WayPoint extends WithAttributes implements Comparable<WayPoint>
+{
         public final LatLon latlon;
         public final EastNorth eastNorth;
@@ -23 +23 @@
 
         public WayPoint(LatLon ll) {
-                latlon = ll; 
+                latlon = ll;
                 eastNorth = Main.proj.latlon2eastNorth(ll);
         }
@@ -49 +49 @@
         }
 
-    public int compareTo(Object other){
-        if(other instanceof WayPoint){
-            WayPoint w = (WayPoint)other;
-            return (int)time - (int)w.time;
-        }
-        return 0;
-    }
+        public int compareTo(WayPoint w)
+        {
+                return Double.compare(time, w.time);
+        }
 }