altosuilib: Use AltosMap set_zoom_centre instead of in-line version

[fw/altos] / altosuilib / AltosUIMapNew.java

diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index 5f63a3c226f5871dfd8656a2d177052b695226b5..246222bc073f79c8c8475edc9c699e72b4d5bd0a 100644 (file)
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMapNew.java
@@ -139,24 +139,7 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
                public void mouseWheelMoved(MouseWheelEvent e) {
                        int     zoom_change = e.getWheelRotation();
 
-                       map.notice_user_input();
-                       AltosLatLon     mouse_lat_lon = null;
-
-                       if (map.transform != null)
-                               mouse_lat_lon = map.transform.screen_lat_lon(new AltosPointInt(e.getPoint().x, e.getPoint().y));
-
-                       map.set_zoom(map.get_zoom() - zoom_change);
-
-                       if (mouse_lat_lon != null) {
-                               AltosPointDouble        new_mouse = map.transform.screen(mouse_lat_lon);
-
-                               int     dx = getWidth()/2 - e.getPoint().x;
-                               int     dy = getHeight()/2 - e.getPoint().y;
-
-                               AltosLatLon     new_centre = map.transform.screen_lat_lon(new AltosPointInt((int) new_mouse.x + dx, (int) new_mouse.y + dy));
-
-                               map.centre(new_centre);
-                       }
+                       map.set_zoom_centre(map.get_zoom() - zoom_change, new AltosPointInt(e.getPoint().x, e.getPoint().y));
                }
 
                /* ComponentListener methods */