X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMap.java;h=59420d4b389bf7c2c4b27142419bdbd320ddd3c6;hb=3882e358b6f2970cb1afebcf2a71da34a57002df;hp=d39c330201a0d01446388f64f3ec623ed0ea871e;hpb=756f501593365b80cfa6f7ca871da3291bbde67a;p=fw%2Faltos

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index d39c3302..59420d4b 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -109,6 +109,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		return map_interface.height();
 	}
 
+	public void debug(String format, Object ... arguments) {
+		map_interface.debug(format, arguments);
+	}
+
 	public AltosPointInt floor(AltosPointDouble point) {
 		return new AltosPointInt ((int) Math.floor(point.x / AltosMap.px_size) * AltosMap.px_size,
 					      (int) Math.floor(point.y / AltosMap.px_size) * AltosMap.px_size);
@@ -248,7 +252,9 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
 	public void add_mark(double lat, double lon, int state) {
 		synchronized(marks) {
-			marks.add(map_interface.new_mark(lat, lon, state));
+			AltosMapMark mark = map_interface.new_mark(lat, lon, state);
+			if (mark != null)
+				marks.add(mark);
 		}
 		repaint();
 	}
@@ -274,40 +280,38 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			upper_left = floor(transform.screen_point(new AltosPointInt(0, 0)));
 			lower_right = floor(transform.screen_point(new AltosPointInt(width(), height())));
 		}
-		LinkedList<AltosPointInt> to_remove = new LinkedList<AltosPointInt>();
-
 		for (AltosPointInt point : tiles.keySet()) {
 			if (point.x < upper_left.x || lower_right.x < point.x ||
 			    point.y < upper_left.y || lower_right.y < point.y) {
-				to_remove.add(point);
+				tiles.remove(point);
 			}
 		}
 
-		for (AltosPointInt point : to_remove)
-			tiles.remove(point);
-
 		cache.set_cache_size((width() / AltosMap.px_size + 2) * (height() / AltosMap.px_size + 2));
 
 		for (int y = (int) upper_left.y; y <= lower_right.y; y += AltosMap.px_size) {
 			for (int x = (int) upper_left.x; x <= lower_right.x; x += AltosMap.px_size) {
-				AltosPointInt point = new AltosPointInt(x, y);
+				AltosPointInt	point = new AltosPointInt(x, y);
 
 				if (!tiles.containsKey(point)) {
-					AltosLatLon	ul = transform.lat_lon(new AltosPointDouble(x, y));
+					AltosLatLon	ul = transform.lat_lon(point);
 					AltosLatLon	center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
-					AltosMapTile tile = map_interface.new_tile(this, ul, center, zoom, maptype,
-										   px_size);
+					AltosMapTile tile = map_interface.new_tile(this, ul, center, zoom, maptype, px_size);
 					tiles.put(point, tile);
 				}
 			}
 		}
 	}
 
-	public void set_load_params(double lat, double lon, int radius, AltosMapTileListener listener) {
+	public void set_load_params(int new_zoom, int new_type, double lat, double lon, int radius, AltosMapTileListener listener) {
+		if (AltosMap.min_zoom <= new_zoom && new_zoom <= AltosMap.max_zoom)
+			zoom = new_zoom;
+		maptype = new_type;
 		load_centre = new AltosLatLon(lat, lon);
 		load_radius = radius;
 		load_listener = listener;
 		centre(lat, lon);
+		tiles.clear();
 		make_tiles();
 		for (AltosMapTile tile : tiles.values()) {
 			tile.add_store_listener(this);
@@ -370,6 +374,11 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		int dx = x - drag_start.x;
 		int dy = y - drag_start.y;
 
+		if (transform == null) {
+			debug("Transform not set in drag\n");
+			return;
+		}
+
 		AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointInt(width() / 2 - dx, height() / 2 - dy));
 		centre(new_centre);
 		drag_start = new AltosPointInt(x, y);