X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapView.java;h=c8632b9962682c32c64b1c27f648cccc45213062;hb=8f2d82461f3cf5da157b23ea45a2fa60d56b196b;hp=4df178e2e57e6ba676d0f619a30aedc0d6e2b0ce;hpb=9a6a3c34293eac6442f766e13ce148f595e891eb;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMapView.java b/altosuilib/AltosUIMapView.java
index 4df178e2..c8632b99 100644
--- a/altosuilib/AltosUIMapView.java
+++ b/altosuilib/AltosUIMapView.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_6;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,7 +26,7 @@ import java.lang.*;
 import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_6.*;
 
 public class AltosUIMapView extends Component implements MouseMotionListener, MouseListener, MouseWheelListener, ComponentListener, AltosUIMapTileListener, AltosUIMapStoreListener {
 
@@ -67,7 +67,7 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 	AltosUILatLon		centre;
 
 	public void set_font() {
-		line.set_font(AltosUILib.value_font);
+		line.set_font(AltosUILib.status_font);
 		for (AltosUIMapTile tile : tiles.values())
 			tile.set_font(AltosUILib.value_font);
 		repaint();
@@ -370,7 +370,7 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 		for (Point point : to_remove)
 			tiles.remove(point);
 
-		cache.set_cache_size(((lower_right.y - upper_left.y) / px_size + 1) * ((lower_right.x - upper_left.x) / px_size + 1));
+		cache.set_cache_size((getWidth() / px_size + 2) * (getHeight() / px_size + 2));
 		for (int y = upper_left.y; y <= lower_right.y; y += px_size) {
 			for (int x = upper_left.x; x <= lower_right.x; x += px_size) {
 				Point point = new Point(x, y);
@@ -387,7 +387,7 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 	}
 
 	/* AltosUIMapTileListener methods */
-	public void notify_tile(AltosUIMapTile tile, int status) {
+	public synchronized void notify_tile(AltosUIMapTile tile, int status) {
 		for (Point point : tiles.keySet()) {
 			if (tile == tiles.get(point)) {
 				Point	screen = transform.screen(point);
@@ -399,7 +399,7 @@ public class AltosUIMapView extends Component implements MouseMotionListener, Mo
 	public AltosUIMapCache cache() { return cache; }
 
 	/* AltosUIMapStoreListener methods */
-	public void notify_store(AltosUIMapStore store, int status) {
+	public synchronized void notify_store(AltosUIMapStore store, int status) {
 		if (load_listener != null) {
 			for (AltosUIMapTile tile : tiles.values())
 				if (store.equals(tile.store))