X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSiteMap.java;h=105afade192ed206b3fcde8f3c688231b4da3ba8;hp=c092691926f72925b854b29993a6bd1c3400d31c;hb=13cf4000bd53ac4af66231d56e24c9eb11178a5f;hpb=7ec1b97d278c7aec3199fb7270f0dcf9484c879f

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index c0926919..105afade 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -23,7 +23,7 @@ import java.io.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
@@ -182,7 +182,9 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 		}
 	}
 
-	public static void prefetchMaps(double lat, double lng, int w, int h) {
+	public static void prefetchMaps(double lat, double lng) {
+		int w = AltosSiteMapPreload.width;
+		int h = AltosSiteMapPreload.height;
 		AltosSiteMap asm = new AltosSiteMap(true);
 		asm.centre = asm.getBaseLocation(lat, lng);
 
@@ -287,10 +289,10 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 			return;
 
 		if (!initialised) {
-			if (state.pad_lat != AltosRecord.MISSING && state.pad_lon != AltosRecord.MISSING) {
+			if (state.pad_lat != AltosLib.MISSING && state.pad_lon != AltosLib.MISSING) {
 				initMaps(state.pad_lat, state.pad_lon);
 				initialised = true;
-			} else if (gps.lat != AltosRecord.MISSING && gps.lon != AltosRecord.MISSING) {
+			} else if (gps.lat != AltosLib.MISSING && gps.lon != AltosLib.MISSING) {
 				initMaps(gps.lat, gps.lon);
 				initialised = true;
 			} else {