X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosSiteMap.java;h=b57edcabd68e472b8ee19c1d4ec41b6bf6a55944;hb=ea957f9e6144f8411ac84ee2905700f55f5a6e8a;hp=188902e9e535f0ceb3e9fc3dd8852d6f4c8b1569;hpb=f7cd8317bf78ece334e1ceb0263b875ca43bbbd2;p=fw%2Faltos

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 188902e9..b57edcab 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -31,6 +31,8 @@ import java.util.prefs.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.awt.geom.Line2D;
+import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	// preferred vertical step in a tile in naut. miles
@@ -110,7 +112,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		return latlng(pt, scale_x, scale_y);
 	}
 
-	HashMap<Point,AltosSiteMapTile> mapTiles = new HashMap<Point,AltosSiteMapTile>();
+	ConcurrentHashMap<Point,AltosSiteMapTile> mapTiles = new ConcurrentHashMap<Point,AltosSiteMapTile>();
 	Point2D.Double centre;
 
 	private Point2D.Double tileCoordOffset(Point p) {
@@ -146,6 +148,10 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		// nothing
 	}
 
+	public void set_font() {
+		// nothing
+	}
+
 	private void loadMap(final AltosSiteMapTile tile,
 			     File pngfile, String pngurl)
 	{
@@ -245,7 +251,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		char chlng = lng < 0 ? 'W' : 'E';
 		if (lat < 0) lat = -lat;
 		if (lng < 0) lng = -lng;
-		return new File(AltosPreferences.mapdir(),
+		return new File(AltosUIPreferences.mapdir(),
 				String.format("map-%c%.6f,%c%.6f-%d.png",
 					      chlat, lat, chlng, lng, zoom));
 	}
@@ -320,6 +326,16 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		last_state = state.state;
 	}
 
+	public void draw_circle(double lat, double lon) {
+		final Point2D.Double pt = pt(lat, lon);
+
+		for (Point offset : mapTiles.keySet()) {
+			AltosSiteMapTile tile = mapTiles.get(offset);
+			Point2D.Double ref = translatePoint(pt, tileCoordOffset(offset));
+			tile.draw_circle(ref);
+		}
+	}
+
 	private AltosSiteMapTile createTile(Point offset) {
 		AltosSiteMapTile tile = new AltosSiteMapTile(px_size);
 		mapTiles.put(offset, tile);