Changeset 71 in josm for src/org/openstreetmap/josm/gui/MapMover.java

Timestamp:

2006-03-25T16:21:09+01:00 (18 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/gui/MapMover.java (modified) (5 diffs)

src/org/openstreetmap/josm/gui/MapMover.java

@@ -8 +8 @@
 import java.awt.event.MouseWheelListener;
 
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -22 +22 @@
          * when moving around started.
          */
-        private GeoPoint mousePosMove;
+        private EastNorth mousePosMove;
         /**
          * The map to move around.
@@ -51 +51 @@
                         if (mousePosMove == null)
                                 startMovement(e);
-                        GeoPoint center = nc.getCenter();
-                        GeoPoint mouseCenter = nc.getPoint(e.getX(), e.getY(), false);
-                        GeoPoint p = new GeoPoint();
-                        p.x = mousePosMove.x + center.x - mouseCenter.x;  
-                        p.y = mousePosMove.y + center.y - mouseCenter.y;
+                        EastNorth center = nc.getCenter();
+                        EastNorth mouseCenter = nc.getEastNorth(e.getX(), e.getY());
+                        EastNorth p = new EastNorth(
+                                        mousePosMove.east() + center.east() - mouseCenter.east(),
+                                        mousePosMove.north() + center.north() - mouseCenter.north());
                         nc.zoomTo(p, nc.getScale());
                 } else
@@ -86 +86 @@
          */
         private void startMovement(MouseEvent e) {
-                mousePosMove = nc.getPoint(e.getX(), e.getY(), false);
+                mousePosMove = nc.getEastNorth(e.getX(), e.getY());
                 oldCursor = nc.getCursor();
                 nc.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
@@ -108 +108 @@
          */
         public void mouseWheelMoved(MouseWheelEvent e) {
+                int w = nc.getWidth();
+                int h = nc.getHeight();
+
                 double zoom = Math.max(0.1, 1 + e.getWheelRotation()/5.0);
-                double zoomfactor = (zoom -1)/2+1;
-                int newHalfWidth = (int) (nc.getWidth()*zoomfactor - nc.getWidth()/2);
-                int centerx = e.getX() - (e.getX()-nc.getWidth()/2)*newHalfWidth*2/nc.getWidth();
-                int newHalfHeight = (int) (nc.getHeight()*zoomfactor - nc.getHeight()/2);
-                int centery = e.getY() - (e.getY()-nc.getHeight()/2)*newHalfHeight*2/nc.getHeight();
-                GeoPoint newCenter = nc.getPoint(centerx, centery, false); 
+                double zoomfactor = (zoom-1)/2+1;
+
+                double newHalfWidth = w*zoomfactor - w/2;
+                double newHalfHeight = h*zoomfactor - h/2;
+                double centerx = e.getX() - (e.getX()-w/2)*newHalfWidth*2/w;
+                double centery = e.getY() - (e.getY()-h/2)*newHalfHeight*2/h;
+                EastNorth newCenter = nc.getEastNorth((int)centerx, (int)centery); 
+                
                 nc.zoomTo(newCenter, nc.getScale()*zoom);
         }