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

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 8a3266c9..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_8;
+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;
 
@@ -230,23 +231,23 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		if (!gps.locked && gps.nsat < 4)
 			return;
 
-		switch (state.state) {
+		switch (state.state()) {
 		case AltosLib.ao_flight_boost:
 			if (!have_boost) {
-				add_mark(gps.lat, gps.lon, state.state);
+				add_mark(gps.lat, gps.lon, state.state());
 				have_boost = true;
 			}
 			break;
 		case AltosLib.ao_flight_landed:
 			if (!have_landed) {
-				add_mark(gps.lat, gps.lon, state.state);
+				add_mark(gps.lat, gps.lon, state.state());
 				have_landed = true;
 			}
 			break;
 		}
 
 		if (path != null) {
-			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state.state);
+			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state.state());
 
 			if (damage != null)
 				repaint(damage, AltosMapPath.stroke_width);
@@ -308,7 +309,11 @@ 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())));
 		}
-		for (AltosPointInt point : tiles.keySet()) {
+
+		Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+		while (keyEnumeration.hasMoreElements()) {
+			AltosPointInt point = keyEnumeration.nextElement();
 			if (point.x < upper_left.x || lower_right.x < point.x ||
 			    point.y < upper_left.y || lower_right.y < point.y) {
 				tiles.remove(point);
@@ -324,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);
 				}
 			}
@@ -341,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();
 	}
 
@@ -377,7 +379,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
 	/* AltosMapTileListener methods */
 	public synchronized void notify_tile(AltosMapTile tile, int status) {
-		for (AltosPointInt point : tiles.keySet()) {
+		Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+		while (keyEnumeration.hasMoreElements()) {
+			AltosPointInt point = keyEnumeration.nextElement();
 			if (tile == tiles.get(point)) {
 				AltosPointInt	screen = transform.screen(point);
 				repaint(screen.x, screen.y, AltosMap.px_size, AltosMap.px_size);
@@ -414,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);
@@ -432,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)));
@@ -440,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();
 		}
@@ -475,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);
+	}
 }