submodule madness

[fw/altos] / altosuilib / AltosUIMapNew.java

diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index 511d8fe683db7d7ab336dcc15c1edf06652ecb73..8de6bea2487fd19074fddfe21ff7f07e4113eda5 100644 (file)
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMapNew.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_9;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -27,7 +27,7 @@ import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
 import javax.imageio.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_9.*;
 
 public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, AltosMapInterface {
 
@@ -139,18 +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 = map.transform.screen_lat_lon(new AltosPointInt(e.getPoint().x, e.getPoint().y));
-                       map.set_zoom(map.get_zoom() - zoom_change);
-
-                       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 */
@@ -369,6 +358,15 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
                zoom_label.setText(label);
        }
 
+       public void select_object(AltosLatLon latlon) {
+               debug("select at %f,%f\n", latlon.lat, latlon.lon);
+       }
+
+       public void debug(String format, Object ... arguments) {
+               System.out.printf(format, arguments);
+       }
+
+
        /* AltosFlightDisplay interface */
 
        public void set_font() {
@@ -429,10 +427,6 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 
        JComboBox<String>       maptype_combo;
 
-       public void set_load_params(double lat, double lon, int radius, AltosMapTileListener listener) {
-               map.set_load_params(lat, lon, radius, listener);
-       }
-
        MapView view;
 
        public AltosUIMapNew() {