X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapNew.java;h=016a202be003fc8ee9b67c6c587a46053f3daba1;hb=909b048a4797b2477279750a77a82c6f5f2776d0;hp=4191a562ffef8c7d0230179ff423c3258094c266;hpb=501fa41111b93cc213a1114a33612858e1e93ab5;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index 4191a562..016a202b 100644
--- 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_8;
 
 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_8.*;
 
 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 */
@@ -283,16 +272,16 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 				if (t.has_location()) {
 					String	message = null;
 					switch (status) {
-					case AltosUIMapCache.loading:
+					case AltosMapTile.loading:
 						message = "Loading...";
 						break;
-					case AltosUIMapCache.bad_request:
+					case AltosMapTile.bad_request:
 						message = "Internal error";
 						break;
-					case AltosUIMapCache.failed:
+					case AltosMapTile.failed:
 						message = "Network error, check connection";
 						break;
-					case AltosUIMapCache.forbidden:
+					case AltosMapTile.forbidden:
 						message = "Too many requests, try later";
 						break;
 					}
@@ -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() {
@@ -419,15 +417,16 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 		return "Map";
 	}
 
+	/* AltosGraphUI interface */
+	public void centre(AltosState state) {
+		map.centre(state);
+	}
+
 	/* internal layout bits */
 	private GridBagLayout layout = new GridBagLayout();
 
 	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() {