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

Timestamp:

2009-07-03T12:33:32+02:00 (16 years ago)

Author:

stoecker

Message:

Large rework in projection handling - now allows only switching and more specific projections
TODO:

• allow subprojections (i.e. settings for projections)
• setup preferences for subprojections
• better support of the new projection depending world bounds (how to handle valid data outside of world)
• do not allow to zoom out of the world - zoom should stop when whole world is displayed
• fix Lambert and SwissGrid to handle new OutOfWorld style and subprojections
• fix new UTM projection
• handle layers with fixed projection on projection change
• allow easier projection switching (e.g. in menu)

NOTE:
This checkin very likely will cause problems. Please report or fix them. Older plugins may have trouble. The SVN plugins
have been fixed but may have problems nevertheless. This is a BIG change, but will make JOSMs internal structure much cleaner
and reduce lots of projection related problems.

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• MoveCommand.java (modified) (3 diffs)
• RotateCommand.java (modified) (6 diffs)

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

@@ -48 +48 @@
     public static class OldState {
         LatLon latlon;
-        EastNorth eastNorth;
         boolean modified;
     }
@@ -70 +69 @@
         for (Node n : this.objects) {
             OldState os = new OldState();
-            os.eastNorth = n.getEastNorth();
             os.latlon = n.getCoor();
             os.modified = n.modified;
@@ -105 +103 @@
         for (Node n : objects) {
             OldState os = it.next();
-            n.setEastNorth(os.eastNorth);
+            n.setCoor(os.latlon);
             n.modified = os.modified;
         }

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

@@ -14 +14 @@
 
 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;
@@ -37 +38 @@
 
     /**
+     * Small helper for holding the interesting part of the old data state of the
+     * objects.
+     */
+    public static class OldState {
+        LatLon latlon;
+        EastNorth eastNorth;
+        boolean modified;
+    }
+
+    /**
      * angle of rotation starting click to pivot
      */
@@ -49 +60 @@
      * List of all old states of the objects.
      */
-    private Map<Node, MoveCommand.OldState> oldState = new HashMap<Node, MoveCommand.OldState>();
+    private Map<Node, OldState> oldState = new HashMap<Node, OldState>();
 
     /**
@@ -63 +74 @@
 
         for (Node n : this.objects) {
-            MoveCommand.OldState os = new MoveCommand.OldState();
+            OldState os = new OldState();
+            os.latlon = n.getCoor();
             os.eastNorth = n.getEastNorth();
-            os.latlon = n.getCoor();
             os.modified = n.modified;
             oldState.put(n, os);
@@ -102 +113 @@
             double nx =  sinPhi * x + cosPhi * y + pivot.east();
             double ny = -cosPhi * x + sinPhi * y + pivot.north();
-            n.setEastNorth(nx, ny);
+            n.setEastNorth(new EastNorth(nx, ny));
             if (setModified)
                 n.modified = true;
@@ -115 +126 @@
     @Override public void undoCommand() {
         for (Node n : objects) {
-            MoveCommand.OldState os = oldState.get(n);
-            n.setEastNorth(os.eastNorth);
+            OldState os = oldState.get(n);
+            n.setCoor(os.latlon);
             n.modified = os.modified;
         }