projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: remove complexity around message passing
[fw/altos]
/
altosui
/
AltosSiteMap.java
diff --git
a/altosui/AltosSiteMap.java
b/altosui/AltosSiteMap.java
index c258b3e5559728f364105d0794f89f4c8eba9784..b57edcabd68e472b8ee19c1d4ec41b6bf6a55944 100644
(file)
--- 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.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
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);
}
return latlng(pt, scale_x, scale_y);
}
-
HashMap<Point,AltosSiteMapTile> mapTiles = new
HashMap<Point,AltosSiteMapTile>();
+
ConcurrentHashMap<Point,AltosSiteMapTile> mapTiles = new Concurrent
HashMap<Point,AltosSiteMapTile>();
Point2D.Double centre;
private Point2D.Double tileCoordOffset(Point p) {
Point2D.Double centre;
private Point2D.Double tileCoordOffset(Point p) {
@@
-249,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;
char chlng = lng < 0 ? 'W' : 'E';
if (lat < 0) lat = -lat;
if (lng < 0) lng = -lng;
- return new File(AltosPreferences.mapdir(),
+ return new File(Altos
UI
Preferences.mapdir(),
String.format("map-%c%.6f,%c%.6f-%d.png",
chlat, lat, chlng, lng, zoom));
}
String.format("map-%c%.6f,%c%.6f-%d.png",
chlat, lat, chlng, lng, zoom));
}