Merge branch 'branch-1.6' into debian

1 files changed, 4 insertions, 13 deletions

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 0af09651..f6caa4ef 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
@@ -295,7 +295,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void LoadMaps() {
-		new AltosUIMapPreload(AltosUI.this);
+		new AltosUIMapPreloadNew(AltosUI.this);
 	}
 
 	void LaunchController() {
@@ -587,16 +587,7 @@ public class AltosUI extends AltosUIFrame {
 			for (int i = 0; i < args.length; i++) {
 				if (args[i].equals("--help"))
 					help(0);
-				else if (args[i].equals("--fetchmaps")) {
-					if (args.length < i + 3) {
-						help(1);
-					} else {
-						double lat = Double.parseDouble(args[i+1]);
-						double lon = Double.parseDouble(args[i+2]);
-//						AltosSiteMap.prefetchMaps(lat, lon);
-						i += 2;
-					}
-				} else if (args[i].equals("--replay"))
+				else if (args[i].equals("--replay"))
 					process = process_replay;
 				else if (args[i].equals("--kml"))
 					process = process_kml;