X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMap.java;h=b033cbff75b59e855f62c42ccca1dc3e3fbd257f;hp=1841277f8bd61889390f0d5802dff09a7584b603;hb=72bcff4c1af10571314e5cbbe29f073de818088e;hpb=e0081f7ba6fc9f1e4484d3e291fd30065ad5b620

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 1841277f..b033cbff 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.lang.*;
@@ -51,6 +52,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	};
 
 	AltosMapInterface	map_interface;
+	int			scale;
 
 	AltosMapCache		cache;
 
@@ -209,20 +211,22 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	}
 
 	public boolean set_maptype(int maptype) {
+/*
 		if (maptype != this.maptype) {
 			this.maptype = maptype;
 			tiles.clear();
 			repaint();
 			return true;
 		}
+*/
 		return false;
 	}
 
-	public void show(AltosState state, AltosListenerState listener_state) {
+	public void show(AltosGPS gps, int state) {
 
-		/* If insufficient gps data, nothing to update
+		/*
+		 * If insufficient gps data, nothing to update
 		 */
-		AltosGPS	gps = state.gps;
 
 		if (gps == null)
 			return;
@@ -230,23 +234,23 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		if (!gps.locked && gps.nsat < 4)
 			return;
 
-		switch (state.state()) {
+		switch (state) {
 		case AltosLib.ao_flight_boost:
 			if (!have_boost) {
-				add_mark(gps.lat, gps.lon, state.state());
+				add_mark(gps.lat, gps.lon, 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);
 				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);
 
 			if (damage != null)
 				repaint(damage, AltosMapPath.stroke_width);
@@ -257,6 +261,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		maybe_centre(gps.lat, gps.lon);
 	}
 
+	public void show(AltosState state, AltosListenerState listener_state) {
+		show(state.gps, state.state());
+	}
+
 	public void centre(AltosLatLon lat_lon) {
 		centre = lat_lon;
 		set_transform();
@@ -266,10 +274,14 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		centre(new AltosLatLon(lat, lon));
 	}
 
-	public void centre(AltosState state) {
-		if (!state.gps.locked && state.gps.nsat < 4)
+	public void centre(AltosGPS gps) {
+		if (!gps.locked && gps.nsat < 4)
 			return;
-		centre(state.gps.lat, state.gps.lon);
+		centre(gps.lat, gps.lon);
+	}
+
+	public void centre(AltosState state) {
+		centre(state.gps);
 	}
 
 	public void maybe_centre(double lat, double lon) {
@@ -328,7 +340,10 @@ 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(cache, ul, center, zoom, maptype, px_size);
+					AltosMapTile tile = map_interface.new_tile(cache, ul, center, zoom, maptype, px_size, scale);
+					int status = tile.store.status();
+					if (status == AltosMapTile.fetching)
+						debug("Fetching %.6f %.6f %d\n", center.lat, center.lon, zoom);
 					tile.add_listener(this);
 					tiles.put(point, tile);
 				}
@@ -339,7 +354,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	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;
+/*		maptype = new_type; */
 		load_centre = new AltosLatLon(lat, lon);
 		load_radius = radius;
 		load_listener = listener;
@@ -475,11 +490,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);
+	}
 }