From 21d176f161b90f18f236ef887cef9676d712eee3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 21 Apr 2016 21:12:40 -0400
Subject: Update java library version numbers

Prepare for 1.6.3 release.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java')

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 28752110..ff9d0a77 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -20,7 +20,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 
-import org.altusmetrum.altoslib_9.*;
+import org.altusmetrum.altoslib_10.*;
 
 import android.app.Activity;
 import android.graphics.*;
-- 
cgit v1.2.3


From ea89feedd4185a5f583fa8ddf33a2ec0906e0dc0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 22 Apr 2016 18:52:42 -0400
Subject: altosdroid: Redraw offline map when my location changes

Update the map view even if there isn't any current telemetry data.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java')

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index ff9d0a77..6edc87a5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -441,6 +441,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	}
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		boolean	changed = false;
+
 		if (state != null) {
 			map.show(state, null);
 			if (state.pad_lat != AltosLib.MISSING && pad == null)
@@ -479,7 +481,12 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 			}
 		}
 		if (receiver != null) {
-			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			AltosLatLon new_here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			if (!new_here.equals(here)) {
+				here = new_here;
+				AltosDebug.debug("Location changed, redraw");
+				repaint();
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From d81f94fd5339d513de9bde5a2e19f8eca526344f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 26 Apr 2016 21:01:44 -0400
Subject: altosdroid: Split setup functions to separate dialog

Remove them from the options menu, handle all preferences through
listeners.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/.gitignore                              |   1 +
 altosdroid/AndroidManifest.xml.in                  |   5 +
 altosdroid/res/layout/setup.xml                    | 119 ++++++++
 altosdroid/res/menu/option_menu.xml                |  21 +-
 altosdroid/res/values/strings.xml                  |   9 +
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |  96 +++---
 .../AltosDroid/AltosDroidMapInterface.java         |   2 +
 .../AltosDroid/AltosDroidMapSourceListener.java    |  22 ++
 .../AltosDroid/AltosDroidPreferences.java          |  25 ++
 .../org/altusmetrum/AltosDroid/AltosDroidTab.java  |   6 -
 .../altusmetrum/AltosDroid/AltosMapOffline.java    |  11 +-
 .../org/altusmetrum/AltosDroid/AltosMapOnline.java |  15 +-
 .../altusmetrum/AltosDroid/IgniterActivity.java    | 100 ++++++-
 .../org/altusmetrum/AltosDroid/SetupActivity.java  | 326 +++++++++++++++++++++
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |  19 +-
 altoslib/AltosMapTypeListener.java                 |  22 ++
 altoslib/AltosPreferences.java                     |  39 +++
 altoslib/Makefile.am                               |   1 +
 18 files changed, 722 insertions(+), 117 deletions(-)
 create mode 100644 altosdroid/res/layout/setup.xml
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
 create mode 100644 altoslib/AltosMapTypeListener.java

(limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java')

diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore
index 7f0858ea..cf7ad5a8 100644
--- a/altosdroid/.gitignore
+++ b/altosdroid/.gitignore
@@ -5,3 +5,4 @@ libs
 google-play-services_lib
 src/org/altusmetrum/AltosDroid/BuildInfo.java
 res/drawable/*led.png
+AndroidManifest.xml
diff --git a/altosdroid/AndroidManifest.xml.in b/altosdroid/AndroidManifest.xml.in
index 15b04445..488a6766 100644
--- a/altosdroid/AndroidManifest.xml.in
+++ b/altosdroid/AndroidManifest.xml.in
@@ -92,6 +92,11 @@
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
 
+	<activity android:name=".SetupActivity"
+		  android:label="@string/setup"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:configChanges="orientation|keyboardHidden" />
+		  
         <service android:name=".TelemetryService" />
 
         <meta-data android:name="com.google.android.maps.v2.API_KEY"
diff --git a/altosdroid/res/layout/setup.xml b/altosdroid/res/layout/setup.xml
new file mode 100644
index 00000000..73ba2ad1
--- /dev/null
+++ b/altosdroid/res/layout/setup.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright © 2016 Keith Packard <keithp@keithp.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <TableLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:stretchColumns="2,3"
+      android:layout_weight="0"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content">
+
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/select_rate_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/telemetry_rate"
+	  />
+      <Spinner android:id="@+id/select_rate"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/telemetry_rate"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/set_units_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/set_units"
+	  />
+      <Spinner android:id="@+id/set_units"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/set_units"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/map_type_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/map_type"
+	  />
+      <Spinner android:id="@+id/map_type"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/map_type"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+      <TextView
+	  android:id="@+id/map_source_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/map_source"
+	  />
+      <Spinner android:id="@+id/map_source"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/map_source"
+	       android:spinnerMode="dropdown"
+	       />
+    </TableRow>
+  </TableLayout>
+  <Button android:id="@+id/preload_maps"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+	  android:text="@string/preload_maps"
+	  />
+  <Button android:id="@+id/done"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+	  android:text="@string/done"
+	  />
+</LinearLayout>
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 4de4a16e..b2ca01a4 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -25,30 +25,21 @@
     <item android:id="@+id/select_freq"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />
-    <item android:id="@+id/select_rate"
-          android:icon="@android:drawable/ic_menu_preferences"
-          android:title="@string/select_rate" />
-    <item android:id="@+id/change_units"
-	  android:icon="@android:drawable/ic_menu_view"
-	  android:title="@string/change_units" />
-    <item android:id="@+id/preload_maps"
-	  android:icon="@android:drawable/ic_menu_mapmode"
-	  android:title="@string/preload_maps" />
-    <item android:id="@+id/map_type"
-	  android:icon="@android:drawable/ic_menu_mapmode"
-	  android:title="@string/map_type" />
-    <item android:id="@+id/map_source"
-	  android:icon="@android:drawable/ic_menu_mapmode"
-	  android:title="@string/map_source" />
+
     <item android:id="@+id/select_tracker"
 	  android:icon="@android:drawable/ic_menu_view"
 	  android:title="@string/select_tracker"/>
     <item android:id="@+id/delete_track"
 	  android:icon="@android:drawable/ic_notification_clear_all"
 	  android:title="@string/delete_track"/>
+
+    <item android:id="@+id/setup"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/setup" />
     <item android:id="@+id/idle_mode"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/idle_mode" />
+
     <item android:id="@+id/quit"
           android:icon="@android:drawable/ic_menu_close_clear_cancel"
           android:title="@string/quit" />
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 6f761a58..7538f7b5 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -29,6 +29,7 @@
 	<string name="connect_device">Connect a device</string>
 	<string name="disconnect_device">Disconnect device</string>
 	<string name="quit">Quit</string>
+	<string name="setup">Setup</string>
 	<string name="select_freq">Select radio frequency</string>
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
@@ -126,4 +127,12 @@
 	<string name="igniter_armed">Armed</string>
 	<string name="igniter_fire">Fire</string>
 	
+	<!-- setup -->
+	<string name="telemetry_rate">Telemetry Rate</string>
+	<string name="set_units">Units</string>
+	<string name="map_type">Map Type</string>
+	<string name="map_source">Map Source</string>
+	<string name="preload_maps">Preload Maps</string>
+	<string name="done">Done</string>
+	
 </resources>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index e5f56a5a..ea3bbae6 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -71,15 +71,19 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 	public static final int REQUEST_CONNECT_DEVICE = 1;
 	public static final int REQUEST_ENABLE_BT      = 2;
 	public static final int REQUEST_PRELOAD_MAPS   = 3;
-	public static final int REQUEST_MAP_TYPE       = 4;
 	public static final int REQUEST_IDLE_MODE      = 5;
 	public static final int REQUEST_IGNITERS       = 6;
+	public static final int REQUEST_SETUP	       = 7;
 
 	public static final String EXTRA_IDLE_MODE = "idle_mode";
 	public static final String EXTRA_IDLE_RESULT = "idle_result";
 	public static final String EXTRA_TELEMETRY_SERVICE = "telemetry_service";
 
-	public int map_type = AltosMap.maptype_hybrid;
+	// Setup result bits
+	public static final int SETUP_BAUD = 1;
+	public static final int SETUP_UNITS = 2;
+	public static final int SETUP_MAP_SOURCE = 4;
+	public static final int SETUP_MAP_TYPE = 8;
 
 	public static FragmentManager	fm;
 
@@ -534,11 +538,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		return tab_view;
 	}
 
-	public void set_map_source(int source) {
-		for (AltosDroidTab mTab : mTabs)
-			mTab.set_map_source(source);
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -757,17 +756,39 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 				AltosDebug.debug("BT not enabled");
 			}
 			break;
-		case REQUEST_MAP_TYPE:
-			if (resultCode == Activity.RESULT_OK)
-				set_map_type(data);
-			break;
 		case REQUEST_IDLE_MODE:
 			if (resultCode == Activity.RESULT_OK)
 				idle_mode(data);
 			break;
 		case REQUEST_IGNITERS:
 			break;
+		case REQUEST_SETUP:
+			if (resultCode == Activity.RESULT_OK)
+				note_setup_changes(data);
+			break;
+		}
+	}
+
+	private void note_setup_changes(Intent data) {
+		int changes = data.getIntExtra(SetupActivity.EXTRA_SETUP_CHANGES, 0);
+
+		if ((changes & SETUP_BAUD) != 0) {
+			try {
+				mService.send(Message.obtain(null, TelemetryService.MSG_SETBAUD,
+							     AltosPreferences.telemetry_rate(1)));
+			} catch (RemoteException re) {
+			}
 		}
+		if ((changes & SETUP_UNITS) != 0) {
+			/* nothing to do here */
+		}
+		if ((changes & SETUP_MAP_SOURCE) != 0) {
+			/* nothing to do here */
+		}
+		if ((changes & SETUP_MAP_TYPE) != 0) {
+			/* nothing to do here */
+		}
+		set_switch_time();
 	}
 
 	private void connectUsb(UsbDevice device) {
@@ -814,17 +835,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		}
 	}
 
-	private void set_map_type(Intent data) {
-		int type = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
-
-		AltosDebug.debug("intent set_map_type %d\n", type);
-		if (type != -1) {
-			map_type = type;
-			for (AltosDroidTab mTab : mTabs)
-				mTab.set_map_type(map_type);
-		}
-	}
-
 	private void idle_mode(Intent data) {
 		int type = data.getIntExtra(IdleModeActivity.EXTRA_IDLE_RESULT, -1);
 		Message msg;
@@ -981,6 +991,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 			disconnectDevice();
 			finish();
 			return true;
+		case R.id.setup:
+			serverIntent = new Intent(this, SetupActivity.class);
+			startActivityForResult(serverIntent, REQUEST_SETUP);
+			return true;
 		case R.id.select_freq:
 			// Set the TBT radio frequency
 
@@ -1008,44 +1022,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 			AlertDialog alert_freq = builder_freq.create();
 			alert_freq.show();
 			return true;
-		case R.id.select_rate:
-			// Set the TBT baud rate
-
-			final String[] rates = {
-				"38400",
-				"9600",
-				"2400",
-			};
-
-			AlertDialog.Builder builder_rate = new AlertDialog.Builder(this);
-			builder_rate.setTitle("Pick a baud rate");
-			builder_rate.setItems(rates,
-					 new DialogInterface.OnClickListener() {
-						 public void onClick(DialogInterface dialog, int item) {
-							 setBaud(rates[item]);
-						 }
-					 });
-			AlertDialog alert_rate = builder_rate.create();
-			alert_rate.show();
-			return true;
-		case R.id.change_units:
-			boolean	imperial = AltosPreferences.imperial_units();
-			AltosPreferences.set_imperial_units(!imperial);
-			return true;
-		case R.id.preload_maps:
-			serverIntent = new Intent(this, PreloadMapActivity.class);
-			startActivityForResult(serverIntent, REQUEST_PRELOAD_MAPS);
-			return true;
-		case R.id.map_type:
-			serverIntent = new Intent(this, MapTypeActivity.class);
-			startActivityForResult(serverIntent, REQUEST_MAP_TYPE);
-			return true;
-		case R.id.map_source:
-			int source = AltosDroidPreferences.map_source();
-			int new_source = source == AltosDroidPreferences.MAP_SOURCE_ONLINE ? AltosDroidPreferences.MAP_SOURCE_OFFLINE : AltosDroidPreferences.MAP_SOURCE_ONLINE;
-			AltosDroidPreferences.set_map_source(new_source);
-			set_map_source(new_source);
-			return true;
 		case R.id.select_tracker:
 			if (serials != null) {
 				String[] trackers = new String[serials.length+1];
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
index 944f4b51..43abef0f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
@@ -25,6 +25,8 @@ import org.altusmetrum.altoslib_10.*;
 public interface AltosDroidMapInterface {
 	public void onCreateView(AltosDroid altos_droid);
 
+	public void onDestroyView();
+
 	public void set_visible(boolean visible);
 
 	public void center(double lat, double lon, double accuracy);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java
new file mode 100644
index 00000000..e2775ef5
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+public interface AltosDroidMapSourceListener {
+	public void map_source_changed(int map_source);
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index bd3bd942..dd86c818 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -16,6 +16,10 @@
  */
 package org.altusmetrum.AltosDroid;
 
+import java.io.*;
+import java.util.*;
+import java.text.*;
+
 import android.content.Context;
 import org.altusmetrum.altoslib_10.*;
 
@@ -65,12 +69,19 @@ public class AltosDroidPreferences extends AltosPreferences {
 		}
 	}
 
+	static LinkedList<AltosDroidMapSourceListener> map_source_listeners;
+
 	public static void set_map_source(int map_source) {
 		synchronized(backend) {
 			AltosDroidPreferences.map_source = map_source;
 			backend.putInt(mapSourcePreference, map_source);
 			flush_preferences();
 		}
+		if (map_source_listeners != null) {
+			for (AltosDroidMapSourceListener l : map_source_listeners) {
+				l.map_source_changed(map_source);
+			}
+		}
 	}
 
 	public static int map_source() {
@@ -78,4 +89,18 @@ public class AltosDroidPreferences extends AltosPreferences {
 			return map_source;
 		}
 	}
+
+	public static void register_map_source_listener(AltosDroidMapSourceListener l) {
+		synchronized(backend) {
+			if (map_source_listeners == null)
+				map_source_listeners = new LinkedList<AltosDroidMapSourceListener>();
+			map_source_listeners.add(l);
+		}
+	}
+
+	public static void unregister_map_source_listener(AltosDroidMapSourceListener l) {
+		synchronized(backend) {
+			map_source_listeners.remove(l);
+		}
+	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index d01bd33c..77dbbcb1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -39,12 +39,6 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 
 	public abstract String tab_name();
 
-	public void set_map_type(int map_type) {
-	}
-
-	public void set_map_source(int map_source) {
-	}
-
 	public void units_changed(boolean imperial_units) {
 		if (!isHidden())
 			show(last_telem_state, last_state, last_from_receiver, last_receiver);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 6edc87a5..bde80cfc 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -79,7 +79,7 @@ class Rocket implements Comparable {
 	}
 }
 
-public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface {
+public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface, AltosMapTypeListener {
 	ScaleGestureDetector	scale_detector;
 	boolean			scaling;
 	AltosMap		map;
@@ -493,7 +493,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	public void onCreateView(AltosDroid altos_droid) {
 		this.altos_droid = altos_droid;
 		map = new AltosMap(this);
-		map.set_maptype(altos_droid.map_type);
+		AltosPreferences.register_map_type_listener(this);
+		map.set_maptype(AltosPreferences.map_type());
 
 		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
 		/* arrow at the bottom of the launchpad image */
@@ -511,7 +512,11 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 		here_off_y = here_bitmap.getHeight() / 2;
 	}
 
-	public void set_map_type(int map_type) {
+	public void onDestroyView() {
+		AltosPreferences.unregister_map_type_listener(this);
+	}
+
+	public void map_type_changed(int map_type) {
 		if (map != null)
 			map.set_maptype(map_type);
 	}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
index fd4dc98a..fcdb930b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
@@ -102,7 +102,7 @@ class RocketOnline implements Comparable {
 	}
 }
 
-public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarkerClickListener, GoogleMap.OnMapClickListener {
+public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarkerClickListener, GoogleMap.OnMapClickListener, AltosMapTypeListener {
 	public SupportMapFragment mMapFragment;
 	private GoogleMap mMap;
 	private boolean mapLoaded = false;
@@ -124,7 +124,8 @@ public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
 
 	public void onCreateView(AltosDroid altos_droid) {
 		this.altos_droid = altos_droid;
-		final int map_type = altos_droid.map_type;
+		final int map_type = AltosPreferences.map_type();
+		AltosPreferences.register_map_type_listener(this);
 		mMapFragment = new SupportMapFragment() {
 			@Override
 			public void onActivityCreated(Bundle savedInstanceState) {
@@ -144,9 +145,9 @@ public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
 		};
 	}
 
-//	public void onActivityCreated() {
-//		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
-//	}
+	public void onDestroyView() {
+		AltosPreferences.unregister_map_type_listener(this);
+	}
 
 	private double pixel_distance(LatLng a, LatLng b) {
 		Projection projection = mMap.getProjection();
@@ -190,7 +191,7 @@ public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
 	public void setupMap(int map_type) {
 		mMap = mMapFragment.getMap();
 		if (mMap != null) {
-			set_map_type(map_type);
+			map_type_changed(map_type);
 			mMap.setMyLocationEnabled(true);
 			mMap.getUiSettings().setTiltGesturesEnabled(false);
 			mMap.getUiSettings().setZoomControlsEnabled(false);
@@ -308,7 +309,7 @@ public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
 
 	}
 
-	public void set_map_type(int map_type) {
+	public void map_type_changed(int map_type) {
 		if (mMap != null) {
 			if (map_type == AltosMap.maptype_hybrid)
 				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/IgniterActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/IgniterActivity.java
index a608bba0..9e3dac67 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/IgniterActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/IgniterActivity.java
@@ -36,36 +36,41 @@ import org.altusmetrum.altoslib_10.*;
 
 class IgniterItem {
 	public String name;
+	public String pretty;
 	public String status;
 	public LinearLayout igniter_view = null;
-	public TextView	name_view = null;
+	public TextView	pretty_view = null;
 	public TextView	status_view = null;
 
 	private void update() {
-		AltosDebug.debug("update item %s %s", name, status);
-		if (name_view != null)
-			name_view.setText(name);
+		AltosDebug.debug("update item %s %s", pretty, status);
+		if (pretty_view != null)
+			pretty_view.setText(pretty);
 		if (status_view != null)
 			status_view.setText(status);
 	}
 
-	public void set(String name, String status) {
-		if (!name.equals(this.name) || !status.equals(this.status)) {
+	public void set(String name, String pretty, String status) {
+		if (!name.equals(this.name) ||
+		    !pretty.equals(this.pretty) ||
+		    !status.equals(this.status))
+		{
 			this.name = name;
+			this.pretty = pretty;
 			this.status = status;
 			update();
 		}
 	}
 
 	public void realize(LinearLayout igniter_view,
-			    TextView name_view,
+			    TextView pretty_view,
 			    TextView status_view) {
 		if (igniter_view != this.igniter_view ||
-		    name_view != this.name_view ||
+		    pretty_view != this.pretty_view ||
 		    status_view != this.status_view)
 		{
 			this.igniter_view = igniter_view;
-			this.name_view = name_view;
+			this.pretty_view = pretty_view;
 			this.status_view = status_view;
 			update();
 		}
@@ -124,6 +129,9 @@ public class IgniterActivity extends Activity {
 
 	private Timer timer;
 
+	private Timer arm_timer;
+	private int arm_remaining;
+
 	public static final int IGNITER_QUERY = 1;
 	public static final int IGNITER_FIRE = 2;
 
@@ -175,10 +183,44 @@ public class IgniterActivity extends Activity {
 		finish();
 	}
 
+	class FireThread extends Thread {
+		private final String igniter;
+
+		@Override
+		public void run() {
+			Message msg = Message.obtain(null, TelemetryService.MSG_IGNITER_FIRE, igniter);
+			try {
+				service.send(msg);
+			} catch (RemoteException re) {
+			}
+		}
+
+		public FireThread(String igniter) {
+			this.igniter = igniter;
+		}
+	}
+
 	private void fire_igniter() {
+		if (igniters_adapter.selected_item >= 0) {
+			IgniterItem	item = igniters_adapter.getItem(igniters_adapter.selected_item);
+			FireThread	ft = new FireThread(item.name);
+			ft.run();
+		}
 	}
 
 	private void arm_igniter(boolean is_checked) {
+		if (is_checked) {
+			arm_timer = new Timer();
+			fire.setEnabled(true);
+			arm_timer.scheduleAtFixedRate(new TimerTask() {
+					public void run() {
+						arm_timer_tick();
+					}},
+				1000L, 1000L);
+		} else {
+			arm_timer.cancel();
+			fire.setEnabled(false);
+		}
 	}
 
 	private synchronized void timer_tick() {
@@ -190,6 +232,7 @@ public class IgniterActivity extends Activity {
 			msg.replyTo = messenger;
 			service.send(msg);
 		} catch (RemoteException re) {
+			timer_running = false;
 		}
 	}
 
@@ -205,7 +248,7 @@ public class IgniterActivity extends Activity {
 		} else
 			item = igniters.get(name);
 
-		item.set(pretty, AltosIgnite.status_string(status.get(name)));
+		item.set(name, pretty, AltosIgnite.status_string(status.get(name)));
 		return true;
 	}
 
@@ -227,16 +270,44 @@ public class IgniterActivity extends Activity {
 //			igniters_view.setSelection(selected_item);
 	}
 
-	private class IgniterItemClickListener implements ListView.OnItemClickListener {
-		@Override
-		public void onItemClick(AdapterView<?> av, View v, int position, long id) {
+	private void arm_set_text() {
+		String	text = String.format("Armed %d", arm_remaining);
+
+		arm.setTextOn(text);
+	}
+
+	private void arm_timer_tick() {
+		--arm_remaining;
+		if (arm_remaining <= 0) {
+			timer.cancel();
+			arm.setChecked(false);
+			fire.setEnabled(false);
+		} else
+			arm_set_text();
+	}
+
+	private void select_item(int position) {
+		if (position != igniters_adapter.selected_item) {
 			if (igniters_adapter.selected_item >= 0)
 				igniters_view.setItemChecked(igniters_adapter.selected_item, false);
-			igniters_view.setItemChecked(position, true);
+			if (position >= 0) {
+				igniters_view.setItemChecked(position, true);
+				arm.setEnabled(true);
+				arm_remaining = 10;
+				arm_set_text();
+			} else
+				arm.setEnabled(false);
 			igniters_adapter.selected_item = position;
 		}
 	}
 
+	private class IgniterItemClickListener implements ListView.OnItemClickListener {
+		@Override
+		public void onItemClick(AdapterView<?> av, View v, int position, long id) {
+			select_item(position);
+		}
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -261,6 +332,7 @@ public class IgniterActivity extends Activity {
 			});
 
 		arm = (ToggleButton) findViewById(R.id.igniter_arm);
+		arm.setEnabled(false);
 		arm.setOnCheckedChangeListener(new ToggleButton.OnCheckedChangeListener() {
 				public void onCheckedChanged(CompoundButton v, boolean is_checked) {
 					arm_igniter(is_checked);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
new file mode 100644
index 00000000..ef802f0f
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright © 2016 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.lang.ref.WeakReference;
+import java.util.*;
+import org.altusmetrum.AltosDroid.R;
+
+import android.app.Activity;
+import android.bluetooth.*;
+import android.content.*;
+import android.os.*;
+import android.view.*;
+import android.view.View.*;
+import android.widget.*;
+import android.widget.AdapterView.*;
+
+import org.altusmetrum.altoslib_10.*;
+
+public class SetupActivity extends Activity {
+	private Spinner select_rate;
+	private Spinner set_units;
+	private Spinner map_type;
+	private Spinner map_source;
+	private Button preload_maps;
+	private Button done;
+
+	private boolean is_bound;
+	private Messenger service = null;
+
+	public final static String EXTRA_SETUP_CHANGES = "setup_changes";
+
+	private ServiceConnection connection = new ServiceConnection() {
+		public void onServiceConnected(ComponentName className, IBinder binder) {
+			service = new Messenger(binder);
+		}
+
+		public void onServiceDisconnected(ComponentName className) {
+			// This is called when the connection with the service has been unexpectedly disconnected - process crashed.
+			service = null;
+		}
+	};
+
+	void doBindService() {
+		bindService(new Intent(this, TelemetryService.class), connection, Context.BIND_AUTO_CREATE);
+		is_bound = true;
+	}
+
+	void doUnbindService() {
+		if (is_bound) {
+			// If we have received the service, and hence registered with it, then now is the time to unregister.
+			unbindService(connection);
+			is_bound = false;
+		}
+	}
+
+	static final String[] rates = {
+		"38400",
+		"9600",
+		"2400",
+	};
+
+	static final String[] map_types = {
+		"Hybrid",
+		"Satellite",
+		"Roadmap",
+		"Terrain"
+	};
+
+	static final int[] map_type_values = {
+		AltosMap.maptype_hybrid,
+		AltosMap.maptype_satellite,
+		AltosMap.maptype_roadmap,
+		AltosMap.maptype_terrain,
+	};
+
+	static final String[] map_sources = {
+		"Online",
+		"Offline"
+	};
+
+	private int	set_telemetry_rate;
+	private int	set_map_source;
+	private int	set_map_type;
+	private boolean	set_imperial_units;
+
+	private int	changes = 0;
+
+	private void add_change(int change) {
+		changes |= change;
+	}
+
+	private void done() {
+		Intent intent = new Intent();
+		if ((changes & AltosDroid.SETUP_BAUD) != 0)
+			AltosPreferences.set_telemetry_rate(1, set_telemetry_rate);
+		if ((changes & AltosDroid.SETUP_UNITS) != 0)
+			AltosPreferences.set_imperial_units(set_imperial_units);
+		if ((changes & AltosDroid.SETUP_MAP_SOURCE) != 0)
+			AltosDroidPreferences.set_map_source(set_map_source);
+		if ((changes & AltosDroid.SETUP_MAP_TYPE) != 0)
+			AltosPreferences.set_map_type(set_map_type);
+		intent.putExtra(EXTRA_SETUP_CHANGES, changes);
+		setResult(Activity.RESULT_OK, intent);
+		finish();
+	}
+
+	private void add_strings(Spinner spinner, String[] strings, int def) {
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item);
+
+		for (int i = 0; i < strings.length; i++)
+			adapter.add(strings[i]);
+
+		spinner.setAdapter(adapter);
+		if (def >= 0)
+			spinner.setSelection(def);
+	}
+
+	private int default_rate_pos() {
+		int	default_rate = AltosPreferences.telemetry_rate(1);
+
+		for (int pos = 0; pos < rates.length; pos++) {
+			if (string_to_rate(rates[pos]) == default_rate)
+				return pos;
+		}
+		return -1;
+	}
+
+	private void setBaud(int baud) {
+		try {
+			service.send(Message.obtain(null, TelemetryService.MSG_SETBAUD, baud));
+			set_telemetry_rate = baud;
+			add_change(AltosDroid.SETUP_BAUD);
+		} catch (RemoteException e) {
+		}
+	}
+
+	private int string_to_rate(String baud) {
+		int	rate = AltosLib.ao_telemetry_rate_38400;
+		try {
+			int	value = Integer.parseInt(baud);
+			switch (value) {
+			case 2400:
+				rate = AltosLib.ao_telemetry_rate_2400;
+				break;
+			case 9600:
+				rate = AltosLib.ao_telemetry_rate_9600;
+				break;
+			case 38400:
+				rate = AltosLib.ao_telemetry_rate_38400;
+				break;
+			}
+		} catch (NumberFormatException e) {
+		}
+		return rate;
+	}
+
+	private void setBaud(String baud) {
+		setBaud(string_to_rate(baud));
+	}
+
+	private void select_rate(int pos) {
+		setBaud(rates[pos]);
+	}
+
+	static final String[] units = {
+		"Metric",
+		"Imperial"
+	};
+
+	private int default_units_pos() {
+		boolean	imperial = AltosPreferences.imperial_units();
+
+		if (imperial)
+			return 1;
+		return 0;
+	}
+
+	private void set_units(int pos) {
+		switch (pos) {
+		default:
+			set_imperial_units = false;
+			break;
+		case 1:
+			set_imperial_units = true;
+			break;
+		}
+		add_change(AltosDroid.SETUP_UNITS);
+	}
+
+	private int default_map_type_pos() {
+		int	default_map_type = AltosPreferences.map_type();
+
+		for (int pos = 0; pos < map_types.length; pos++)
+			if (map_type_values[pos] == default_map_type)
+				return pos;
+		return 0;
+	}
+
+	private void select_map_type(int pos) {
+		set_map_type = map_type_values[pos];
+		add_change(AltosDroid.SETUP_MAP_TYPE);
+	}
+
+	private int default_map_source_pos() {
+		int	default_source = AltosDroidPreferences.map_source();
+
+		switch (default_source) {
+		case AltosDroidPreferences.MAP_SOURCE_OFFLINE:
+			return 1;
+		default:
+			return 0;
+		}
+	}
+
+	private void select_map_source(int pos) {
+		switch (pos) {
+		default:
+			set_map_source = AltosDroidPreferences.MAP_SOURCE_ONLINE;
+			break;
+		case 1:
+			set_map_source = AltosDroidPreferences.MAP_SOURCE_OFFLINE;
+			break;
+		}
+		add_change(AltosDroid.SETUP_MAP_SOURCE);
+	}
+
+	private void preload_maps(){
+		Intent intent = new Intent(this, PreloadMapActivity.class);
+		startActivity(intent);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup the window
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		setContentView(R.layout.setup);
+
+		select_rate = (Spinner) findViewById(R.id.select_rate);
+		add_strings(select_rate, rates, default_rate_pos());
+		select_rate.setOnItemSelectedListener(new OnItemSelectedListener() {
+				public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+					select_rate(pos);
+				}
+				public void onNothingSelected(AdapterView<?> parent) {
+				}
+			});
+
+		set_units = (Spinner) findViewById(R.id.set_units);
+		add_strings(set_units, units, default_units_pos());
+		set_units.setOnItemSelectedListener(new OnItemSelectedListener() {
+				public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+					set_units(pos);
+				}
+				public void onNothingSelected(AdapterView<?> parent) {
+				}
+			});
+
+		map_type = (Spinner) findViewById(R.id.map_type);
+		add_strings(map_type, map_types, default_map_type_pos());
+		map_type.setOnItemSelectedListener(new OnItemSelectedListener() {
+				public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+					select_map_type(pos);
+				}
+				public void onNothingSelected(AdapterView<?> parent) {
+				}
+			});
+
+		map_source = (Spinner) findViewById(R.id.map_source);
+		add_strings(map_source, map_sources, default_map_source_pos());
+		map_source.setOnItemSelectedListener(new OnItemSelectedListener() {
+				public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+					select_map_source(pos);
+				}
+				public void onNothingSelected(AdapterView<?> parent) {
+				}
+			});
+
+
+		preload_maps = (Button) findViewById(R.id.preload_maps);
+		preload_maps.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					preload_maps();
+				}
+			});
+
+		done = (Button) findViewById(R.id.done);
+		done.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					done();
+				}
+			});
+
+		// Set result for when the user backs out
+		setResult(Activity.RESULT_CANCELED);
+	}
+
+	@Override
+	protected void onStart() {
+		super.onStart();
+		doBindService();
+	}
+
+	@Override
+	protected void onStop() {
+		super.onStop();
+		doUnbindService();
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index de74420f..19ce86c9 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -32,7 +32,7 @@ import android.widget.*;
 import android.location.Location;
 import android.content.*;
 
-public class TabMap extends AltosDroidTab {
+public class TabMap extends AltosDroidTab implements AltosDroidMapSourceListener {
 
 	AltosLatLon	here;
 
@@ -74,7 +74,8 @@ public class TabMap extends AltosDroidTab {
 		map_offline.onCreateView(altos_droid);
 		map_online = new AltosMapOnline(view.getContext());
 		map_online.onCreateView(altos_droid);
-		set_map_source(AltosDroidPreferences.map_source());
+		map_source_changed(AltosDroidPreferences.map_source());
+		AltosDroidPreferences.register_map_source_listener(this);
 		return view;
 	}
 
@@ -88,6 +89,9 @@ public class TabMap extends AltosDroidTab {
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
+		map_offline.onDestroyView();
+		map_online.onDestroyView();
+		AltosDroidPreferences.unregister_map_source_listener(this);
 	}
 
 	public String tab_name() { return AltosDroid.tab_map_name; }
@@ -144,16 +148,7 @@ public class TabMap extends AltosDroidTab {
 		}
 	}
 
-	@Override
-	public void set_map_type(int map_type) {
-		if (map_offline != null)
-			map_offline.set_map_type(map_type);
-		if (map_online != null)
-			map_online.set_map_type(map_type);
-	}
-
-	@Override
-	public void set_map_source(int map_source) {
+	public void map_source_changed(int map_source) {
 		this.map_source = map_source;
 		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
 			if (map_online != null)
diff --git a/altoslib/AltosMapTypeListener.java b/altoslib/AltosMapTypeListener.java
new file mode 100644
index 00000000..b82bda3f
--- /dev/null
+++ b/altoslib/AltosMapTypeListener.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_10;
+
+public interface AltosMapTypeListener {
+	public void map_type_changed(int map_type);
+}
diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 43fc9f22..4bf48f6d 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -128,6 +128,9 @@ public class AltosPreferences {
 
 	public static int map_cache = 9;
 
+	final static String mapTypePreference = "MAP-TYPE";
+	static int	map_type;
+
 	public static AltosFrequency[] load_common_frequencies() {
 		AltosFrequency[] frequencies = null;
 		boolean	existing = false;
@@ -221,6 +224,7 @@ public class AltosPreferences {
 
 		map_cache = backend.getInt(mapCachePreference, 9);
 		map_cache_listeners = new LinkedList<AltosMapCacheListener>();
+		map_type = backend.getInt(mapTypePreference, AltosMap.maptype_hybrid);
 	}
 
 	public static void flush_preferences() {
@@ -638,4 +642,39 @@ public class AltosPreferences {
 			return map_cache;
 		}
 	}
+
+	static LinkedList<AltosMapTypeListener> map_type_listeners;
+
+	public static void set_map_type(int map_type) {
+		synchronized(backend) {
+			AltosPreferences.map_type = map_type;
+			backend.putInt(mapTypePreference, map_type);
+			flush_preferences();
+		}
+		if (map_type_listeners != null) {
+			for (AltosMapTypeListener l : map_type_listeners) {
+				l.map_type_changed(map_type);
+			}
+		}
+	}
+
+	public static int map_type() {
+		synchronized(backend) {
+			return map_type;
+		}
+	}
+
+	public static void register_map_type_listener(AltosMapTypeListener l) {
+		synchronized(backend) {
+			if (map_type_listeners == null)
+				map_type_listeners = new LinkedList<AltosMapTypeListener>();
+			map_type_listeners.add(l);
+		}
+	}
+
+	public static void unregister_map_type_listener(AltosMapTypeListener l) {
+		synchronized(backend) {
+			map_type_listeners.remove(l);
+		}
+	}
 }
diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index e5d8c964..73638782 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -157,6 +157,7 @@ altoslib_JAVA = \
 	AltosLaunchSites.java \
 	AltosMapLoaderListener.java \
 	AltosMapLoader.java \
+	AltosMapTypeListener.java \
 	AltosVersion.java
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
-- 
cgit v1.2.3


From e0081f7ba6fc9f1e4484d3e291fd30065ad5b620 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 5 May 2016 02:25:52 -0700
Subject: altoslib: Fix map preloading callbacks, run in separate thread

The map storage and tile callbacks were muddled together. Create
clearly separate states for map data and have status updates be
delivered when registering for new status events so that registration
is sufficient to track the state without an explicit call to get the
current state.

Run the map tile creation in a separate thread so that even checking
status of files on disk runs out of the UI thread.

These fixes serve to make the pacifier update more smoothly, and also
not over/under count tile loading so that the loading actually
completes when all of the tiles are loaded.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .../altusmetrum/AltosDroid/AltosMapOffline.java    | 14 ++--
 .../altusmetrum/AltosDroid/PreloadMapActivity.java | 13 ++--
 altoslib/AltosMap.java                             |  8 +--
 altoslib/AltosMapCache.java                        | 78 ++++++----------------
 altoslib/AltosMapInterface.java                    |  2 +-
 altoslib/AltosMapLoader.java                       | 72 ++++++++++----------
 altoslib/AltosMapStore.java                        | 47 ++++++-------
 altoslib/AltosMapTile.java                         | 64 +++++++++++-------
 altoslib/AltosMapTileListener.java                 |  2 -
 altosuilib/AltosUIMapNew.java                      | 18 +++--
 altosuilib/AltosUIMapPreloadNew.java               |  9 ++-
 11 files changed, 146 insertions(+), 181 deletions(-)

(limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java')

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index bde80cfc..ab142b17 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -133,7 +133,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 			if (canvas.quickReject(pt.x, pt.y, pt.x + px_size, pt.y + px_size, Canvas.EdgeType.AA))
 				return;
 
-			AltosImage		altos_image = cache.get(this, store, px_size, px_size);
+			AltosImage		altos_image = this.get_image();
 
 			MapImage 		map_image = (MapImage) altos_image;
 
@@ -150,8 +150,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 				if (t.has_location()) {
 					String	message = null;
 					switch (status) {
-					case AltosMapTile.loading:
-						message = "Loading...";
+					case AltosMapTile.fetching:
+						message = "Fetching...";
 						break;
 					case AltosMapTile.bad_request:
 						message = "Internal error";
@@ -181,14 +181,14 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 			}
 		}
 
-		public MapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-			super(listener, upper_left, center, zoom, maptype, px_size, 2);
+		public MapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+			super(cache, upper_left, center, zoom, maptype, px_size, 2);
 		}
 
 	}
 
-	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		return new MapTile(listener, upper_left, center, zoom, maptype, px_size);
+	public AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		return new MapTile(cache, upper_left, center, zoom, maptype, px_size);
 	}
 
 	public AltosMapPath new_path() {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index 87f03a92..13a44e1f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -107,7 +107,6 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	}
 
 	AltosMap	map;
-	AltosMapLoader	loader;
 
 	class PreloadMapImage implements AltosImage {
 		public void flush() {
@@ -137,14 +136,14 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		public void paint(AltosMapTransform t) {
 		}
 
-		public PreloadMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-			super(listener, upper_left, center, zoom, maptype, px_size, 2);
+		public PreloadMapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+			super(cache, upper_left, center, zoom, maptype, px_size, 2);
 		}
 
 	}
 
-	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		return new PreloadMapTile(listener, upper_left, center, zoom, maptype, px_size);
+	public AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		return new PreloadMapTile(cache, upper_left, center, zoom, maptype, px_size);
 	}
 
 	public int width() {
@@ -265,7 +264,7 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 			AltosDebug.debug("PreloadMap load %f %f %d %d %f %d\n",
 					 lat, lon, min, max, r, t);
-			loader.load(lat, lon, min, max, r, t);
+			new AltosMapLoader(map, this, lat, lon, min, max, r, t);
 		} catch (ParseException e) {
 			AltosDebug.debug("PreloadMap load raised exception %s", e.toString());
 		}
@@ -398,8 +397,6 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 		map = new AltosMap(this);
 
-		loader = new AltosMapLoader(map, this);
-
 		// Listen for GPS and Network position updates
 		LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
 
diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 26851e96..1841277f 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -328,7 +328,8 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 				if (!tiles.containsKey(point)) {
 					AltosLatLon	ul = transform.lat_lon(point);
 					AltosLatLon	center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
-					AltosMapTile tile = map_interface.new_tile(this, ul, center, zoom, maptype, px_size);
+					AltosMapTile tile = map_interface.new_tile(cache, ul, center, zoom, maptype, px_size);
+					tile.add_listener(this);
 					tiles.put(point, tile);
 				}
 			}
@@ -345,11 +346,6 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		centre(lat, lon);
 		tiles.clear();
 		make_tiles();
-		for (AltosMapTile tile : tiles.values()) {
-			tile.add_store_listener(this);
-			if (tile.store_status() != AltosMapTile.loading)
-				listener.notify_tile(tile, tile.store_status());
-		}
 		repaint();
 	}
 
diff --git a/altoslib/AltosMapCache.java b/altoslib/AltosMapCache.java
index 17a36ff3..38e0f769 100644
--- a/altoslib/AltosMapCache.java
+++ b/altoslib/AltosMapCache.java
@@ -23,25 +23,20 @@ import java.net.*;
 public class AltosMapCache implements AltosMapCacheListener {
 
 	/* An entry in the MapCache */
-	class MapCacheElement implements AltosMapStoreListener {
+	class MapCacheElement implements AltosMapTileListener {
 
 		AltosMapTile		tile;		/* Notify when image has been loaded */
 		AltosImage		image;
-		AltosMapStore		store;
 		long			used;
 
 		class loader implements Runnable {
 			public void run() {
-				if (image != null)
-					tile.notify_image(image);
-				try {
-					image = map_interface.load_image(store.file);
-				} catch (Exception ex) {
+				if (image == null) {
+					try {
+						image = map_interface.load_image(tile.store.file);
+					} catch (Exception ex) {
+					}
 				}
-				if (image == null)
-					tile.set_status(AltosMapTile.failed);
-				else
-					tile.set_status(AltosMapTile.success);
 				tile.notify_image(image);
 			}
 		}
@@ -60,41 +55,21 @@ public class AltosMapCache implements AltosMapCacheListener {
 		}
 
 		public boolean has_map() {
-			return store.status() == AltosMapTile.success;
+			return tile.status == AltosMapTile.loaded;
 		}
 
-		public synchronized void notify_store(AltosMapStore store, int status) {
-			switch (status) {
-			case AltosMapTile.loading:
-				break;
-			case AltosMapTile.success:
+		public synchronized void notify_tile(AltosMapTile tile, int status) {
+			if (status == AltosMapTile.fetched) {
+				System.out.printf("tile fetched, loading image\n");
 				load();
-				break;
-			default:
-				tile.set_status(status);
-				tile.notify_image(null);
 			}
 		}
 
-		public MapCacheElement(AltosMapTile tile, AltosMapStore store) throws IOException {
+		public MapCacheElement(AltosMapTile tile) {
 			this.tile = tile;
 			this.image = null;
-			this.store = store;
 			this.used = 0;
-
-			int status = store.status();
-			switch (status) {
-			case AltosMapTile.loading:
-				store.add_listener(this);
-				break;
-			case AltosMapTile.success:
-				load();
-				break;
-			default:
-				tile.set_status(status);
-				tile.notify_image(null);
-				break;
-			}
+			tile.add_listener(this);
 		}
 	}
 
@@ -135,7 +110,7 @@ public class AltosMapCache implements AltosMapCacheListener {
 		}
 	}
 
-	public AltosImage get(AltosMapTile tile, AltosMapStore store, int width, int height) {
+	public AltosImage get(AltosMapTile tile) {
 		int		oldest = -1;
 		long		age = used;
 
@@ -148,7 +123,7 @@ public class AltosMapCache implements AltosMapCacheListener {
 					oldest = i;
 					break;
 				}
-				if (store.equals(element.store)) {
+				if (tile.store.equals(element.tile.store)) {
 					element.used = used++;
 					return element.image;
 				}
@@ -158,24 +133,15 @@ public class AltosMapCache implements AltosMapCacheListener {
 				}
 			}
 
-			try {
-				element = new MapCacheElement(tile, store);
-				element.used = used++;
-				if (elements[oldest] != null)
-					elements[oldest].flush();
+			element = new MapCacheElement(tile);
+			element.used = used++;
+			if (elements[oldest] != null)
+				elements[oldest].flush();
 
-				elements[oldest] = element;
-
-				if (element.image == null)
-					tile.set_status(AltosMapTile.loading);
-				else
-					tile.set_status(AltosMapTile.success);
-
-				return element.image;
-			} catch (IOException e) {
-				tile.set_status(AltosMapTile.failed);
-				return null;
-			}
+			elements[oldest] = element;
+			System.out.printf("AltosMapCache.get image ? %s\n",
+					  element.image == null ? "false" : "true");
+			return element.image;
 		}
 	}
 
diff --git a/altoslib/AltosMapInterface.java b/altoslib/AltosMapInterface.java
index 71936ad2..756a78f2 100644
--- a/altoslib/AltosMapInterface.java
+++ b/altoslib/AltosMapInterface.java
@@ -29,7 +29,7 @@ public interface AltosMapInterface {
 
 	public abstract AltosMapMark new_mark(double lat, double lon, int state);
 
-	public abstract AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size);
+	public abstract AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size);
 
 	public abstract int width();
 
diff --git a/altoslib/AltosMapLoader.java b/altoslib/AltosMapLoader.java
index 15fd756e..7112a1c4 100644
--- a/altoslib/AltosMapLoader.java
+++ b/altoslib/AltosMapLoader.java
@@ -24,7 +24,7 @@ import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
 
-public class AltosMapLoader implements AltosMapTileListener, AltosMapStoreListener {
+public class AltosMapLoader extends Thread implements AltosMapTileListener {
 	AltosMapLoaderListener	listener;
 
 	double	latitude, longitude;
@@ -91,10 +91,8 @@ public class AltosMapLoader implements AltosMapTileListener, AltosMapStoreListen
 				AltosPointInt	point = new AltosPointInt(x, y);
 				AltosLatLon	ul = transform.lat_lon(point);
 				AltosLatLon	center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
-				AltosMapTile	tile = map.map_interface.new_tile(this, ul, center, zoom, maptype, AltosMap.px_size);
-				tile.add_store_listener(this);
-				if (tile.store_status() != AltosMapTile.loading)
-					notify_tile(tile, tile.store_status());
+				AltosMapTile	tile = map.map_interface.new_tile(null, ul, center, zoom, maptype, AltosMap.px_size);
+				tile.add_listener(this);
 			}
 		}
 	}
@@ -123,7 +121,7 @@ public class AltosMapLoader implements AltosMapTileListener, AltosMapStoreListen
 		do_load();
 	}
 
-	private void start_load() {
+	public void run() {
 
 		cur_z = min_z;
 		int ntype = 0;
@@ -138,66 +136,64 @@ public class AltosMapLoader implements AltosMapTileListener, AltosMapStoreListen
 
 		cur_type = next_type(0);
 
+		tiles_total = 0;
 		for (int z = min_z; z <= max_z; z++)
-			tiles_total += tiles_per_layer(z);
+			tiles_total += tiles_per_layer(z) * ntype;
 
 		layers_total = (max_z - min_z + 1) * ntype;
 		layers_loaded = 0;
 		tiles_loaded_total = 0;
 
-		listener.debug("total tiles %d\n", tiles_total);
+		listener.debug("total tiles %d layers %d\n", tiles_total, layers_total);
 
 		listener.loader_start(tiles_total);
 		do_load();
 	}
 
-	public void load(double latitude, double longitude, int min_z, int max_z, double radius, int all_types) {
-		listener.debug("lat %f lon %f min_z %d max_z %d radius %f all_types %d\n",
-			       latitude, longitude, min_z, max_z, radius, all_types);
-		this.latitude = latitude;
-		this.longitude = longitude;
-		this.min_z = min_z;
-		this.max_z = max_z;
-		this.radius = radius;
-		this.all_types = all_types;
-		start_load();
-	}
-
-	public synchronized void notify_store(AltosMapStore store, int status) {
+	public synchronized void notify_tile(AltosMapTile tile, int status) {
 		boolean	do_next = false;
-		if (status == AltosMapTile.loading)
+		if (status == AltosMapTile.fetching)
 			return;
 
+		tile.remove_listener(this);
+
 		if (layers_loaded >= layers_total)
 			return;
 
 		++tiles_loaded_total;
 		++tiles_loaded_layer;
 
+		listener.debug("AltosMapLoader.notify_tile status %d total %d of %d layer %d of %d\n",
+			       status, tiles_loaded_total, tiles_total, tiles_loaded_layer, tiles_this_layer);
+
 		if (tiles_loaded_layer == tiles_this_layer) {
 			++layers_loaded;
 			listener.debug("%d layers loaded\n", layers_loaded);
-			if (layers_loaded == layers_total) {
-				listener.loader_done(tiles_total);
-				return;
-			} else {
-				do_next = true;
-			}
+			do_next = true;
 		}
-		listener.loader_notify(tiles_loaded_total,
-				       tiles_total, store.file.toString());
-		if (do_next)
-			next_load();
-	}
 
-	public synchronized void notify_tile(AltosMapTile tile, int status) {
-		notify_store(tile.store, status);
+		if (tiles_loaded_total == tiles_total)
+			listener.loader_done(tiles_total);
+		else {
+			listener.loader_notify(tiles_loaded_total,
+					       tiles_total, tile.store.file.toString());
+			if (do_next)
+				next_load();
+		}
 	}
 
-	public AltosMapCache cache() { return map.cache(); }
-
-	public AltosMapLoader(AltosMap map, AltosMapLoaderListener listener) {
+	public AltosMapLoader(AltosMap map, AltosMapLoaderListener listener,
+			      double latitude, double longitude, int min_z, int max_z, double radius, int all_types) {
+		listener.debug("lat %f lon %f min_z %d max_z %d radius %f all_types %d\n",
+			       latitude, longitude, min_z, max_z, radius, all_types);
 		this.map = map;
 		this.listener = listener;
+		this.latitude = latitude;
+		this.longitude = longitude;
+		this.min_z = min_z;
+		this.max_z = max_z;
+		this.radius = radius;
+		this.all_types = all_types;
+		start();
 	}
 }
diff --git a/altoslib/AltosMapStore.java b/altoslib/AltosMapStore.java
index eebef310..aed365ca 100644
--- a/altoslib/AltosMapStore.java
+++ b/altoslib/AltosMapStore.java
@@ -35,6 +35,7 @@ public class AltosMapStore {
 	public synchronized void add_listener(AltosMapStoreListener listener) {
 		if (!listeners.contains(listener))
 			listeners.add(listener);
+		listener.notify_store(this, status);
 	}
 
 	public synchronized void remove_listener(AltosMapStoreListener listener) {
@@ -110,7 +111,7 @@ public class AltosMapStore {
 				file.delete();
 			return AltosMapTile.bad_request;
 		}
-		return AltosMapTile.success;
+		return AltosMapTile.fetched;
 	}
 
 	static Object	fetch_lock = new Object();
@@ -118,42 +119,42 @@ public class AltosMapStore {
 	static final long	forbidden_interval = 60l * 1000l * 1000l * 1000l;
 	static final long 	google_maps_ratelimit_ms = 1200;
 
-	static Object	loader_lock = new Object();
+	static Object	fetcher_lock = new Object();
 
 	static LinkedList<AltosMapStore> waiting = new LinkedList<AltosMapStore>();
 	static LinkedList<AltosMapStore> running = new LinkedList<AltosMapStore>();
 
-	static final int concurrent_loaders = 128;
+	static final int concurrent_fetchers = 128;
 
-	static void start_loaders() {
-		while (!waiting.isEmpty() && running.size() < concurrent_loaders) {
+	static void start_fetchers() {
+		while (!waiting.isEmpty() && running.size() < concurrent_fetchers) {
 			AltosMapStore 	s = waiting.remove();
 			running.add(s);
-			Thread lt = s.make_loader_thread();
+			Thread lt = s.make_fetcher_thread();
 			lt.start();
 		}
 	}
 
-	void finish_loader() {
-		synchronized(loader_lock) {
+	void finish_fetcher() {
+		synchronized(fetcher_lock) {
 			running.remove(this);
-			start_loaders();
+			start_fetchers();
 		}
 	}
 
-	void add_loader() {
-		synchronized(loader_lock) {
+	void add_fetcher() {
+		synchronized(fetcher_lock) {
 			waiting.add(this);
-			start_loaders();
+			start_fetchers();
 		}
 	}
 
-	class loader implements Runnable {
+	class fetcher implements Runnable {
 
 		public void run() {
 			try {
 				if (file.exists()) {
-					notify_listeners(AltosMapTile.success);
+					notify_listeners(AltosMapTile.fetched);
 					return;
 				}
 
@@ -170,7 +171,7 @@ public class AltosMapStore {
 					synchronized (fetch_lock) {
 						long startTime = System.nanoTime();
 						new_status = fetch_url();
-						if (new_status == AltosMapTile.success) {
+						if (new_status == AltosMapTile.fetched) {
 							long duration_ms = (System.nanoTime() - startTime) / 1000000;
 							if (duration_ms < google_maps_ratelimit_ms) {
 								try {
@@ -186,17 +187,17 @@ public class AltosMapStore {
 				}
 				notify_listeners(new_status);
 			} finally {
-				finish_loader();
+				finish_fetcher();
 			}
 		}
 	}
 
-	private Thread make_loader_thread() {
-		return new Thread(new loader());
+	private Thread make_fetcher_thread() {
+		return new Thread(new fetcher());
 	}
 
-	private void load() {
-		add_loader();
+	private void fetch() {
+		add_fetcher();
 	}
 
 	private AltosMapStore (String url, File file) {
@@ -204,10 +205,10 @@ public class AltosMapStore {
 		this.file = file;
 
 		if (file.exists())
-			status = AltosMapTile.success;
+			status = AltosMapTile.fetched;
 		else {
-			status = AltosMapTile.loading;
-			load();
+			status = AltosMapTile.fetching;
+			fetch();
 		}
 	}
 
diff --git a/altoslib/AltosMapTile.java b/altoslib/AltosMapTile.java
index 076c5937..fdc8ff65 100644
--- a/altoslib/AltosMapTile.java
+++ b/altoslib/AltosMapTile.java
@@ -20,22 +20,23 @@ package org.altusmetrum.altoslib_10;
 import java.io.*;
 import java.util.*;
 
-public abstract class AltosMapTile implements AltosFontListener {
-	AltosMapTileListener	listener;
+public abstract class AltosMapTile implements AltosFontListener, AltosMapStoreListener {
+	LinkedList<AltosMapTileListener>	listeners = new LinkedList<AltosMapTileListener>();
 	public AltosLatLon	upper_left, center;
 	public int		px_size;
 	int		zoom;
 	int		maptype;
 	int		scale;
+	private AltosMapCache	cache;
 	public AltosMapStore	store;
-	public AltosMapCache	cache;
 	public int	status;
 
-	static public final int	success = 0;
-	static public final int	loading = 1;
-	static public final int	failed = 2;
-	static public final int	bad_request = 3;
-	static public final int	forbidden = 4;
+	static public final int	loaded = 0;	/* loaded from file */
+	static public final int	fetched = 1;	/* downloaded to file */
+	static public final int	fetching = 2;	/* downloading from net */
+	static public final int	failed = 3;	/* loading from file failed */
+	static public final int	bad_request = 4;/* downloading failed */
+	static public final int	forbidden = 5;	/* downloading failed */
 
 	private File map_file() {
 		double lat = center.lat;
@@ -79,33 +80,46 @@ public abstract class AltosMapTile implements AltosFontListener {
 	public void font_size_changed(int font_size) {
 	}
 
-	public void set_status(int status) {
+	private synchronized void notify_listeners(int status) {
 		this.status = status;
-		listener.notify_tile(this, status);
+		for (AltosMapTileListener listener : listeners)
+			listener.notify_tile(this, status);
 	}
 
-	public void notify_image(AltosImage image) {
-		listener.notify_tile(this, status);
+	public void notify_store(AltosMapStore store, int status) {
+//		System.out.printf("AltosMapTile.notify_store %d\n", status);
+		notify_listeners(status);
 	}
 
-	public int store_status() {
-		return store.status();
+	public void notify_image(AltosImage image) {
+		if (image == null)
+			status = failed;
+		else
+			status = loaded;
+		notify_listeners(status);
 	}
 
-	public void add_store_listener(AltosMapStoreListener listener) {
-		store.add_listener(listener);
+	public abstract void paint(AltosMapTransform t);
+
+	public AltosImage get_image() {
+		if (cache == null)
+			return null;
+		return cache.get(this);
 	}
 
-	public void remove_store_listener(AltosMapStoreListener listener) {
-		store.remove_listener(listener);
+	public synchronized void add_listener(AltosMapTileListener listener) {
+		if (!listeners.contains(listener))
+			listeners.add(listener);
+		listener.notify_tile(this, status);
 	}
 
-	public abstract void paint(AltosMapTransform t);
+	public synchronized void remove_listener(AltosMapTileListener listener) {
+		listeners.remove(listener);
+	}
 
-	public AltosMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size, int scale) {
-		this.listener = listener;
+	public AltosMapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size, int scale) {
+		this.cache = cache;
 		this.upper_left = upper_left;
-		this.cache = listener.cache();
 
 		while (center.lon < -180.0)
 			center.lon += 360.0;
@@ -118,11 +132,11 @@ public abstract class AltosMapTile implements AltosFontListener {
 		this.px_size = px_size;
 		this.scale = scale;
 
-		status = AltosMapTile.loading;
 		store = AltosMapStore.get(map_url(), map_file());
+		store.add_listener(this);
 	}
 
-	public AltosMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		this(listener, upper_left, center, zoom, maptype, px_size, 1);
+	public AltosMapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		this(cache, upper_left, center, zoom, maptype, px_size, 1);
 	}
 }
diff --git a/altoslib/AltosMapTileListener.java b/altoslib/AltosMapTileListener.java
index 6ab03638..6d78b205 100644
--- a/altoslib/AltosMapTileListener.java
+++ b/altoslib/AltosMapTileListener.java
@@ -19,6 +19,4 @@ package org.altusmetrum.altoslib_10;
 
 public interface AltosMapTileListener {
 	abstract public void notify_tile(AltosMapTile tile, int status);
-
-	abstract public AltosMapCache cache();
 }
diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index c867bf2e..a90e8c91 100644
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMapNew.java
@@ -241,8 +241,8 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 	}
 
 	class MapTile extends AltosMapTile {
-		public MapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-			super(listener, upper_left, center, zoom, maptype, px_size);
+		public MapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+			super(cache, upper_left, center, zoom, maptype, px_size);
 		}
 
 		public void paint(AltosMapTransform t) {
@@ -254,11 +254,9 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 			if (!g.hitClip(point.x, point.y, px_size, px_size))
 				return;
 
-			AltosImage altos_image = cache.get(this, store, px_size, px_size);
-
+			AltosImage	altos_image = get_image();
 			AltosUIImage	ui_image = (AltosUIImage) altos_image;
-
-			Image image = null;
+			Image		image = null;
 
 			if (ui_image != null)
 				image = ui_image.image;
@@ -272,8 +270,8 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 				if (t.has_location()) {
 					String	message = null;
 					switch (status) {
-					case AltosMapTile.loading:
-						message = "Loading...";
+					case AltosMapTile.fetching:
+						message = "Fetching...";
 						break;
 					case AltosMapTile.bad_request:
 						message = "Internal error";
@@ -334,8 +332,8 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 		return new MapMark(lat, lon, state);
 	}
 
-	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		return new MapTile(listener, upper_left, center, zoom, maptype, px_size);
+	public AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		return new MapTile(cache, upper_left, center, zoom, maptype, px_size);
 	}
 
 	public int width() {
diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java
index b5f4dbf8..3269bbdd 100644
--- a/altosuilib/AltosUIMapPreloadNew.java
+++ b/altosuilib/AltosUIMapPreloadNew.java
@@ -127,8 +127,6 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 
 	JProgressBar	pbar;
 
-	AltosMapLoader	loader;
-
 	JLabel		site_list_label;
 	JComboBox<AltosLaunchSite>	site_list;
 
@@ -238,7 +236,10 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 						r = r * 1000;
 					loading = true;
 
-					loader.load(latitude, longitude, min_z, max_z, r, all_types());
+					new AltosMapLoader(map.map, this,
+							   latitude, longitude,
+							   min_z, max_z, r, all_types());
+
 				} catch (ParseException pe) {
 					load_button.setSelected(false);
 				}
@@ -271,8 +272,6 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 
 		map = new AltosUIMapNew();
 
-		loader = new AltosMapLoader(map.map, this);
-
 		c.fill = GridBagConstraints.BOTH;
 		c.anchor = GridBagConstraints.CENTER;
 		c.insets = i;
-- 
cgit v1.2.3