X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMap.java;h=0c775f333ee79aacf9ffb08a4c11c243fd9910e5;hb=2a4d741872449b5332f28e018fa3acc53ed7d891;hp=c79e52294d20942321b8af7ec047cbdfcf92b32f;hpb=09acb6821ab490d69f679a195e70acb4a71ba342;p=fw%2Faltos

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index c79e5229..0c775f33 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_9;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.lang.*;
@@ -51,6 +51,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	};
 
 	AltosMapInterface	map_interface;
+	int			scale;
 
 	AltosMapCache		cache;
 
@@ -328,7 +329,9 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 				if (!tiles.containsKey(point)) {
 					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(cache, ul, center, zoom, maptype, px_size, scale);
+					debug("show state %s url %s\n", AltosMapTile.status_name(tile.store.status()), tile.store.url);
+					tile.add_listener(this);
 					tiles.put(point, tile);
 				}
 			}
@@ -345,11 +348,6 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		centre(lat, lon);
 		tiles.clear();
 		make_tiles();
-		for (AltosMapTile tile : tiles.values()) {
-			tile.add_store_listener(this);
-			if (tile.store_status() != AltosMapTile.loading)
-				listener.notify_tile(tile, tile.store_status());
-		}
 		repaint();
 	}
 
@@ -421,10 +419,8 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		if (distance > drag_far)
 			dragged = true;
 
-		if (transform == null) {
-			debug("Transform not set in drag\n");
+		if (transform == null)
 			return;
-		}
 
 		AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointInt(width() / 2 - dx, height() / 2 - dy));
 		centre(new_centre);
@@ -439,7 +435,6 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	private void drag_stop(int x, int y) {
 		if (!dragged) {
 			if (transform == null) {
-				debug("Transform not set in stop\n");
 				return;
 			}
 			map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
@@ -447,14 +442,14 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	}
 
 	private void line_start(int x, int y) {
-		if (line != null) {
+		if (line != null && transform != null) {
 			line.pressed(new AltosPointInt(x, y), transform);
 			repaint();
 		}
 	}
 
 	private void line(int x, int y) {
-		if (line != null) {
+		if (line != null && transform != null) {
 			line.dragged(new AltosPointInt(x, y), transform);
 			repaint();
 		}
@@ -482,11 +477,16 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			drag_stop(x, y);
 	}
 
-	public AltosMap(AltosMapInterface map_interface) {
+	public AltosMap(AltosMapInterface map_interface, int scale) {
 		this.map_interface = map_interface;
+		this.scale = scale;
 		cache = new AltosMapCache(map_interface);
 		line = map_interface.new_line();
 		path = map_interface.new_path();
 		set_zoom_label();
 	}
+
+	public AltosMap(AltosMapInterface map_interface) {
+		this(map_interface, 1);
+	}
 }