Changeset 4494 in josm

Timestamp:

Oct 7, 2011 7:55:45 PM (20 months ago)

Author:

bastiK

Message:

change zoom factor to something more suitable for TMS (2x zoom in increases scale by factor 2)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ZoomInAction.java (modified) (1 diff)
• actions/ZoomOutAction.java (modified) (1 diff)
• gui/MapMover.java (modified) (1 diff)

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

@@ -30 +30 @@
     public void actionPerformed(ActionEvent e) {
         if (!Main.isDisplayingMapView()) return;
-        Main.map.mapView.zoomToFactor(0.9);
+        Main.map.mapView.zoomToFactor(1/Math.sqrt(2));
     }
 

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

@@ -25 +25 @@
     public void actionPerformed(ActionEvent e) {
         if (!Main.isDisplayingMapView()) return;
-        Main.map.mapView.zoomToFactor(1/0.9);
+        Main.map.mapView.zoomToFactor(Math.sqrt(2));
     }
 

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

@@ -182 +182 @@
      */
     public void mouseWheelMoved(MouseWheelEvent e) {
-        nc.zoomToFactor(e.getX(), e.getY(), Math.pow(0.8, - e.getWheelRotation()));
+        nc.zoomToFactor(e.getX(), e.getY(), Math.pow(Math.sqrt(2), e.getWheelRotation()));
     }