X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMapTile.java;h=ee9206ee09dc34e268506b005d6b85994eb889de;hp=923b7c6bf7127611c24d28dbb086ebf144eac29e;hb=85013045ca505096064aaf45c312b158d0263d2a;hpb=00aca369c4070901e0400f291d5f269b5fb8015c

diff --git a/altoslib/AltosMapTile.java b/altoslib/AltosMapTile.java
index 923b7c6b..ee9206ee 100644
--- a/altoslib/AltosMapTile.java
+++ b/altoslib/AltosMapTile.java
@@ -15,20 +15,21 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 import java.util.*;
 
 public abstract class AltosMapTile implements AltosFontListener {
 	AltosMapTileListener	listener;
-	AltosLatLon	upper_left, center;
-	int		px_size;
+	public AltosLatLon	upper_left, center;
+	public int		px_size;
 	int		zoom;
 	int		maptype;
-	AltosMapStore	store;
-	AltosMapCache	cache;
-	int		status;
+	int		scale;
+	public AltosMapStore	store;
+	public AltosMapCache	cache;
+	public int	status;
 
 	static public final int	success = 0;
 	static public final int	loading = 1;
@@ -51,23 +52,28 @@ public abstract class AltosMapTile implements AltosFontListener {
 		else
 			format_string = "png";
 		return new File(AltosPreferences.mapdir(),
-				String.format("map-%c%.6f,%c%.6f-%s%d.%s",
-					      chlat, lat, chlon, lon, maptype_string, zoom, format_string));
+				String.format("map-%c%.6f,%c%.6f-%s%d%s.%s",
+					      chlat, lat, chlon, lon, maptype_string, zoom, scale == 1 ? "" : String.format("-%d", scale), format_string));
 	}
 
 	private String map_url() {
 		String format_string;
+		int z = zoom;
+
 		if (maptype == AltosMap.maptype_hybrid || maptype == AltosMap.maptype_satellite || maptype == AltosMap.maptype_terrain)
 			format_string = "jpg";
 		else
 			format_string = "png32";
 
+		for (int s = 1; s < scale; s <<= 1)
+			z--;
+
 		if (AltosVersion.has_google_maps_api_key())
-			return String.format("http://maps.google.com/maps/api/staticmap?center=%.6f,%.6f&zoom=%d&size=%dx%d&sensor=false&maptype=%s&format=%s&key=%s",
-					     center.lat, center.lon, zoom, px_size, px_size, AltosMap.maptype_names[maptype], format_string, AltosVersion.google_maps_api_key);
+			return String.format("http://maps.google.com/maps/api/staticmap?center=%.6f,%.6f&zoom=%d&size=%dx%d&scale=%d&sensor=false&maptype=%s&format=%s&key=%s",
+					     center.lat, center.lon, z, px_size/scale, px_size/scale, scale, AltosMap.maptype_names[maptype], format_string, AltosVersion.google_maps_api_key);
 		else
-			return String.format("http://maps.google.com/maps/api/staticmap?center=%.6f,%.6f&zoom=%d&size=%dx%d&sensor=false&maptype=%s&format=%s",
-					     center.lat, center.lon, zoom, px_size, px_size, AltosMap.maptype_names[maptype], format_string);
+			return String.format("http://maps.google.com/maps/api/staticmap?center=%.6f,%.6f&zoom=%d&size=%dx%d&scale=%d&sensor=false&maptype=%s&format=%s",
+					     center.lat, center.lon, z, px_size/scale, px_size/scale, AltosMap.maptype_names[maptype], format_string);
 	}
 
 	public void font_size_changed(int font_size) {
@@ -96,9 +102,10 @@ public abstract class AltosMapTile implements AltosFontListener {
 
 	public abstract void paint(AltosMapTransform t);
 
-	public AltosMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+	public AltosMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size, int scale) {
 		this.listener = listener;
 		this.upper_left = upper_left;
+		this.cache = listener.cache();
 
 		while (center.lon < -180.0)
 			center.lon += 360.0;
@@ -109,8 +116,13 @@ public abstract class AltosMapTile implements AltosFontListener {
 		this.zoom = zoom;
 		this.maptype = maptype;
 		this.px_size = px_size;
+		this.scale = scale;
 
 		status = AltosMapTile.loading;
 		store = AltosMapStore.get(map_url(), map_file());
 	}
+
+	public AltosMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		this(listener, upper_left, center, zoom, maptype, px_size, 1);
+	}
 }