From cb23b992be8ba40c97d8988c134a814a13ccd58c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 25 May 2015 20:34:05 -0700
Subject: altoslib/altosuilib: Update library version to 7

So many ABI/API changes

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

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 871b94a1..83c8f7f8 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -19,7 +19,7 @@ package org.altusmetrum.AltosDroid;
 
 import java.util.Arrays;
 
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_7.*;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
-- 
cgit v1.2.3


From 85013045ca505096064aaf45c312b158d0263d2a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2015 01:05:18 -0700
Subject: altosdroid: Add map types and map preloading UIs

This adds an ugly dialog to select which maps to preload, and also
adds the ability to display other map types.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/AndroidManifest.xml                     |  10 +
 .../ic_maps_indicator_current_position.png         | Bin 0 -> 2079 bytes
 .../ic_maps_indicator_current_position.png         | Bin 0 -> 1205 bytes
 altosdroid/res/layout/device_list.xml              |  16 +-
 altosdroid/res/layout/map_preload.xml              | 129 +++++++++
 altosdroid/res/layout/map_type.xml                 |  47 +++
 altosdroid/res/menu/option_menu.xml                |  28 +-
 altosdroid/res/values/strings.xml                  |  20 ++
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |  24 ++
 .../org/altusmetrum/AltosDroid/AltosDroidTab.java  |   3 +
 .../altusmetrum/AltosDroid/MapTypeActivity.java    |  84 ++++++
 .../altusmetrum/AltosDroid/PreloadMapActivity.java | 322 +++++++++++++++++++++
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |  13 +
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  |  11 +-
 .../altusmetrum/AltosDroid/TelemetryService.java   |   1 -
 15 files changed, 688 insertions(+), 20 deletions(-)
 create mode 100644 altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png
 create mode 100644 altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png
 create mode 100644 altosdroid/res/layout/map_preload.xml
 create mode 100644 altosdroid/res/layout/map_type.xml
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java

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

diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml
index 71c6fb12..592373d4 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml
@@ -72,6 +72,16 @@
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
 
+        <activity android:name=".PreloadMapActivity"
+                  android:label="@string/preload_maps"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:configChanges="orientation|keyboardHidden" />
+
+        <activity android:name=".MapTypeActivity"
+                  android:label="@string/map_type"
+                  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/drawable-hdpi/ic_maps_indicator_current_position.png b/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 00000000..bc9160df
Binary files /dev/null and b/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png differ
diff --git a/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png b/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 00000000..4e427d89
Binary files /dev/null and b/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png differ
diff --git a/altosdroid/res/layout/device_list.xml b/altosdroid/res/layout/device_list.xml
index 93d65517..bf295e4c 100644
--- a/altosdroid/res/layout/device_list.xml
+++ b/altosdroid/res/layout/device_list.xml
@@ -32,6 +32,13 @@
         android:textColor="#fff"
         android:paddingLeft="5dp"
     />
+    <ListView android:id="@+id/new_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
+    />
     <TextView android:id="@+id/title_paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -44,13 +51,8 @@
     <ListView android:id="@+id/paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:stackFromBottom="true"
         android:layout_weight="1"
-    />
-    <ListView android:id="@+id/new_devices"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stackFromBottom="true"
-        android:layout_weight="2"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
     />
 </LinearLayout>
diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/res/layout/map_preload.xml
new file mode 100644
index 00000000..1d1fca32
--- /dev/null
+++ b/altosdroid/res/layout/map_preload.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2015 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"
+    >
+  <ScrollView android:layout_width="fill_parent"
+	      android:layout_height="wrap_content">
+    <LinearLayout android:layout_width="wrap_content"
+		  android:layout_height="wrap_content"
+                  android:orientation="vertical">
+      <TextView android:id="@+id/preload_site_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_site_label"
+		/>
+      <Spinner android:id="@+id/preload_site_list"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_site_label"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_latitude_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_latitude_label"
+		/>
+      <EditText android:id="@+id/preload_latitude"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/preload_latitude_label"
+		android:inputType="number"/>
+      <TextView android:id="@+id/preload_longitude_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_longitude_label"
+		/>
+      <EditText android:id="@+id/preload_longitude"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/preload_longitude_label"
+		android:inputType="number"/>
+      <TextView android:id="@+id/preload_types"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_types"
+		/>
+      <CheckBox android:id="@+id/preload_hybrid"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_hybrid"
+		/>
+      <CheckBox android:id="@+id/preload_satellite"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_satellite"
+		/>
+      <CheckBox android:id="@+id/preload_roadmap"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_roadmap"
+		/>
+      <CheckBox android:id="@+id/preload_terrain"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_terrain"
+		/>
+      <TextView android:id="@+id/preload_min_zoom_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_min_zoom"
+		/>
+      <Spinner android:id="@+id/preload_min_zoom"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_min_zoom"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_max_zoom_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_max_zoom"
+		/>
+      <Spinner android:id="@+id/preload_max_zoom"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_max_zoom"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_tile_radius_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_tile_radius"
+		/>
+      <Spinner android:id="@+id/preload_tile_radius"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_tile_radius"
+	       android:spinnerMode="dropdown"
+	       />
+      <Button android:id="@+id/preload_load"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/preload_load"
+	      />
+      <ProgressBar android:id="@+id/preload_progress"
+		   android:layout_width="match_parent"
+		   android:layout_height="wrap_content"
+		   style="@android:style/Widget.ProgressBar.Horizontal"
+		   />
+    </LinearLayout>
+  </ScrollView>
+</LinearLayout>
diff --git a/altosdroid/res/layout/map_type.xml b/altosdroid/res/layout/map_type.xml
new file mode 100644
index 00000000..610e6bbf
--- /dev/null
+++ b/altosdroid/res/layout/map_type.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2015 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"
+    >
+  <Button android:id="@+id/map_type_hybrid"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_hybrid"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_satellite"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_satellite"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_roadmap"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_roadmap"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_terrain"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_terrain"
+	   android:onClick="selectType"
+	   />
+</LinearLayout>
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index f005e881..2109ae04 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- 
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+  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.
 
-          http://www.apache.org/licenses/LICENSE-2.0
+  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.
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+  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.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/connect_scan"
@@ -32,4 +34,10 @@
     <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" />
 </menu>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 8a5b29b4..1af0dbb7 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -32,6 +32,11 @@
 	<string name="select_freq">Select radio frequency</string>
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
+	<string name="preload_maps">Load Maps</string>
+	<string name="map_type">Map Type</string>
+
+	<!-- MapTypeActivity -->
+	<string name="map_type">Map Type</string>
 
 	<!-- DeviceListActivity -->
 	<string name="scanning">scanning for devices…</string>
@@ -84,4 +89,19 @@
 	<string name="pad_lon_label">Pad Lon</string>
 	<string name="pad_alt_label">Pad Alt</string>
 
+	<!-- Map preload -->
+	<string name="preload_site_label">Known Launch Sites</string>
+	<string name="preload_latitude_label">Latitude</string>
+	<string name="preload_longitude_label">Longitude</string>
+
+	<string name="preload_types">Map Types</string>
+	<string name="preload_hybrid">Hybrid</string>
+	<string name="preload_satellite">Satellite</string>
+	<string name="preload_roadmap">Roadmap</string>
+	<string name="preload_terrain">Terrain</string>
+	<string name="preload_min_zoom">Minimum Zoom</string>
+	<string name="preload_max_zoom">Maximum Zoom</string>
+	<string name="preload_tile_radius">Tile Radius</string>
+	
+	<string name="preload_load">Load Map</string>
 </resources>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 65618646..97373ab8 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -73,6 +73,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	// Intent request codes
 	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 FragmentManager	fm;
 
@@ -630,6 +632,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				finish();
 			}
 			break;
+		case REQUEST_MAP_TYPE:
+			if (resultCode == Activity.RESULT_OK)
+				set_map_type(data);
+			break;
 		}
 	}
 
@@ -669,6 +675,16 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 	}
 
+	private void set_map_type(Intent data) {
+		int	mode = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+
+		AltosDebug.debug("intent set_map_type %d\n", mode);
+		if (mode != -1) {
+			for (AltosDroidTab mTab : mTabs)
+				mTab.set_map_type(mode);
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
@@ -789,6 +805,14 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			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;
 		}
 		return false;
 	}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index d33ad05b..b3824aa3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -37,6 +37,9 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 
 	public abstract String tab_name();
 
+	public void set_map_type(int map_type) {
+	}
+
 	public void units_changed(boolean imperial_units) {
 		if (!isHidden() && last_state != null)
 			show(last_state, last_from_receiver, last_receiver);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
new file mode 100644
index 00000000..e43841a8
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2015 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.util.*;
+import org.altusmetrum.AltosDroid.R;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.*;
+import android.widget.AdapterView.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+public class MapTypeActivity extends Activity {
+	private Button hybrid;
+	private Button satellite;
+	private Button roadmap;
+	private Button terrain;
+	private int selected_type;
+
+	public static final String EXTRA_MAP_TYPE = "map_type";
+
+	private void done(int type) {
+
+		Intent intent = new Intent();
+		intent.putExtra(EXTRA_MAP_TYPE, type);
+		setResult(Activity.RESULT_OK, intent);
+		finish();
+	}
+
+	public void selectType(View view) {
+		AltosDebug.debug("selectType %s", view.toString());
+		if (view == hybrid)
+			done(AltosMap.maptype_hybrid);
+		if (view == satellite)
+			done(AltosMap.maptype_satellite);
+		if (view == roadmap)
+			done(AltosMap.maptype_roadmap);
+		if (view == terrain)
+			done(AltosMap.maptype_terrain);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup the window
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		setContentView(R.layout.map_type);
+
+		hybrid = (Button) findViewById(R.id.map_type_hybrid);
+		satellite = (Button) findViewById(R.id.map_type_satellite);
+		roadmap = (Button) findViewById(R.id.map_type_roadmap);
+		terrain = (Button) findViewById(R.id.map_type_terrain);
+
+		// Set result CANCELED incase the user backs out
+		setResult(Activity.RESULT_CANCELED);
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
new file mode 100644
index 00000000..2febaf29
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright © 2015 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.util.*;
+import java.io.*;
+import java.text.*;
+
+import org.altusmetrum.AltosDroid.R;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.*;
+import android.widget.AdapterView.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+/**
+ * This Activity appears as a dialog. It lists any paired devices and
+ * devices detected in the area after discovery. When a device is chosen
+ * by the user, the MAC address of the device is sent back to the parent
+ * Activity in the result Intent.
+ */
+public class PreloadMapActivity extends Activity implements AltosLaunchSiteListener, AltosMapInterface, AltosMapLoaderListener {
+
+	private ArrayAdapter<AltosLaunchSite> known_sites_adapter;
+
+	private CheckBox	hybrid;
+	private CheckBox	satellite;
+	private CheckBox	roadmap;
+	private CheckBox	terrain;
+
+	private Spinner		min_zoom;
+	private Spinner		max_zoom;
+	private Spinner		tile_radius;
+
+	private EditText	latitude;
+	private EditText	longitude;
+
+	private ProgressBar	progress;
+
+	/* AltosMapLoaderListener interfaces */
+	public void loader_start(final int max) {
+		AltosDebug.debug("loader_start max %d\n", max);
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.setMax(max);
+					progress.setProgress(0);
+				}
+			});
+	}
+
+	public void loader_notify(final int cur, final int max, final String name) {
+		AltosDebug.debug("loader_notify cur %4d max %4d %s\n", cur, max, name);
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.setProgress(cur);
+				}
+			});
+	}
+
+	public void loader_done(int max) {
+		AltosDebug.debug("loader_done max %d\n", max);
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.setProgress(0);
+					finish();
+				}
+			});
+	}
+
+	/* AltosLaunchSiteListener interface */
+	public void notify_launch_sites(final List<AltosLaunchSite> sites) {
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					for (AltosLaunchSite site : sites)
+						known_sites_adapter.add(site);
+				}
+			});
+	}
+
+	AltosMap	map;
+	AltosMapLoader	loader;
+
+	class PreloadMapImage implements AltosImage {
+		public void flush() {
+		}
+
+		public PreloadMapImage(File file) {
+			AltosDebug.debug("preload file %s\n", file.toString());
+		}
+	}
+
+	public AltosMapPath new_path() {
+		return null;
+	}
+
+	public AltosMapLine new_line() {
+		return null;
+	}
+
+	public AltosImage load_image(File file) throws Exception {
+		return new PreloadMapImage(file);
+	}
+
+	public AltosMapMark new_mark(double lat, double lon, int state) {
+		return null;
+	}
+
+	class PreloadMapTile extends AltosMapTile {
+		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 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 int width() {
+		return AltosMap.px_size;
+	}
+
+	public int height() {
+		return AltosMap.px_size;
+	}
+
+	public void repaint() {
+	}
+
+	public void repaint(AltosRectangle damage) {
+	}
+
+	public void set_zoom_label(String label) {
+		AltosDebug.debug("zoom label %s\n", label);
+	}
+
+	private double text(EditText view) throws ParseException {
+		return AltosParse.parse_double_locale(view.getEditableText().toString());
+	}
+
+	private double latitude() throws ParseException {
+		return text(latitude);
+	}
+
+	private double longitude() throws ParseException {
+		return text(longitude);
+	}
+
+	private int value(Spinner spinner) {
+		return (Integer) spinner.getSelectedItem();
+	}
+
+	private int min_z() {
+		return value(min_zoom);
+	}
+
+	private int max_z() {
+		return value(max_zoom);
+	}
+
+	private int radius() {
+		return value(tile_radius);
+	}
+
+	private int bit(CheckBox box, int value) {
+		if (box.isChecked())
+			return 1 << value;
+		return 0;
+	}
+
+	private int types() {
+		return (bit(hybrid, AltosMap.maptype_hybrid) |
+			bit(satellite, AltosMap.maptype_satellite) |
+			bit(roadmap, AltosMap.maptype_roadmap) |
+			bit(terrain, AltosMap.maptype_terrain));
+	}
+
+	private void load() {
+		try {
+			double	lat = latitude();
+			double	lon = longitude();
+			int	min = min_z();
+			int	max = max_z();
+			int	r = radius();
+			int	t = types();
+
+			AltosDebug.debug("load lat %12.6f lon %12.6f min %d max %d r %d types %x\n",
+					 lat, lon, min, max, r, t);
+			loader.load(lat, lon, min, max, r, t);
+		} catch (ParseException e) {
+		}
+	}
+
+	private void add_numbers(Spinner spinner, int min, int max, int def) {
+
+		ArrayAdapter<Integer> adapter = new ArrayAdapter<Integer>(this, android.R.layout.simple_spinner_item);
+
+		int	spinner_def = 0;
+		int	pos = 0;
+
+		for (int i = min; i <= max; i++) {
+			adapter.add(new Integer(i));
+			if (i == def)
+				spinner_def = pos;
+			pos++;
+		}
+
+		spinner.setAdapter(adapter);
+		spinner.setSelection(spinner_def);
+	}
+
+	class SiteListListener implements OnItemSelectedListener {
+		public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+			AltosLaunchSite	site = (AltosLaunchSite) parent.getItemAtPosition(pos);
+			AltosDebug.debug("Site selected: %s\n", site.toString());
+
+			latitude.setText(new StringBuffer(String.format("%12.6f", site.latitude)));
+			longitude.setText(new StringBuffer(String.format("%12.6f", site.longitude)));
+		}
+		public void onNothingSelected(AdapterView<?> parent) {
+		}
+
+		public SiteListListener() {
+		}
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AltosDebug.debug("preload map onCreate");
+
+		// Setup the window
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		setContentView(R.layout.map_preload);
+
+		// Set result CANCELED incase the user backs out
+		setResult(Activity.RESULT_CANCELED);
+
+		// Initialize the button to perform device discovery
+		Button loadButton = (Button) findViewById(R.id.preload_load);
+		loadButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				load();
+			}
+		});
+
+		latitude = (EditText) findViewById(R.id.preload_latitude);
+		longitude = (EditText) findViewById(R.id.preload_longitude);
+
+		hybrid = (CheckBox) findViewById(R.id.preload_hybrid);
+		satellite = (CheckBox) findViewById(R.id.preload_satellite);
+		roadmap = (CheckBox) findViewById(R.id.preload_roadmap);
+		terrain = (CheckBox) findViewById(R.id.preload_terrain);
+
+		hybrid.setChecked(true);
+
+		min_zoom = (Spinner) findViewById(R.id.preload_min_zoom);
+		add_numbers(min_zoom,
+			    AltosMap.min_zoom - AltosMap.default_zoom,
+			    AltosMap.max_zoom - AltosMap.default_zoom, -2);
+		max_zoom = (Spinner) findViewById(R.id.preload_max_zoom);
+		add_numbers(max_zoom,
+			    AltosMap.min_zoom - AltosMap.default_zoom,
+			    AltosMap.max_zoom - AltosMap.default_zoom, 2);
+		tile_radius = (Spinner) findViewById(R.id.preload_tile_radius);
+		add_numbers(tile_radius, 1, 5, 3);
+
+		progress = (ProgressBar) findViewById(R.id.preload_progress);
+
+		// Initialize array adapters. One for already paired devices and
+		// one for newly discovered devices
+		Spinner known_sites_spinner = (Spinner) findViewById(R.id.preload_site_list);
+
+		known_sites_adapter = new ArrayAdapter<AltosLaunchSite>(this, android.R.layout.simple_spinner_item);
+
+		known_sites_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+		known_sites_spinner.setAdapter(known_sites_adapter);
+		known_sites_spinner.setOnItemSelectedListener(new SiteListListener());
+
+		map = new AltosMap(this);
+
+		loader = new AltosMapLoader(map, this);
+
+		new AltosLaunchSites(this);
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 83c8f7f8..5376d423 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -199,6 +199,19 @@ public class TabMap extends AltosDroidTab {
 
 	}
 
+	public void set_map_type(int map_type) {
+		if (mMap != null) {
+			if (map_type == AltosMap.maptype_hybrid)
+				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
+			else if (map_type == AltosMap.maptype_satellite)
+				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+			else if (map_type == AltosMap.maptype_terrain)
+				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
+			else
+				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		}
+	}
+
 	public TabMap() {
 	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 6742e606..31acda75 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -39,6 +39,7 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	AltosMap map;
 
 	AltosLatLon	here;
+	AltosLatLon	pad;
 
 	Canvas	canvas;
 	Paint	paint;
@@ -84,6 +85,7 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 				canvas.drawLine((float) rocket_screen.x, (float) rocket_screen.y,
 						(float) here_screen.x, (float) here_screen.y, paint);
 			}
+			draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
 			draw_bitmap(map.last_position, rocket_bitmap, rocket_off_x, rocket_off_y);
 			draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
 		}
@@ -271,8 +273,6 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	class MapMark extends AltosMapMark {
 		public void paint(AltosMapTransform t) {
-			if (state == AltosLib.ao_flight_boost)
-				draw_bitmap(lat_lon, pad_bitmap, pad_off_x, pad_off_y);
 		}
 
 		MapMark(double lat, double lon, int state) {
@@ -472,6 +472,8 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 				if (state.gps.locked && state.gps.nsat >= 4)
 					center (state.gps.lat, state.gps.lon, 10);
 			}
+			if (state.pad_lat != AltosLib.MISSING && pad == null)
+				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
 		}
 
 		if (receiver != null) {
@@ -489,6 +491,11 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	}
 
+	public void set_map_type(int map_type) {
+		if (map != null)
+			map.set_maptype(map_type);
+	}
+
 	public TabMapOffline() {
 	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 627f5957..eae360db 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -334,7 +334,6 @@ public class TelemetryService extends Service implements LocationListener {
 
 	private void start_altos_bluetooth(DeviceAddress address, boolean pause) {
 		// Get the BLuetoothDevice object
-		AltosDebug.check_ui("start_altos_bluetooth\n");
 		BluetoothDevice device = bluetooth_adapter.getRemoteDevice(address.address);
 
 		disconnect(false);
-- 
cgit v1.2.3


From 4315b91d7afc2391e3f7444906ac226500bf1345 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2015 22:08:51 -0700
Subject: altosdroid: Save selected map type in AltosDroid object

The map tabs may not have been created when the map type was selected,
so save the desired type in the main application object.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java    | 11 +++++++----
 altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java        |  1 +
 altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java |  4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 6c6566ba..5be9ba84 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -76,6 +76,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	public static final int REQUEST_PRELOAD_MAPS   = 3;
 	public static final int REQUEST_MAP_TYPE       = 4;
 
+	public int map_type = AltosMap.maptype_hybrid;
+
 	public static FragmentManager	fm;
 
 	private BluetoothAdapter mBluetoothAdapter = null;
@@ -677,12 +679,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	}
 
 	private void set_map_type(Intent data) {
-		int	mode = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+		int type = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
 
-		AltosDebug.debug("intent set_map_type %d\n", mode);
-		if (mode != -1) {
+		AltosDebug.debug("intent set_map_type %d\n", type);
+		if (type != -1) {
+			map_type = type;
 			for (AltosDroidTab mTab : mTabs)
-				mTab.set_map_type(mode);
+				mTab.set_map_type(map_type);
 		}
 	}
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 5376d423..cea3cac6 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -118,6 +118,7 @@ public class TabMap extends AltosDroidTab {
 	private void setupMap() {
 		mMap = mMapFragment.getMap();
 		if (mMap != null) {
+			set_map_type(mAltosDroid.map_type);
 			mMap.setMyLocationEnabled(true);
 			mMap.getUiSettings().setTiltGesturesEnabled(false);
 			mMap.getUiSettings().setZoomControlsEnabled(false);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 31acda75..cbf50018 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -389,6 +389,10 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		super.onAttach(activity);
 		mAltosDroid = (AltosDroid) activity;
 		mAltosDroid.registerTab(this);
+
+		map = new AltosMap(this);
+		map.set_maptype(mAltosDroid.map_type);
+
 		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
 		/* arrow at the bottom of the launchpad image */
 		pad_off_x = pad_bitmap.getWidth() / 2;
-- 
cgit v1.2.3


From c813c2c8f71017a686128e06b5178fc99ece251c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 6 Jun 2015 20:36:18 -0700
Subject: altosdroid: Add multi-tracker support

This lets you view multiple trackers in the offline maps tab (online
maps not done yet), saves state of each tracker to preferences.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 161 +++++++++++++++++----
 .../AltosDroid/AltosDroidPreferencesBackend.java   |   8 +-
 .../org/altusmetrum/AltosDroid/AltosDroidTab.java  |  36 +++--
 .../altusmetrum/AltosDroid/DeviceListActivity.java |  20 ++-
 .../src/org/altusmetrum/AltosDroid/TabAscent.java  |  18 +--
 .../src/org/altusmetrum/AltosDroid/TabDescent.java |  20 +--
 .../src/org/altusmetrum/AltosDroid/TabLanded.java  |  19 +--
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |  70 +++++----
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  |  43 +++---
 .../src/org/altusmetrum/AltosDroid/TabPad.java     |  18 +--
 .../altusmetrum/AltosDroid/TelemetryLogger.java    |   2 +-
 .../altusmetrum/AltosDroid/TelemetryReader.java    |  21 +--
 .../altusmetrum/AltosDroid/TelemetryService.java   |  75 ++++++++--
 .../org/altusmetrum/AltosDroid/TelemetryState.java |   8 +-
 14 files changed, 316 insertions(+), 203 deletions(-)

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 8c9ff31f..942ebbd5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -42,16 +42,8 @@ import android.content.res.Resources;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.util.DisplayMetrics;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.Window;
-import android.view.View;
-import android.view.LayoutInflater;
-import android.widget.TabHost;
-import android.widget.TextView;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
+import android.view.*;
+import android.widget.*;
 import android.app.AlertDialog;
 import android.location.Location;
 import android.hardware.usb.*;
@@ -112,6 +104,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	// Timer and Saved flight state for Age calculation
 	private Timer timer;
 	AltosState saved_state;
+	TelemetryState	telemetry_state;
+	Integer[] 	serials;
 
 	UsbDevice	pending_usb_device;
 	boolean		start_with_usb;
@@ -136,13 +130,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			switch (msg.what) {
 			case MSG_STATE:
 				AltosDebug.debug("MSG_STATE");
-				TelemetryState telemetry_state = (TelemetryState) msg.obj;
-				if (telemetry_state == null) {
+				if (msg.obj == null) {
 					AltosDebug.debug("telemetry_state null!");
 					return;
 				}
-
-				ad.update_state(telemetry_state);
+				ad.update_state((TelemetryState) msg.obj);
 				break;
 			case MSG_UPDATE_AGE:
 				AltosDebug.debug("MSG_UPDATE_AGE");
@@ -258,17 +250,34 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 	boolean	registered_units_listener;
 
-	void update_state(TelemetryState telemetry_state) {
+	int	current_serial;
+
+	void update_state(TelemetryState new_telemetry_state) {
+
+		if (new_telemetry_state != null)
+			telemetry_state = new_telemetry_state;
+
+		if (current_serial == 0)
+			current_serial = telemetry_state.latest_serial;
 
 		if (!registered_units_listener) {
 			registered_units_listener = true;
 			AltosPreferences.register_units_listener(this);
 		}
 
+		serials = telemetry_state.states.keySet().toArray(new Integer[0]);
+
 		update_title(telemetry_state);
-		update_ui(telemetry_state.state, telemetry_state.location);
-		if (telemetry_state.connect == TelemetryState.CONNECT_CONNECTED)
-			start_timer();
+
+		AltosDebug.debug("update state current serial %d\n", current_serial);
+
+		AltosState	state = null;
+		if (telemetry_state.states.containsKey(current_serial))
+			state = telemetry_state.states.get(current_serial);
+
+		update_ui(telemetry_state, state, telemetry_state.location);
+
+		start_timer();
 	}
 
 	boolean same_string(String a, String b) {
@@ -283,22 +292,55 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 	}
 
+
+	private int blend_component(int a, int b, double r, int shift, int mask) {
+		return ((int) (((a >> shift) & mask) * r + ((b >> shift) & mask) * (1 - r)) & mask) << shift;
+	}
+	private int blend_color(int a, int b, double r) {
+		return (blend_component(a, b, r, 0, 0xff) |
+			blend_component(a, b, r, 8, 0xff) |
+			blend_component(a, b, r, 16, 0xff) |
+			blend_component(a, b, r, 24, 0xff));
+	}
+
+	int state_age(AltosState state) {
+		return (int) ((System.currentTimeMillis() - state.received_time + 500) / 1000);
+	}
+
+	void set_screen_on(int age) {
+		if (age < 60)
+			getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+		else
+			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+	}
+
 	void update_age() {
 		if (saved_state != null) {
-			int age = (int) ((System.currentTimeMillis() - saved_state.received_time + 500) / 1000);
-			boolean old = age >= 10;
-			if (old != mAgeViewOld) {
-				if (old)
-					mAgeView.setTextColor(mAgeOldColor);
-				else
-					mAgeView.setTextColor(mAgeNewColor);
-				mAgeViewOld = old;
-			}
-			mAgeView.setText(String.format("%d", age));
+			int age = state_age(saved_state);
+
+			double age_scale = age / 100.0;
+
+			if (age_scale > 1.0)
+				age_scale = 1.0;
+
+			mAgeView.setTextColor(blend_color(mAgeOldColor, mAgeNewColor, age_scale));
+
+			set_screen_on(age);
+
+			String	text;
+			if (age < 60)
+				text = String.format("%ds", age);
+			else if (age < 60 * 60)
+				text = String.format("%dm", age / 60);
+			else if (age < 60 * 60 * 24)
+				text = String.format("%dh", age / (60 * 60));
+			else
+				text = String.format("%dd", age / (24 * 60 * 60));
+			mAgeView.setText(text);
 		}
 	}
 
-	void update_ui(AltosState state, Location location) {
+	void update_ui(TelemetryState telem_state, AltosState state, Location location) {
 
 		int prev_state = AltosLib.ao_flight_invalid;
 
@@ -308,6 +350,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			prev_state = saved_state.state;
 
 		if (state != null) {
+			set_screen_on(state_age(state));
+
 			if (state.state == AltosLib.ao_flight_stateless) {
 				boolean	prev_locked = false;
 				boolean locked = false;
@@ -382,7 +426,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 
 		for (AltosDroidTab mTab : mTabs)
-			mTab.update_ui(state, from_receiver, location, mTab == mTabsAdapter.currentItem());
+			mTab.update_ui(telem_state, state, from_receiver, location, mTab == mTabsAdapter.currentItem());
 
 		if (state != null && mAltosVoice != null)
 			mAltosVoice.tell(state, from_receiver);
@@ -744,6 +788,26 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 	}
 
+	void select_tracker(int serial) {
+		int i;
+		for (i = 0; i < serials.length; i++)
+			if (serials[i] == serial)
+				break;
+		if (i == serials.length)
+			return;
+
+		AltosDebug.debug("Switching to serial %d\n", serial);
+		current_serial = serial;
+		update_state(null);
+	}
+
+	void delete_track(int serial) {
+		try {
+			mService.send(Message.obtain(null, TelemetryService.MSG_DELETE_SERIAL, (Integer) serial));
+		} catch (Exception ex) {
+		}
+	}
+
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		Intent serverIntent = null;
@@ -824,8 +888,43 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			serverIntent = new Intent(this, MapTypeActivity.class);
 			startActivityForResult(serverIntent, REQUEST_MAP_TYPE);
 			return true;
+		case R.id.select_tracker:
+			if (serials != null) {
+				String[] trackers = new String[serials.length];
+				for (int i = 0; i < serials.length; i++)
+					trackers[i] = String.format("%d", serials[i]);
+				AlertDialog.Builder builder_serial = new AlertDialog.Builder(this);
+				builder_serial.setTitle("Select a tracker");
+				builder_serial.setItems(trackers,
+							new DialogInterface.OnClickListener() {
+								public void onClick(DialogInterface dialog, int item) {
+									select_tracker(serials[item]);
+								}
+							});
+				AlertDialog alert_serial = builder_serial.create();
+				alert_serial.show();
+
+			}
+			return true;
+		case R.id.delete_track:
+			if (serials != null) {
+				String[] trackers = new String[serials.length];
+				for (int i = 0; i < serials.length; i++)
+					trackers[i] = String.format("%d", serials[i]);
+				AlertDialog.Builder builder_serial = new AlertDialog.Builder(this);
+				builder_serial.setTitle("Delete a track");
+				builder_serial.setItems(trackers,
+							new DialogInterface.OnClickListener() {
+								public void onClick(DialogInterface dialog, int item) {
+									delete_track(serials[item]);
+								}
+							});
+				AlertDialog alert_serial = builder_serial.create();
+				alert_serial.show();
+
+			}
+			return true;
 		}
 		return false;
 	}
-
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
index 75676e28..dfc37153 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
@@ -44,7 +44,12 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 
 	public String[] keys() {
 		Map<String, ?> all = prefs.getAll();
-		return (String[])all.keySet().toArray();
+		Object[] ao = all.keySet().toArray();
+
+		String[] as = new String[ao.length];
+		for (int i = 0; i < ao.length; i++)
+			as[i] = (String) ao[i];
+		return as;
 	}
 
 	public AltosPreferencesBackend node(String key) {
@@ -104,6 +109,7 @@ public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 	}
 
 	public void remove(String key) {
+		AltosDebug.debug("remove preference %s\n", key);
 		editor.remove(key);
 	}
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index f1f1b6de..017315af 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -29,11 +29,13 @@ import android.location.Location;
 import android.widget.TextView;
 
 public abstract class AltosDroidTab extends Fragment implements AltosUnitsListener {
+	TelemetryState		last_telem_state;
 	AltosState		last_state;
 	AltosGreatCircle	last_from_receiver;
 	Location		last_receiver;
+	AltosDroid		altos_droid;
 
-	public abstract void show(AltosState state, AltosGreatCircle from_receiver, Location receiver);
+	public abstract void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver);
 
 	public abstract String tab_name();
 
@@ -41,8 +43,8 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 	}
 
 	public void units_changed(boolean imperial_units) {
-		if (!isHidden() && last_state != null)
-			show(last_state, last_from_receiver, last_receiver);
+		if (!isHidden())
+			show(last_telem_state, last_state, last_from_receiver, last_receiver);
 	}
 
 	public void set_value(TextView text_view,
@@ -59,17 +61,27 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 		FragmentTransaction	ft = AltosDroid.fm.beginTransaction();
 		AltosDebug.debug("set visible %b %s\n", visible, tab_name());
 		if (visible) {
-			AltosState		state = last_state;
-			AltosGreatCircle	from_receiver = last_from_receiver;
-			Location		receiver = last_receiver;
-
 			ft.show(this);
-			show(state, from_receiver, receiver);
+			show(last_telem_state, last_state, last_from_receiver, last_receiver);
 		} else
 			ft.hide(this);
 		ft.commitAllowingStateLoss();
 	}
 
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		altos_droid = (AltosDroid) activity;
+		altos_droid.registerTab(this);
+	}
+
+	@Override
+	public void onDetach() {
+		super.onDetach();
+		altos_droid.unregisterTab(this);
+		altos_droid = null;
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();
@@ -77,12 +89,16 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 		set_visible(true);
 	}
 
-	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver, boolean is_current) {
+	public void update_ui(TelemetryState telem_state, AltosState state,
+			      AltosGreatCircle from_receiver, Location receiver, boolean is_current)
+	{
+		last_telem_state = telem_state;
 		last_state = state;
 		last_from_receiver = from_receiver;
 		last_receiver = receiver;
+		AltosDebug.debug("update_ui tab %s is_current %b\n", tab_name(), is_current);
 		if (is_current)
-			show(state, from_receiver, receiver);
+			show(telem_state, state, from_receiver, receiver);
 		else
 			return;
 	}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
index 4af117a2..f36ef267 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -191,14 +191,22 @@ public class DeviceListActivity extends Activity {
 
 			// When discovery finds a device
 			if (BluetoothDevice.ACTION_FOUND.equals(action)) {
-				// Get the BluetoothDevice object from the Intent
+
+				/* Get the BluetoothDevice object from the Intent
+				 */
 				BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-				// If it's already paired, skip it, because it's been listed already
-				if (   device.getBondState() != BluetoothDevice.BOND_BONDED
-				    && device.getName().startsWith("TeleBT")               ) {
-					mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
+
+				/* If it's already paired, skip it, because it's been listed already
+				 */
+				if (device != null && device.getBondState() != BluetoothDevice.BOND_BONDED)
+				{
+					String	name = device.getName();
+					if (name != null && name.startsWith("TeleBT"))
+						mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress());
 				}
-			// When discovery is finished, change the Activity title
+
+			/* When discovery is finished, change the Activity title
+			 */
 			} else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
 				setProgressBarIndeterminateVisibility(false);
 				setTitle(R.string.select_device);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index 797dc7c3..afce937f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
@@ -30,8 +30,6 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabAscent extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
 	private TextView mHeightView;
 	private TextView mMaxHeightView;
 	private TextView mSpeedView;
@@ -45,13 +43,6 @@ public class TabAscent extends AltosDroidTab {
 	private TextView mMainVoltageView;
 	private GoNoGoLights mMainLights;
 
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_ascent, container, false);
@@ -78,18 +69,11 @@ public class TabAscent extends AltosDroidTab {
 		return v;
 	}
 
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-	}
-
 	public String tab_name() {
 		return "ascent";
 	}
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
 			set_value(mHeightView, AltosConvert.height, 6, state.height());
 			set_value(mHeightView, AltosConvert.height, 6, state.height());
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index f3f5a0f1..3429ee72 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -30,8 +30,6 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabDescent extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
 	private TextView mSpeedView;
 	private TextView mHeightView;
 	private TextView mElevationView;
@@ -46,14 +44,6 @@ public class TabDescent extends AltosDroidTab {
 	private TextView mMainVoltageView;
 	private GoNoGoLights mMainLights;
 
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_descent, container, false);
@@ -81,17 +71,9 @@ public class TabDescent extends AltosDroidTab {
 		return v;
 	}
 
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-	}
-
 	public String tab_name() { return "descent"; }
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
 			set_value(mSpeedView, AltosConvert.speed, 6, state.speed());
 			set_value(mHeightView, AltosConvert.height, 6, state.height());
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
index d37891f7..dd3f938e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
@@ -29,8 +29,6 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabLanded extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
 	private TextView mBearingView;
 	private TextView mDistanceView;
 	private TextView mTargetLatitudeView;
@@ -41,14 +39,6 @@ public class TabLanded extends AltosDroidTab {
 	private TextView mMaxSpeedView;
 	private TextView mMaxAccelView;
 
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_landed, container, false);
@@ -66,16 +56,9 @@ public class TabLanded extends AltosDroidTab {
 		return v;
 	}
 
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-	}
-
 	public String tab_name() { return "landed"; }
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index cea3cac6..ff36875d 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -33,6 +33,7 @@ import com.google.android.gms.maps.model.PolylineOptions;
 
 import android.app.Activity;
 import android.graphics.Color;
+import android.graphics.*;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 //import android.support.v4.app.FragmentTransaction;
@@ -43,8 +44,6 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabMap extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
 	private SupportMapFragment mMapFragment;
 	private GoogleMap mMap;
 	private boolean mapLoaded = false;
@@ -63,11 +62,40 @@ public class TabMap extends AltosDroidTab {
 
 	private double mapAccuracy = -1;
 
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
+	private Bitmap rocket_bitmap(String text) {
+
+		/* From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
+		 */
+		Bitmap orig_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
+		Bitmap bitmap = orig_bitmap.copy(Bitmap.Config.ARGB_8888, true);
+
+		Canvas canvas = new Canvas(bitmap);
+		Paint paint = new Paint();
+		paint.setTextSize(40);
+		paint.setColor(0xff000000);
+
+		Rect	bounds = new Rect();
+		paint.getTextBounds(text, 0, text.length(), bounds);
+
+		int	width = bounds.right - bounds.left;
+		int	height = bounds.bottom - bounds.top;
+
+		float x = bitmap.getWidth() / 2.0f - width / 2.0f;
+		float y = bitmap.getHeight() / 2.0f - height / 2.0f;
+
+		AltosDebug.debug("map label x %f y %f\n", x, y);
+
+		canvas.drawText(text, 0, text.length(), x, y, paint);
+		return bitmap;
+	}
+
+	private Marker rocket_marker(int serial, double lat, double lon) {
+		Bitmap	bitmap = rocket_bitmap(String.format("%d", serial));
+
+		return mMap.addMarker(new MarkerOptions()
+				      .icon(BitmapDescriptorFactory.fromBitmap(bitmap))
+				      .position(new LatLng(lat, lon))
+				      .visible(false));
 	}
 
 	@Override
@@ -102,33 +130,17 @@ public class TabMap extends AltosDroidTab {
 		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
 	}
 
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-
-		//Fragment fragment = (getFragmentManager().findFragmentById(R.id.map));
-		//FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-		//ft.remove(fragment);
-		//ft.commit();
-	}
-
 	private void setupMap() {
 		mMap = mMapFragment.getMap();
 		if (mMap != null) {
-			set_map_type(mAltosDroid.map_type);
+			set_map_type(altos_droid.map_type);
 			mMap.setMyLocationEnabled(true);
 			mMap.getUiSettings().setTiltGesturesEnabled(false);
 			mMap.getUiSettings().setZoomControlsEnabled(false);
 
-			mRocketMarker = mMap.addMarker(
-					// From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
-					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.rocket))
-					                   .position(new LatLng(0,0))
-					                   .visible(false)
-					);
+			Bitmap label_bitmap = rocket_bitmap("hello");
+
+			mRocketMarker = rocket_marker(1800,0,0);
 
 			mPadMarker = mMap.addMarker(
 					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
@@ -156,7 +168,7 @@ public class TabMap extends AltosDroidTab {
 
 	public String tab_name() { return "map"; }
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
@@ -166,6 +178,8 @@ public class TabMap extends AltosDroidTab {
 			if (mapLoaded) {
 				if (state.gps != null) {
 					mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
+					mRocketMarker.setTitle("hello world");
+					mRocketMarker.setSnippet("hello");
 					mRocketMarker.setVisible(true);
 
 					mPolyline.setPoints(Arrays.asList(new LatLng(state.pad_lat, state.pad_lon), new LatLng(state.gps.lat, state.gps.lon)));
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 56e296d9..4b728c23 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -54,8 +54,6 @@ class Rocket {
 
 public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
-	AltosDroid mAltosDroid;
-
 	AltosMap map;
 
 	AltosLatLon	here;
@@ -325,11 +323,9 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
 
 		map = new AltosMap(this);
-		map.set_maptype(mAltosDroid.map_type);
+		map.set_maptype(altos_droid.map_type);
 
 		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
 		/* arrow at the bottom of the launchpad image */
@@ -347,12 +343,6 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		here_off_y = here_bitmap.getHeight() / 2;
 	}
 
-	@Override
-	public void onDetach() {
-		super.onDetach();
-		mAltosDroid = null;
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -382,7 +372,6 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	public void onDestroyView() {
 		super.onDestroyView();
 
-		mAltosDroid.unregisterTab(this);
 	}
 
 	private void center(double lat, double lon, double accuracy) {
@@ -395,7 +384,7 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	public String tab_name() { return "offmap"; }
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
@@ -411,20 +400,30 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 			}
 			if (state.pad_lat != AltosLib.MISSING && pad == null)
 				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
+		}
 
-			int serial = state.serial;
-			if (serial == AltosLib.MISSING)
-				serial = 0;
+		if (telem_state != null) {
+			Integer[] old_serial = rockets.keySet().toArray(new Integer[0]);
+			Integer[] new_serial = telem_state.states.keySet().toArray(new Integer[0]);
 
-			Rocket	rocket = null;
+			/* remove deleted keys */
+			for (int serial : old_serial) {
+				if (!telem_state.states.containsKey(serial))
+					rockets.remove(serial);
+			}
+
+			/* set remaining keys */
 
-			if (state.gps != null && state.gps.locked) {
-				if (!rockets.containsKey(serial)) {
+			for (int serial : new_serial) {
+				Rocket 		rocket;
+				AltosState	t_state = telem_state.states.get(serial);
+				if (rockets.containsKey(serial))
+					rocket = rockets.get(serial);
+				else {
 					rocket = new Rocket(String.format("%d", serial), this);
 					rockets.put(serial, rocket);
-				} else
-					rocket = rockets.get(serial);
-				rocket.set_position(new AltosLatLon(state.gps.lat, state.gps.lon));
+				}
+				rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon));
 			}
 		}
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index f7eb43db..7a256963 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -30,8 +30,6 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabPad extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
 	private TextView mBatteryVoltageView;
 	private TextView mBatteryVoltageLabel;
 	private GoNoGoLights mBatteryLights;
@@ -51,13 +49,6 @@ public class TabPad extends AltosDroidTab {
 	private TextView mPadLongitudeView;
 	private TextView mPadAltitudeView;
 
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_pad, container, false);
@@ -100,16 +91,9 @@ public class TabPad extends AltosDroidTab {
         return v;
 	}
 
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-	}
-
 	public String tab_name() { return "pad"; }
 
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
 			mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery_voltage));
 			mBatteryLights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
index 7c3c2268..28bab401 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
@@ -34,7 +34,7 @@ public class TelemetryLogger {
 			logger = null;
 		}
 	}
-	
+
 	void handleExternalStorageState() {
 		String state = Environment.getExternalStorageState();
 		if (Environment.MEDIA_MOUNTED.equals(state)) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 7b29fe44..4d4f0ed1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -21,6 +21,7 @@ package org.altusmetrum.AltosDroid;
 
 import java.text.*;
 import java.io.*;
+import java.util.*;
 import java.util.concurrent.*;
 import android.os.Handler;
 
@@ -34,25 +35,18 @@ public class TelemetryReader extends Thread {
 	Handler     handler;
 
 	AltosLink   link;
-	AltosState  state = null;
 
 	LinkedBlockingQueue<AltosLine> telemQueue;
 
-	public AltosState read() throws ParseException, AltosCRCException, InterruptedException, IOException {
+	public AltosTelemetry read() throws ParseException, AltosCRCException, InterruptedException, IOException {
 		AltosLine l = telemQueue.take();
 		if (l.line == null)
 			throw new IOException("IO error");
 		AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line);
-		if (state == null)
-			state = new AltosState();
-		else
-			state = state.clone();
-		telem.update_state(state);
-		return state;
+		return telem;
 	}
 
 	public void close() {
-		state = null;
 		link.remove_monitor(telemQueue);
 		link = null;
 		telemQueue.clear();
@@ -60,14 +54,12 @@ public class TelemetryReader extends Thread {
 	}
 
 	public void run() {
-		AltosState  state = null;
-
 		try {
 			AltosDebug.debug("starting loop");
 			while (telemQueue != null) {
 				try {
-					state = read();
-					handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();
+					AltosTelemetry	telem = read();
+					handler.obtainMessage(TelemetryService.MSG_TELEMETRY, telem).sendToTarget();
 				} catch (ParseException pp) {
 					AltosDebug.error("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage());
 				} catch (AltosCRCException ce) {
@@ -84,12 +76,11 @@ public class TelemetryReader extends Thread {
 		}
 	}
 
-	public TelemetryReader (AltosLink in_link, Handler in_handler, AltosState in_state) {
+	public TelemetryReader (AltosLink in_link, Handler in_handler) {
 		AltosDebug.debug("connected TelemetryReader create started");
 		link    = in_link;
 		handler = in_handler;
 
-		state = in_state;
 		telemQueue = new LinkedBlockingQueue<AltosLine>();
 		link.add_monitor(telemQueue);
 		link.set_telemetry(AltosLib.ao_telemetry_standard);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index eae360db..80694ea7 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -18,10 +18,8 @@
 package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
 import java.util.concurrent.TimeoutException;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
 
 import android.app.Notification;
 //import android.app.NotificationManager;
@@ -62,6 +60,7 @@ public class TelemetryService extends Service implements LocationListener {
 	static final int MSG_CRC_ERROR	       = 10;
 	static final int MSG_SETBAUD	       = 11;
 	static final int MSG_DISCONNECT	       = 12;
+	static final int MSG_DELETE_SERIAL     = 13;
 
 	// Unique Identification Number for the Notification.
 	// We use it on Notification start, and to cancel it.
@@ -120,6 +119,10 @@ public class TelemetryService extends Service implements LocationListener {
 				s.address = null;
 				s.disconnect(true);
 				break;
+			case MSG_DELETE_SERIAL:
+				AltosDebug.debug("Delete Serial command received");
+				s.delete_serial((Integer) msg.obj);
+				break;
 			case MSG_SETFREQUENCY:
 				AltosDebug.debug("MSG_SETFREQUENCY");
 				s.telemetry_state.frequency = (Double) msg.obj;
@@ -197,13 +200,8 @@ public class TelemetryService extends Service implements LocationListener {
 				 * Messages from TelemetryReader
 				 */
 			case MSG_TELEMETRY:
-				s.telemetry_state.state = (AltosState) msg.obj;
-				if (s.telemetry_state.state != null) {
-					AltosDebug.debug("Save state");
-					AltosPreferences.set_state(0, s.telemetry_state.state, null);
-				}
 				AltosDebug.debug("MSG_TELEMETRY");
-				s.send_to_clients();
+				s.telemetry((AltosTelemetry) msg.obj);
 				break;
 			case MSG_CRC_ERROR:
 				// forward crc error messages
@@ -217,13 +215,31 @@ public class TelemetryService extends Service implements LocationListener {
 		}
 	}
 
+	/* Handle telemetry packet
+	 */
+	private void telemetry(AltosTelemetry telem) {
+		AltosState	state;
+
+		if (telemetry_state.states.containsKey(telem.serial))
+			state = telemetry_state.states.get(telem.serial).clone();
+		else
+			state = new AltosState();
+		telem.update_state(state);
+		telemetry_state.states.put(telem.serial, state);
+		if (state != null) {
+			AltosDebug.debug("Save state %d", telem.serial);
+			AltosPreferences.set_state(telem.serial, state, null);
+		}
+		send_to_clients();
+	}
+
 	/* Construct the message to deliver to clients
 	 */
 	private Message message() {
 		if (telemetry_state == null)
 			AltosDebug.debug("telemetry_state null!");
-		if (telemetry_state.state == null)
-			AltosDebug.debug("telemetry_state.state null!");
+		if (telemetry_state.states == null)
+			AltosDebug.debug("telemetry_state.states null!");
 		return Message.obtain(null, AltosDroid.MSG_STATE, telemetry_state);
 	}
 
@@ -332,6 +348,12 @@ public class TelemetryService extends Service implements LocationListener {
 		}
 	}
 
+	private void delete_serial(int serial) {
+		telemetry_state.states.remove((Integer) serial);
+		AltosPreferences.remove_state(serial);
+		send_to_clients();
+	}
+
 	private void start_altos_bluetooth(DeviceAddress address, boolean pause) {
 		// Get the BLuetoothDevice object
 		BluetoothDevice device = bluetooth_adapter.getRemoteDevice(address.address);
@@ -372,7 +394,7 @@ public class TelemetryService extends Service implements LocationListener {
 		telemetry_state.connect = TelemetryState.CONNECT_CONNECTED;
 		telemetry_state.address = address;
 
-		telemetry_reader = new TelemetryReader(altos_link, handler, telemetry_state.state);
+		telemetry_reader = new TelemetryReader(altos_link, handler);
 		telemetry_reader.start();
 
 		AltosDebug.debug("connected TelemetryReader started");
@@ -406,11 +428,32 @@ public class TelemetryService extends Service implements LocationListener {
 		telemetry_state.connect = TelemetryState.CONNECT_DISCONNECTED;
 		telemetry_state.address = null;
 
-		AltosSavedState saved_state = AltosPreferences.state(0);
+		/* Pull the saved state information out of the preferences database
+		 */
+		ArrayList<Integer> serials = AltosPreferences.list_states();
 
-		if (saved_state != null) {
-			AltosDebug.debug("recovered old state flight %d\n", saved_state.state.flight);
-			telemetry_state.state = saved_state.state;
+		telemetry_state.latest_serial = AltosPreferences.latest_state();
+
+		for (int serial : serials) {
+			AltosSavedState saved_state = AltosPreferences.state(serial);
+			if (saved_state != null) {
+				if (serial == 0) {
+					serial = saved_state.state.serial;
+					AltosPreferences.set_state(serial, saved_state.state, saved_state.listener_state);
+					AltosPreferences.remove_state(0);
+				}
+				if (telemetry_state.latest_serial == 0)
+					telemetry_state.latest_serial = serial;
+
+				AltosDebug.debug("recovered old state serial %d flight %d\n",
+						 serial,
+						 saved_state.state.flight);
+				if (saved_state.state.gps != null)
+					AltosDebug.debug("\tposition %f,%f\n",
+							 saved_state.state.gps.lat,
+							 saved_state.state.gps.lon);
+				telemetry_state.states.put(serial, saved_state.state);
+			}
 		}
 
 		// Listen for GPS and Network position updates
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index fb7e1893..d023128f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -17,6 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.util.*;
 import org.altusmetrum.altoslib_7.*;
 import android.location.Location;
 
@@ -29,16 +30,19 @@ public class TelemetryState {
 	int		connect;
 	DeviceAddress	address;
 	AltosConfigData	config;
-	AltosState	state;
 	Location	location;
 	int		crc_errors;
 	double		frequency;
 	int		telemetry_rate;
 
+	HashMap<Integer,AltosState>	states;
+
+	int		latest_serial;
+
 	public TelemetryState() {
 		connect = CONNECT_NONE;
 		config = null;
-		state = null;
+		states = new HashMap<Integer,AltosState>();
 		location = null;
 		crc_errors = 0;
 		frequency = AltosPreferences.frequency(0);
-- 
cgit v1.2.3


From b8bdb432aacc1a273ee484a29a24b3768c274db6 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 20 Jun 2015 11:58:08 -0700
Subject: altosdroid: Multiple tracker support for google maps

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .../src/org/altusmetrum/AltosDroid/TabMap.java     | 72 ++++++++++++++++------
 1 file changed, 53 insertions(+), 19 deletions(-)

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index ff36875d..d5d1d262 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import java.util.Arrays;
+import java.util.*;
 
 import org.altusmetrum.altoslib_7.*;
 
@@ -48,7 +48,7 @@ public class TabMap extends AltosDroidTab {
 	private GoogleMap mMap;
 	private boolean mapLoaded = false;
 
-	private Marker mRocketMarker;
+	private HashMap<Integer,Marker> rockets = new HashMap<Integer,Marker>();
 	private Marker mPadMarker;
 	private boolean pad_set;
 	private Polyline mPolyline;
@@ -62,6 +62,9 @@ public class TabMap extends AltosDroidTab {
 
 	private double mapAccuracy = -1;
 
+	private AltosLatLon my_position = null;
+	private AltosLatLon target_position = null;
+
 	private Bitmap rocket_bitmap(String text) {
 
 		/* From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
@@ -95,7 +98,7 @@ public class TabMap extends AltosDroidTab {
 		return mMap.addMarker(new MarkerOptions()
 				      .icon(BitmapDescriptorFactory.fromBitmap(bitmap))
 				      .position(new LatLng(lat, lon))
-				      .visible(false));
+				      .visible(true));
 	}
 
 	@Override
@@ -140,8 +143,6 @@ public class TabMap extends AltosDroidTab {
 
 			Bitmap label_bitmap = rocket_bitmap("hello");
 
-			mRocketMarker = rocket_marker(1800,0,0);
-
 			mPadMarker = mMap.addMarker(
 					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
 					                   .position(new LatLng(0,0))
@@ -150,7 +151,7 @@ public class TabMap extends AltosDroidTab {
 
 			mPolyline = mMap.addPolyline(
 					new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0))
-					                     .width(3)
+					                     .width(20)
 					                     .color(Color.BLUE)
 					                     .visible(false)
 					);
@@ -168,24 +169,47 @@ public class TabMap extends AltosDroidTab {
 
 	public String tab_name() { return "map"; }
 
+	private void set_rocket(int serial, AltosState state) {
+		Marker	marker;
+
+		if (state.gps == null || state.gps.lat == AltosLib.MISSING)
+			return;
+
+		if (rockets.containsKey(serial)) {
+			marker = rockets.get(serial);
+			marker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
+		} else {
+			marker = rocket_marker(serial, state.gps.lat, state.gps.lon);
+			rockets.put(serial, marker);
+			marker.setVisible(true);
+		}
+	}
+
+	private void remove_rocket(int serial) {
+		Marker marker = rockets.get(serial);
+		marker.remove();
+		rockets.remove(serial);
+	}
+
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
 		}
 
+		if (telem_state != null) {
+			for (int serial : rockets.keySet()) {
+				if (!telem_state.states.containsKey(serial))
+					remove_rocket(serial);
+			}
+
+			for (int serial : telem_state.states.keySet()) {
+				set_rocket(serial, telem_state.states.get(serial));
+			}
+		}
+
 		if (state != null) {
 			if (mapLoaded) {
-				if (state.gps != null) {
-					mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
-					mRocketMarker.setTitle("hello world");
-					mRocketMarker.setSnippet("hello");
-					mRocketMarker.setVisible(true);
-
-					mPolyline.setPoints(Arrays.asList(new LatLng(state.pad_lat, state.pad_lon), new LatLng(state.gps.lat, state.gps.lon)));
-					mPolyline.setVisible(true);
-				}
-
 				if (!pad_set && state.pad_lat != AltosLib.MISSING) {
 					pad_set = true;
 					mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
@@ -193,6 +217,9 @@ public class TabMap extends AltosDroidTab {
 				}
 			}
 			if (state.gps != null) {
+
+				target_position = new AltosLatLon(state.gps.lat, state.gps.lon);
+
 				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
 				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
 				if (state.gps.locked && state.gps.nsat >= 4)
@@ -207,9 +234,16 @@ public class TabMap extends AltosDroidTab {
 				accuracy = receiver.getAccuracy();
 			else
 				accuracy = 1000;
-			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
-			center (receiver.getLatitude(), receiver.getLongitude(), accuracy);
+
+			my_position = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			mReceiverLatitudeView.setText(AltosDroid.pos(my_position.lat, "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(my_position.lon, "E", "W"));
+			center (my_position.lat, my_position.lon, accuracy);
+		}
+
+		if (my_position != null && target_position != null) {
+			mPolyline.setPoints(Arrays.asList(new LatLng(my_position.lat, my_position.lon), new LatLng(target_position.lat, target_position.lon)));
+			mPolyline.setVisible(true);
 		}
 
 	}
-- 
cgit v1.2.3


From 18fe64cf2648568dd0bde5acd7b627f1ddb6917e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 18:26:34 -0700
Subject: altosdroid: Display online/offline maps in same tab

Make the map portion switchable between online and offline maps,
leaving the rest of the tab alone.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_map.xml                  |  13 +-
 altosdroid/res/layout/tab_map_offline.xml          |  24 +-
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |   6 +-
 .../AltosDroid/AltosDroidMapInterface.java         |  33 ++
 .../org/altusmetrum/AltosDroid/AltosDroidTab.java  |   3 +
 .../altusmetrum/AltosDroid/AltosMapOffline.java    | 469 +++++++++++++++++++++
 .../org/altusmetrum/AltosDroid/AltosMapOnline.java | 283 +++++++++++++
 .../org/altusmetrum/AltosDroid/AltosMapView.java   | 168 --------
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |   1 -
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  | 381 +++--------------
 10 files changed, 884 insertions(+), 497 deletions(-)
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java

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

diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index f611ae48..b4c97f91 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -20,13 +20,12 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-	<LinearLayout
+  	<LinearLayout
 	    android:id="@+id/map"
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1">
-
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:layout_weight="1">
 	</LinearLayout>
 
 	<LinearLayout
@@ -185,4 +184,4 @@
 				android:textAppearance="?android:attr/textAppearanceSmall" />
 		</RelativeLayout>
 	</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml
index e6f134d8..1b0f28a7 100644
--- a/altosdroid/res/layout/tab_map_offline.xml
+++ b/altosdroid/res/layout/tab_map_offline.xml
@@ -20,11 +20,25 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-  <org.altusmetrum.AltosDroid.AltosMapView android:id="@+id/map_view_offline"
-					   android:layout_width="fill_parent"
-					   android:layout_height="wrap_content"
-					   android:layout_weight="1"
-					   />
+  <FrameLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal"
+      android:layout_weight="1">
+    <LinearLayout
+	android:id="@+id/map_online"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
+    </LinearLayout>
+    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_view_offline"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						/>
+  </FrameLayout>
   
   <LinearLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index fb669c5d..426e2e84 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -503,7 +503,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		return tab_view;
 	}
 
-	public void set_map_source() {
+	public void set_map_source(int source) {
+		for (AltosDroidTab mTab : mTabs)
+			mTab.set_map_source(source);
 	}
 
 	@Override
@@ -928,7 +930,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			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();
+			set_map_source(new_source);
 			return true;
 		case R.id.select_tracker:
 			if (serials != null) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
new file mode 100644
index 00000000..681cd311
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2015 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.util.*;
+import java.io.*;
+import android.location.Location;
+import org.altusmetrum.altoslib_7.*;
+
+public interface AltosDroidMapInterface {
+	public void onCreateView(int map_type);
+
+	public void set_visible(boolean visible);
+
+	public void center(double lat, double lon, double accuracy);
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver);
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index 6a71021c..f75035d4 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -42,6 +42,9 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 	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
new file mode 100644
index 00000000..3ff6ff25
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright © 2015 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.util.*;
+import java.io.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+import android.app.Activity;
+import android.graphics.*;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.*;
+import android.widget.*;
+import android.location.Location;
+import android.content.*;
+import android.util.*;
+
+class Rocket implements Comparable {
+	AltosLatLon	position;
+	String		name;
+	long		last_packet;
+	AltosMapOffline	map_offline;
+
+	void paint() {
+		map_offline.draw_bitmap(position, map_offline.rocket_bitmap, map_offline.rocket_off_x, map_offline.rocket_off_y);
+		map_offline.draw_text(position, name, 0, 3*map_offline.rocket_bitmap.getHeight()/4);
+	}
+
+	void set_position(AltosLatLon position, long last_packet) {
+		this.position = position;
+		this.last_packet = last_packet;
+	}
+
+	Rocket(String name, AltosMapOffline map_offline) {
+		this.name = name;
+		this.map_offline = map_offline;
+	}
+
+	public int compareTo(Object o) {
+		Rocket other = (Rocket) o;
+
+		long	diff = last_packet - other.last_packet;
+
+		if (diff > 0)
+			return 1;
+		if (diff < 0)
+			return -1;
+		return 0;
+	}
+}
+
+public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface {
+	ScaleGestureDetector	scale_detector;
+	boolean			scaling;
+	AltosMap		map;
+
+	AltosLatLon	here;
+	AltosLatLon	pad;
+
+	Canvas	canvas;
+	Paint	paint;
+
+	Bitmap	pad_bitmap;
+	int	pad_off_x, pad_off_y;
+	Bitmap	rocket_bitmap;
+	int	rocket_off_x, rocket_off_y;
+	Bitmap	here_bitmap;
+	int	here_off_x, here_off_y;
+
+	static  final int	WHITE = 0xffffffff;
+	static  final int	RED   = 0xffff0000;
+	static  final int	PINK  = 0xffff8080;
+	static  final int	YELLOW= 0xffffff00;
+	static  final int	CYAN  = 0xff00ffff;
+	static  final int	BLUE  = 0xff0000ff;
+	static  final int	BLACK = 0xff000000;
+
+	public static final int stateColors[] = {
+		WHITE,  // startup
+		WHITE,  // idle
+		WHITE,  // pad
+		RED,    // boost
+		PINK,   // fast
+		YELLOW, // coast
+		CYAN,   // drogue
+		BLUE,   // main
+		BLACK,  // landed
+		BLACK,  // invalid
+		CYAN,   // stateless
+	};
+
+	/* AltosMapInterface */
+	public void debug(String format, Object ... arguments) {
+		AltosDebug.debug(format, arguments);
+	}
+
+	class MapTile extends AltosMapTile {
+		public void paint(AltosMapTransform t) {
+			AltosPointInt		pt = new AltosPointInt(t.screen(upper_left));
+
+			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);
+
+			MapImage 		map_image = (MapImage) altos_image;
+
+			Bitmap			bitmap = null;
+
+			if (map_image != null)
+				bitmap = map_image.bitmap;
+
+			if (bitmap != null) {
+				canvas.drawBitmap(bitmap, pt.x, pt.y, paint);
+			} else {
+				paint.setColor(0xff808080);
+				canvas.drawRect(pt.x, pt.y, pt.x + px_size, pt.y + px_size, paint);
+				if (t.has_location()) {
+					String	message = null;
+					switch (status) {
+					case AltosMapTile.loading:
+						message = "Loading...";
+						break;
+					case AltosMapTile.bad_request:
+						message = "Internal error";
+						break;
+					case AltosMapTile.failed:
+						message = "Network error, check connection";
+						break;
+					case AltosMapTile.forbidden:
+						message = "Too many requests, try later";
+						break;
+					}
+					if (message != null) {
+						Rect	bounds = new Rect();
+						paint.getTextBounds(message, 0, message.length(), bounds);
+
+						int	width = bounds.right - bounds.left;
+						int	height = bounds.bottom - bounds.top;
+
+						float x = pt.x + px_size / 2.0f;
+						float y = pt.y + px_size / 2.0f;
+						x = x - width / 2.0f;
+						y = y + height / 2.0f;
+						paint.setColor(0xff000000);
+						canvas.drawText(message, 0, message.length(), x, y, paint);
+					}
+				}
+			}
+		}
+
+		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 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 AltosMapPath new_path() {
+		return null;
+	}
+
+	public AltosMapLine new_line() {
+		return null;
+	}
+
+	class MapImage implements AltosImage {
+		public Bitmap	bitmap;
+
+		public void flush() {
+			if (bitmap != null) {
+				bitmap.recycle();
+				bitmap = null;
+			}
+		}
+
+		public MapImage(File file) {
+			bitmap = BitmapFactory.decodeFile(file.getPath());
+		}
+	}
+
+	public AltosImage load_image(File file) throws Exception {
+		return new MapImage(file);
+	}
+
+	class MapMark extends AltosMapMark {
+		public void paint(AltosMapTransform t) {
+		}
+
+		MapMark(double lat, double lon, int state) {
+			super(lat, lon, state);
+		}
+	}
+
+	public AltosMapMark new_mark(double lat, double lon, int state) {
+		return new MapMark(lat, lon, state);
+	}
+
+	public int width() {
+		return getWidth();
+	}
+
+	public int height() {
+		return getHeight();
+	}
+
+	public void repaint() {
+		postInvalidate();
+	}
+
+	public void repaint(AltosRectangle damage) {
+		postInvalidate(damage.x, damage.y, damage.x + damage.width, damage.y + damage.height);
+	}
+
+	public void set_zoom_label(String label) {
+	}
+
+	class Line {
+		AltosLatLon	a, b;
+
+		void paint() {
+			if (a != null && b != null) {
+				AltosPointDouble	a_screen = map.transform.screen(a);
+				AltosPointDouble	b_screen = map.transform.screen(b);
+				paint.setColor(0xff8080ff);
+				canvas.drawLine((float) a_screen.x, (float) a_screen.y,
+						    (float) b_screen.x, (float) b_screen.y,
+						    paint);
+			}
+		}
+
+		void set_a(AltosLatLon a) {
+			this.a = a;
+		}
+
+		void set_b(AltosLatLon b) {
+			this.b = b;
+		}
+
+		Line() {
+		}
+	}
+
+	Line line = new Line();
+
+	int	stroke_width = 20;
+
+	void draw_text(AltosLatLon lat_lon, String text, int off_x, int off_y) {
+		if (lat_lon != null && map != null && map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
+
+			Rect	bounds = new Rect();
+			paint.getTextBounds(text, 0, text.length(), bounds);
+
+			int	width = bounds.right - bounds.left;
+			int	height = bounds.bottom - bounds.top;
+
+			float x = pt.x;
+			float y = pt.y;
+			x = x - width / 2.0f - off_x;
+			y = y + height / 2.0f - off_y;
+			paint.setColor(0xff000000);
+			canvas.drawText(text, 0, text.length(), x, y, paint);
+		}
+	}
+
+	HashMap<Integer,Rocket> rockets = new HashMap<Integer,Rocket>();
+
+	void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
+		if (lat_lon != null && map != null && map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
+
+			canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, paint);
+		}
+	}
+
+	private void draw_positions() {
+		line.set_a(map.last_position);
+		line.set_b(here);
+		line.paint();
+		draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
+
+		Rocket[]	rocket_array = rockets.values().toArray(new Rocket[0]);
+
+		Arrays.sort(rocket_array);
+		for (Rocket rocket : rocket_array)
+			rocket.paint();
+		draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
+	}
+
+	@Override public void invalidate() {
+		Rect r = new Rect();
+		getDrawingRect(r);
+		super.invalidate();
+	}
+
+	@Override public void invalidate(int l, int t, int r, int b) {
+		Rect rect = new Rect();
+		getDrawingRect(rect);
+		super.invalidate();
+	}
+
+	@Override
+	protected void onDraw(Canvas view_canvas) {
+		debug("onDraw");
+		if (map == null) {
+			debug("MapView draw without map\n");
+			return;
+		}
+		canvas = view_canvas;
+		paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+		paint.setStrokeWidth(stroke_width);
+		paint.setStrokeCap(Paint.Cap.ROUND);
+		paint.setStrokeJoin(Paint.Join.ROUND);
+		paint.setTextSize(40);
+		map.paint();
+		draw_positions();
+		canvas = null;
+	}
+
+	public boolean onScale(ScaleGestureDetector detector) {
+		float	f = detector.getScaleFactor();
+
+		if (f <= 0.8) {
+			map.set_zoom_centre(map.get_zoom() - 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
+			return true;
+		}
+		if (f >= 1.2) {
+			map.set_zoom_centre(map.get_zoom() + 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
+			return true;
+		}
+		return false;
+	}
+
+	public boolean onScaleBegin(ScaleGestureDetector detector) {
+		return true;
+	}
+
+	public void onScaleEnd(ScaleGestureDetector detector) {
+	}
+
+	@Override
+	public boolean dispatchTouchEvent(MotionEvent event) {
+		scale_detector.onTouchEvent(event);
+
+		if (scale_detector.isInProgress()) {
+			scaling = true;
+		}
+
+		if (scaling) {
+			if (event.getAction() == MotionEvent.ACTION_UP) {
+				scaling = false;
+			}
+			return true;
+		}
+
+		if (event.getAction() == MotionEvent.ACTION_DOWN) {
+			map.touch_start((int) event.getX(), (int) event.getY(), true);
+		} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+			map.touch_continue((int) event.getX(), (int) event.getY(), true);
+		}
+		return true;
+	}
+
+	double	mapAccuracy;
+
+	public void center(double lat, double lon, double accuracy) {
+		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
+			if (map != null)
+				map.maybe_centre(lat, lon);
+			mapAccuracy = accuracy;
+		}
+	}
+
+	public void set_visible(boolean visible) {
+		if (visible)
+			setVisibility(VISIBLE);
+		else
+			setVisibility(GONE);
+	}
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (state != null) {
+			map.show(state, null);
+			if (state.pad_lat != AltosLib.MISSING && pad == null)
+				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
+		}
+
+		if (telem_state != null) {
+			Integer[] old_serial = rockets.keySet().toArray(new Integer[0]);
+			Integer[] new_serial = telem_state.states.keySet().toArray(new Integer[0]);
+
+			/* remove deleted keys */
+			for (int serial : old_serial) {
+				if (!telem_state.states.containsKey(serial))
+					rockets.remove(serial);
+			}
+
+			/* set remaining keys */
+
+			for (int serial : new_serial) {
+				Rocket 		rocket;
+				AltosState	t_state = telem_state.states.get(serial);
+				if (rockets.containsKey(serial))
+					rocket = rockets.get(serial);
+				else {
+					rocket = new Rocket(String.format("%d", serial), this);
+					rockets.put(serial, rocket);
+				}
+				if (t_state.gps != null)
+					rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon), t_state.received_time);
+			}
+		}
+		if (receiver != null) {
+			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+		}
+	}
+
+	public void onCreateView(int map_type) {
+		map = new AltosMap(this);
+		map.set_maptype(map_type);
+
+		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
+		/* arrow at the bottom of the launchpad image */
+		pad_off_x = pad_bitmap.getWidth() / 2;
+		pad_off_y = pad_bitmap.getHeight();
+
+		rocket_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
+		/* arrow at the bottom of the rocket image */
+		rocket_off_x = rocket_bitmap.getWidth() / 2;
+		rocket_off_y = rocket_bitmap.getHeight();
+
+		here_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.ic_maps_indicator_current_position);
+		/* Center of the dot */
+		here_off_x = here_bitmap.getWidth() / 2;
+		here_off_y = here_bitmap.getHeight() / 2;
+	}
+
+	public void set_map_type(int map_type) {
+		if (map != null)
+			map.set_maptype(map_type);
+	}
+
+	public AltosMapOffline(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		scale_detector = new ScaleGestureDetector(context, this);
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
new file mode 100644
index 00000000..9503a0bd
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright © 2013 Mike Beattie <mike@ethernal.org>
+ *
+ * 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.util.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.*;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+//import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.location.Location;
+import android.content.*;
+
+class RocketOnline implements Comparable {
+	Marker		marker;
+	long		last_packet;
+
+	void set_position(AltosLatLon position, long last_packet) {
+		marker.setPosition(new LatLng(position.lat, position.lon));
+		this.last_packet = last_packet;
+	}
+
+	private Bitmap rocket_bitmap(Context context, String text) {
+
+		/* From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
+		 */
+		Bitmap orig_bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.rocket);
+		Bitmap bitmap = orig_bitmap.copy(Bitmap.Config.ARGB_8888, true);
+
+		Canvas canvas = new Canvas(bitmap);
+		Paint paint = new Paint();
+		paint.setTextSize(40);
+		paint.setColor(0xff000000);
+
+		Rect	bounds = new Rect();
+		paint.getTextBounds(text, 0, text.length(), bounds);
+
+		int	width = bounds.right - bounds.left;
+		int	height = bounds.bottom - bounds.top;
+
+		float x = bitmap.getWidth() / 2.0f - width / 2.0f;
+		float y = bitmap.getHeight() / 2.0f - height / 2.0f;
+
+		canvas.drawText(text, 0, text.length(), x, y, paint);
+		return bitmap;
+	}
+
+	public void remove() {
+		marker.remove();
+	}
+
+	public int compareTo(Object o) {
+		RocketOnline other = (RocketOnline) o;
+
+		long	diff = last_packet - other.last_packet;
+
+		if (diff > 0)
+			return 1;
+		if (diff < 0)
+			return -1;
+		return 0;
+	}
+
+	RocketOnline(Context context, String name, GoogleMap map, double lat, double lon, long last_packet) {
+		this.marker = map.addMarker(new MarkerOptions()
+					    .icon(BitmapDescriptorFactory.fromBitmap(rocket_bitmap(context, name)))
+					    .position(new LatLng(lat, lon))
+					    .visible(true));
+		this.last_packet = last_packet;
+	}
+}
+
+public class AltosMapOnline implements AltosDroidMapInterface {
+	public SupportMapFragment mMapFragment;
+	private GoogleMap mMap;
+	private boolean mapLoaded = false;
+	Context context;
+
+	private HashMap<Integer,RocketOnline> rockets = new HashMap<Integer,RocketOnline>();
+	private Marker mPadMarker;
+	private boolean pad_set;
+	private Polyline mPolyline;
+
+	private View map_view;
+
+	private double mapAccuracy = -1;
+
+	private AltosLatLon my_position = null;
+	private AltosLatLon target_position = null;
+
+	public void onCreateView(final int map_type) {
+		mMapFragment = new SupportMapFragment() {
+			@Override
+			public void onActivityCreated(Bundle savedInstanceState) {
+				super.onActivityCreated(savedInstanceState);
+				setupMap(map_type);
+			}
+			@Override
+			public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+				map_view = super.onCreateView(inflater, container, savedInstanceState);
+				return map_view;
+			}
+			@Override
+			public void onDestroyView() {
+				super.onDestroyView();
+				map_view = null;
+			}
+		};
+	}
+
+//	public void onActivityCreated() {
+//		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
+//	}
+
+	public void setupMap(int map_type) {
+		mMap = mMapFragment.getMap();
+		if (mMap != null) {
+			set_map_type(map_type);
+			mMap.setMyLocationEnabled(true);
+			mMap.getUiSettings().setTiltGesturesEnabled(false);
+			mMap.getUiSettings().setZoomControlsEnabled(false);
+
+			mPadMarker = mMap.addMarker(
+					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
+					                   .position(new LatLng(0,0))
+					                   .visible(false)
+					);
+
+			mPolyline = mMap.addPolyline(
+					new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0))
+					                     .width(20)
+					                     .color(Color.BLUE)
+					                     .visible(false)
+					);
+
+			mapLoaded = true;
+		}
+	}
+
+	public void center(double lat, double lon, double accuracy) {
+		if (mMap == null)
+			return;
+
+		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
+			mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(lat, lon),14));
+			mapAccuracy = accuracy;
+		}
+	}
+
+	private void set_rocket(int serial, AltosState state) {
+		RocketOnline	rocket;
+
+		if (state.gps == null || state.gps.lat == AltosLib.MISSING)
+			return;
+
+		if (mMap == null)
+			return;
+
+		if (rockets.containsKey(serial)) {
+			rocket = rockets.get(serial);
+			rocket.set_position(new AltosLatLon(state.gps.lat, state.gps.lon), state.received_time);
+		} else {
+			rocket = new RocketOnline(context,
+						  String.format("%d", serial),
+						  mMap, state.gps.lat, state.gps.lon,
+						  state.received_time);
+			rockets.put(serial, rocket);
+		}
+	}
+
+	private void remove_rocket(int serial) {
+		RocketOnline rocket = rockets.get(serial);
+		rocket.remove();
+		rockets.remove(serial);
+	}
+
+	public void set_visible(boolean visible) {
+		if (map_view == null)
+			return;
+		if (visible)
+			map_view.setVisibility(View.VISIBLE);
+		else
+			map_view.setVisibility(View.GONE);
+	}
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+
+		if (telem_state != null) {
+			for (int serial : rockets.keySet()) {
+				if (!telem_state.states.containsKey(serial))
+					remove_rocket(serial);
+			}
+
+			for (int serial : telem_state.states.keySet()) {
+				set_rocket(serial, telem_state.states.get(serial));
+			}
+		}
+
+		if (state != null) {
+			if (mapLoaded) {
+				if (!pad_set && state.pad_lat != AltosLib.MISSING) {
+					pad_set = true;
+					mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
+					mPadMarker.setVisible(true);
+				}
+			}
+			if (state.gps != null) {
+
+				target_position = new AltosLatLon(state.gps.lat, state.gps.lon);
+				if (state.gps.locked && state.gps.nsat >= 4)
+					center (state.gps.lat, state.gps.lon, 10);
+			}
+		}
+
+		if (receiver != null) {
+			double accuracy;
+
+			if (receiver.hasAccuracy())
+				accuracy = receiver.getAccuracy();
+			else
+				accuracy = 1000;
+
+			my_position = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			center (my_position.lat, my_position.lon, accuracy);
+		}
+
+		if (my_position != null && target_position != null) {
+			mPolyline.setPoints(Arrays.asList(new LatLng(my_position.lat, my_position.lon), new LatLng(target_position.lat, target_position.lon)));
+			mPolyline.setVisible(true);
+		}
+
+	}
+
+	public void set_map_type(int map_type) {
+		if (mMap != null) {
+			if (map_type == AltosMap.maptype_hybrid)
+				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
+			else if (map_type == AltosMap.maptype_satellite)
+				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+			else if (map_type == AltosMap.maptype_terrain)
+				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
+			else
+				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		}
+	}
+
+	public AltosMapOnline(Context context) {
+		this.context = context;
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java
deleted file mode 100644
index 65cc0b95..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright © 2015 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.util.*;
-import java.io.*;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.graphics.*;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.view.*;
-import android.widget.*;
-import android.location.Location;
-import android.content.*;
-import android.util.*;
-
-public class AltosMapView extends View implements ScaleGestureDetector.OnScaleGestureListener {
-	ScaleGestureDetector	scale_detector;
-	boolean			scaling;
-	TabMapOffline		tab;
-
-	class Line {
-		AltosLatLon	a, b;
-
-		void paint() {
-			if (a != null && b != null) {
-				AltosPointDouble	a_screen = tab.map.transform.screen(a);
-				AltosPointDouble	b_screen = tab.map.transform.screen(b);
-				tab.paint.setColor(0xff8080ff);
-				tab.canvas.drawLine((float) a_screen.x, (float) a_screen.y,
-						    (float) b_screen.x, (float) b_screen.y,
-						    tab.paint);
-			}
-		}
-
-		void set_a(AltosLatLon a) {
-			this.a = a;
-		}
-
-		void set_b(AltosLatLon b) {
-			this.b = b;
-		}
-
-		Line() {
-		}
-	}
-
-	Line line = new Line();
-
-	private void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
-		if (lat_lon != null && tab.map != null && tab.map.transform != null) {
-			AltosPointInt pt = new AltosPointInt(tab.map.transform.screen(lat_lon));
-
-			tab.canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, tab.paint);
-		}
-	}
-
-	private void draw_positions() {
-		line.set_a(tab.map.last_position);
-		line.set_b(tab.here);
-		line.paint();
-		draw_bitmap(tab.pad, tab.pad_bitmap, tab.pad_off_x, tab.pad_off_y);
-
-		Rocket[]	rockets = tab.rockets.values().toArray(new Rocket[0]);
-
-		Arrays.sort(rockets);
-		for (Rocket rocket : rockets)
-			rocket.paint();
-		draw_bitmap(tab.here, tab.here_bitmap, tab.here_off_x, tab.here_off_y);
-	}
-
-	@Override public void invalidate() {
-		Rect r = new Rect();
-		getDrawingRect(r);
-		super.invalidate();
-	}
-
-	@Override public void invalidate(int l, int t, int r, int b) {
-		Rect rect = new Rect();
-		getDrawingRect(rect);
-		super.invalidate();
-	}
-
-	@Override
-	protected void onDraw(Canvas view_canvas) {
-		tab.canvas = view_canvas;
-		tab.paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-		tab.paint.setStrokeWidth(tab.stroke_width);
-		tab.paint.setStrokeCap(Paint.Cap.ROUND);
-		tab.paint.setStrokeJoin(Paint.Join.ROUND);
-		tab.paint.setTextSize(40);
-		tab.map.paint();
-		draw_positions();
-		tab.canvas = null;
-	}
-
-	public boolean onScale(ScaleGestureDetector detector) {
-		float	f = detector.getScaleFactor();
-
-		if (f <= 0.8) {
-			tab.map.set_zoom_centre(tab.map.get_zoom() - 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
-			return true;
-		}
-		if (f >= 1.2) {
-			tab.map.set_zoom_centre(tab.map.get_zoom() + 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
-			return true;
-		}
-		return false;
-	}
-
-	public boolean onScaleBegin(ScaleGestureDetector detector) {
-		return true;
-	}
-
-	public void onScaleEnd(ScaleGestureDetector detector) {
-	}
-
-	@Override
-	public boolean dispatchTouchEvent(MotionEvent event) {
-		scale_detector.onTouchEvent(event);
-
-		if (scale_detector.isInProgress()) {
-			scaling = true;
-		}
-
-		if (scaling) {
-			if (event.getAction() == MotionEvent.ACTION_UP) {
-				scaling = false;
-			}
-			return true;
-		}
-
-		if (event.getAction() == MotionEvent.ACTION_DOWN) {
-			tab.map.touch_start((int) event.getX(), (int) event.getY(), true);
-		} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-			tab.map.touch_continue((int) event.getX(), (int) event.getY(), true);
-		}
-		return true;
-	}
-
-	public void set_tab(TabMapOffline tab) {
-		this.tab = tab;
-	}
-
-	public AltosMapView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		scale_detector = new ScaleGestureDetector(context, this);
-	}
-}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index d5d1d262..ee52d637 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -112,7 +112,6 @@ public class TabMap extends AltosDroidTab {
 				setupMap();
 			}
 		};
-
 	}
 
 	@Override
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 296e2122..26e04c83 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -32,58 +32,9 @@ import android.widget.*;
 import android.location.Location;
 import android.content.*;
 
-class Rocket implements Comparable {
-	AltosLatLon	position;
-	String		name;
-	long		last_packet;
-	TabMapOffline	tab;
-
-	void paint() {
-		tab.draw_bitmap(position, tab.rocket_bitmap, tab.rocket_off_x, tab.rocket_off_y);
-		tab.draw_text(position, name, 0, 3*tab.rocket_bitmap.getHeight()/4);
-	}
-
-	void set_position(AltosLatLon position, long last_packet) {
-		this.position = position;
-		this.last_packet = last_packet;
-	}
-
-	Rocket(String name, TabMapOffline tab) {
-		this.name = name;
-		this.tab = tab;
-	}
-
-	public int compareTo(Object o) {
-		Rocket other = (Rocket) o;
-
-		long	diff = last_packet - other.last_packet;
-
-		if (diff > 0)
-			return 1;
-		if (diff < 0)
-			return -1;
-		return 0;
-	}
-}
-
-public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
-
-	AltosMap map;
+public class TabMapOffline extends AltosDroidTab {
 
 	AltosLatLon	here;
-	AltosLatLon	pad;
-
-	Canvas	canvas;
-	Paint	paint;
-
-	Bitmap	pad_bitmap;
-	int	pad_off_x, pad_off_y;
-	Bitmap	rocket_bitmap;
-	int	rocket_off_x, rocket_off_y;
-	Bitmap	here_bitmap;
-	int	here_off_x, here_off_y;
-
-	private boolean pad_set;
 
 	private TextView mDistanceView;
 	private TextView mBearingView;
@@ -91,221 +42,14 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	private TextView mTargetLongitudeView;
 	private TextView mReceiverLatitudeView;
 	private TextView mReceiverLongitudeView;
-	private AltosMapView map_view;
-
-	private double mapAccuracy = -1;
-
-	int	stroke_width = 20;
-
-
-	void draw_text(AltosLatLon lat_lon, String text, int off_x, int off_y) {
-		if (lat_lon != null && map != null && map.transform != null) {
-			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
-
-			Rect	bounds = new Rect();
-			paint.getTextBounds(text, 0, text.length(), bounds);
-
-			int	width = bounds.right - bounds.left;
-			int	height = bounds.bottom - bounds.top;
-
-			float x = pt.x;
-			float y = pt.y;
-			x = x - width / 2.0f - off_x;
-			y = y + height / 2.0f - off_y;
-			paint.setColor(0xff000000);
-			canvas.drawText(text, 0, text.length(), x, y, paint);
-		}
-	}
-
-	void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
-		if (lat_lon != null && map != null && map.transform != null) {
-			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
-
-			canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, paint);
-		}
-	}
-
-	HashMap<Integer,Rocket> rockets = new HashMap<Integer,Rocket>();
-
-	/* AltosMapInterface */
-
-	static  final int	WHITE = 0xffffffff;
-	static  final int	RED   = 0xffff0000;
-	static  final int	PINK  = 0xffff8080;
-	static  final int	YELLOW= 0xffffff00;
-	static  final int	CYAN  = 0xff00ffff;
-	static  final int	BLUE  = 0xff0000ff;
-	static  final int	BLACK = 0xff000000;
-
-	public static final int stateColors[] = {
-		WHITE,  // startup
-		WHITE,  // idle
-		WHITE,  // pad
-		RED,    // boost
-		PINK,   // fast
-		YELLOW, // coast
-		CYAN,   // drogue
-		BLUE,   // main
-		BLACK,  // landed
-		BLACK,  // invalid
-		CYAN,   // stateless
-	};
-
-	public AltosMapPath new_path() {
-		return null;
-	}
-
-	public AltosMapLine new_line() {
-		return null;
-	}
-
-	class MapImage implements AltosImage {
-		public Bitmap	bitmap;
-
-		public void flush() {
-			if (bitmap != null) {
-				bitmap.recycle();
-				bitmap = null;
-			}
-		}
-
-		public MapImage(File file) {
-			bitmap = BitmapFactory.decodeFile(file.getPath());
-		}
-	}
-
-	public AltosImage load_image(File file) throws Exception {
-		return new MapImage(file);
-	}
-
-	class MapMark extends AltosMapMark {
-		public void paint(AltosMapTransform t) {
-		}
-
-		MapMark(double lat, double lon, int state) {
-			super(lat, lon, state);
-		}
-	}
-
-	public AltosMapMark new_mark(double lat, double lon, int state) {
-		return new MapMark(lat, lon, state);
-	}
-
-	class MapTile extends AltosMapTile {
-		public void paint(AltosMapTransform t) {
-			AltosPointInt		pt = new AltosPointInt(t.screen(upper_left));
-
-			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);
-
-			MapImage 		map_image = (MapImage) altos_image;
-
-			Bitmap			bitmap = null;
-
-			if (map_image != null)
-				bitmap = map_image.bitmap;
-
-			if (bitmap != null) {
-				canvas.drawBitmap(bitmap, pt.x, pt.y, paint);
-			} else {
-				paint.setColor(0xff808080);
-				canvas.drawRect(pt.x, pt.y, pt.x + px_size, pt.y + px_size, paint);
-				if (t.has_location()) {
-					String	message = null;
-					switch (status) {
-					case AltosMapTile.loading:
-						message = "Loading...";
-						break;
-					case AltosMapTile.bad_request:
-						message = "Internal error";
-						break;
-					case AltosMapTile.failed:
-						message = "Network error, check connection";
-						break;
-					case AltosMapTile.forbidden:
-						message = "Too many requests, try later";
-						break;
-					}
-					if (message != null) {
-						Rect	bounds = new Rect();
-						paint.getTextBounds(message, 0, message.length(), bounds);
-
-						int	width = bounds.right - bounds.left;
-						int	height = bounds.bottom - bounds.top;
-
-						float x = pt.x + px_size / 2.0f;
-						float y = pt.y + px_size / 2.0f;
-						x = x - width / 2.0f;
-						y = y + height / 2.0f;
-						paint.setColor(0xff000000);
-						canvas.drawText(message, 0, message.length(), x, y, paint);
-					}
-				}
-			}
-		}
-
-		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 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 int width() {
-		if (map_view != null)
-			return map_view.getWidth();
-		return 500;
-	}
-
-	public int height() {
-		if (map_view != null)
-			return map_view.getHeight();
-		return 500;
-	}
-
-	public void repaint() {
-		if (map_view != null)
-			map_view.postInvalidate();
-	}
-
-	public void repaint(AltosRectangle damage) {
-		if (map_view != null)
-			map_view.postInvalidate(damage.x, damage.y, damage.x + damage.width, damage.y + damage.height);
-	}
-
-	public void set_zoom_label(String label) {
-	}
-
-	public void debug(String format, Object ... arguments) {
-		AltosDebug.debug(format, arguments);
-	}
+	private AltosMapOffline map_offline;
+	private AltosMapOnline map_online;
+	private View view;
+	private int map_source;
 
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-
-		map = new AltosMap(this);
-		map.set_maptype(altos_droid.map_type);
-
-		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
-		/* arrow at the bottom of the launchpad image */
-		pad_off_x = pad_bitmap.getWidth() / 2;
-		pad_off_y = pad_bitmap.getHeight();
-
-		rocket_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
-		/* arrow at the bottom of the rocket image */
-		rocket_off_x = rocket_bitmap.getWidth() / 2;
-		rocket_off_y = rocket_bitmap.getHeight();
-
-		here_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.ic_maps_indicator_current_position);
-		/* Center of the dot */
-		here_off_x = here_bitmap.getWidth() / 2;
-		here_off_y = here_bitmap.getHeight() / 2;
 	}
 
 	@Override
@@ -313,42 +57,54 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		super.onCreate(savedInstanceState);
 	}
 
+	private void make_offline_map() {
+	}
+
+	private void make_online_map() {
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
+	}
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_map_offline, container, false);
-
-		map_view = (AltosMapView)v.findViewById(R.id.map_view_offline);
-		map_view.set_tab(this);
-		mDistanceView  = (TextView)v.findViewById(R.id.distance_value_offline);
-		mBearingView   = (TextView)v.findViewById(R.id.bearing_value_offline);
-		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value_offline);
-		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value_offline);
-		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value_offline);
-		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value_offline);
-		return v;
+		view = inflater.inflate(R.layout.tab_map_offline, container, false);
+		int map_source = AltosDroidPreferences.map_source();
+
+		mDistanceView  = (TextView)view.findViewById(R.id.distance_value_offline);
+		mBearingView   = (TextView)view.findViewById(R.id.bearing_value_offline);
+		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value_offline);
+		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value_offline);
+		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value_offline);
+		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value_offline);
+		map_offline = (AltosMapOffline)view.findViewById(R.id.map_view_offline);
+		map_offline.onCreateView(altos_droid.map_type);
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
+		set_map_source(AltosDroidPreferences.map_source());
+		return view;
 	}
 
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
+		if (map_online != null)
+			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
 	}
 
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
-
 	}
 
+	public String tab_name() { return "offmap"; }
+
 	private void center(double lat, double lon, double accuracy) {
-		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
-			if (map != null)
-				map.maybe_centre(lat, lon);
-			mapAccuracy = accuracy;
-		}
+		if (map_offline != null)
+			map_offline.center(lat, lon, accuracy);
+		if (map_online != null)
+			map_online.center(lat, lon, accuracy);
 	}
 
-	public String tab_name() { return "offmap"; }
-
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
@@ -356,40 +112,9 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		}
 
 		if (state != null) {
-			map.show(state, null);
 			if (state.gps != null) {
 				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
 				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-				if (state.gps.locked && state.gps.nsat >= 4)
-					center (state.gps.lat, state.gps.lon, 10);
-			}
-			if (state.pad_lat != AltosLib.MISSING && pad == null)
-				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
-		}
-
-		if (telem_state != null) {
-			Integer[] old_serial = rockets.keySet().toArray(new Integer[0]);
-			Integer[] new_serial = telem_state.states.keySet().toArray(new Integer[0]);
-
-			/* remove deleted keys */
-			for (int serial : old_serial) {
-				if (!telem_state.states.containsKey(serial))
-					rockets.remove(serial);
-			}
-
-			/* set remaining keys */
-
-			for (int serial : new_serial) {
-				Rocket 		rocket;
-				AltosState	t_state = telem_state.states.get(serial);
-				if (rockets.containsKey(serial))
-					rocket = rockets.get(serial);
-				else {
-					rocket = new Rocket(String.format("%d", serial), this);
-					rockets.put(serial, rocket);
-				}
-				if (t_state.gps != null)
-					rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon), t_state.received_time);
 			}
 		}
 
@@ -405,13 +130,41 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
 			center (here.lat, here.lon, accuracy);
 		}
-
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_offline != null)
+				map_offline.show(telem_state, state, from_receiver, receiver);
+		} else {
+			if (map_online != null)
+				map_online.show(telem_state, state, from_receiver, receiver);
+		}
 	}
 
 	@Override
 	public void set_map_type(int map_type) {
-		if (map != null)
-			map.set_maptype(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) {
+		this.map_source = map_source;
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_online != null)
+				map_online.set_visible(false);
+			if (map_offline != null) {
+				map_offline.set_visible(true);
+				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		} else {
+			if (map_offline != null)
+				map_offline.set_visible(false);
+			if (map_online != null) {
+				map_online.set_visible(true);
+				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		}
 	}
 
 	public TabMapOffline() {
-- 
cgit v1.2.3


From a959c1926048d1b96a06aa291131afd7c8e771c7 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 18:41:01 -0700
Subject: altosdroid: Get rid of on-line only maps tab

The offline tab did both, so delete the online one and replace it with
the offline one.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_map.xml                  | 340 +++++++++++----------
 altosdroid/res/layout/tab_map_offline.xml          | 199 ------------
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |   1 -
 .../src/org/altusmetrum/AltosDroid/TabMap.java     | 251 +++++----------
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  | 172 -----------
 5 files changed, 255 insertions(+), 708 deletions(-)
 delete mode 100644 altosdroid/res/layout/tab_map_offline.xml
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java

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

diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index b4c97f91..2388a20b 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -20,168 +20,180 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-  	<LinearLayout
-	    android:id="@+id/map"
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_weight="1">
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/distance_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/distance_label" />
-
-			<TextView
-				android:id="@+id/distance_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@+id/distance_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/bearing_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/bearing_label" />
-
-			<TextView
-				android:id="@+id/bearing_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@+id/bearing_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/target_lat_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/target_latitude_label" />
-
-			<TextView
-				android:id="@+id/target_lat_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/target_lat_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/target_lon_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/target_longitude_label" />
-
-			<TextView
-				android:id="@+id/target_lon_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/target_lon_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/receiver_lat_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/receiver_latitude_label" />
-
-			<TextView
-				android:id="@+id/receiver_lat_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/receiver_lat_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/receiver_lon_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/receiver_longitude_label" />
-
-			<TextView
-				android:id="@+id/receiver_lon_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/receiver_lon_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</LinearLayout>
+  <FrameLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal"
+      android:layout_weight="1">
+    <LinearLayout
+	android:id="@+id/map_online"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
+    </LinearLayout>
+    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_offline"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						/>
+  </FrameLayout>
+  
+  <LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/distance_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/distance_label" />
+
+      <TextView
+	  android:id="@+id/distance_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/distance_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/bearing_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/bearing_label" />
+
+      <TextView
+	  android:id="@+id/bearing_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/bearing_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+  </LinearLayout>
+
+  <LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/target_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/target_latitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/target_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/target_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/target_longitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/target_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
+
+  <LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/receiver_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/receiver_latitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/receiver_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/receiver_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/receiver_longitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/receiver_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
 </LinearLayout>
diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml
deleted file mode 100644
index 1b0f28a7..00000000
--- a/altosdroid/res/layout/tab_map_offline.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     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:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical" >
-
-  <FrameLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:baselineAligned="true"
-      android:orientation="horizontal"
-      android:layout_weight="1">
-    <LinearLayout
-	android:id="@+id/map_online"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:layout_weight="1">
-    </LinearLayout>
-    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_view_offline"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						/>
-  </FrameLayout>
-  
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/distance_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/distance_label" />
-
-      <TextView
-	  android:id="@+id/distance_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/distance_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/bearing_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/bearing_label" />
-
-      <TextView
-	  android:id="@+id/bearing_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/bearing_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-  </LinearLayout>
-
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/target_lat_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/target_latitude_label" />
-
-      <TextView
-	  android:id="@+id/target_lat_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/target_lat_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/target_lon_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/target_longitude_label" />
-
-      <TextView
-	  android:id="@+id/target_lon_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/target_lon_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-  </LinearLayout>
-
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/receiver_lat_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/receiver_latitude_label" />
-
-      <TextView
-	  android:id="@+id/receiver_lat_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/receiver_lat_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/receiver_lon_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/receiver_longitude_label" />
-
-      <TextView
-	  android:id="@+id/receiver_lon_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/receiver_lon_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-  </LinearLayout>
-</LinearLayout>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 426e2e84..f6645105 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -536,7 +536,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator(create_tab_view("Descent")), TabDescent.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator(create_tab_view("Landed")), TabLanded.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("offmap").setIndicator(create_tab_view("OffMap")), TabMapOffline.class, null);
 
 		// Display the Version
 		mVersion = (TextView) findViewById(R.id.version);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index ee52d637..9c39e105 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -18,40 +18,23 @@
 package org.altusmetrum.AltosDroid;
 
 import java.util.*;
+import java.io.*;
 
 import org.altusmetrum.altoslib_7.*;
 
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.MarkerOptions;
-import com.google.android.gms.maps.model.Polyline;
-import com.google.android.gms.maps.model.PolylineOptions;
-
 import android.app.Activity;
-import android.graphics.Color;
 import android.graphics.*;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-//import android.support.v4.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
+import android.support.v4.app.FragmentTransaction;
+import android.view.*;
+import android.widget.*;
 import android.location.Location;
+import android.content.*;
 
 public class TabMap extends AltosDroidTab {
-	private SupportMapFragment mMapFragment;
-	private GoogleMap mMap;
-	private boolean mapLoaded = false;
 
-	private HashMap<Integer,Marker> rockets = new HashMap<Integer,Marker>();
-	private Marker mPadMarker;
-	private boolean pad_set;
-	private Polyline mPolyline;
+	AltosLatLon	here;
 
 	private TextView mDistanceView;
 	private TextView mBearingView;
@@ -59,135 +42,67 @@ public class TabMap extends AltosDroidTab {
 	private TextView mTargetLongitudeView;
 	private TextView mReceiverLatitudeView;
 	private TextView mReceiverLongitudeView;
+	private AltosMapOffline map_offline;
+	private AltosMapOnline map_online;
+	private View view;
+	private int map_source;
 
-	private double mapAccuracy = -1;
-
-	private AltosLatLon my_position = null;
-	private AltosLatLon target_position = null;
-
-	private Bitmap rocket_bitmap(String text) {
-
-		/* From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
-		 */
-		Bitmap orig_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
-		Bitmap bitmap = orig_bitmap.copy(Bitmap.Config.ARGB_8888, true);
-
-		Canvas canvas = new Canvas(bitmap);
-		Paint paint = new Paint();
-		paint.setTextSize(40);
-		paint.setColor(0xff000000);
-
-		Rect	bounds = new Rect();
-		paint.getTextBounds(text, 0, text.length(), bounds);
-
-		int	width = bounds.right - bounds.left;
-		int	height = bounds.bottom - bounds.top;
-
-		float x = bitmap.getWidth() / 2.0f - width / 2.0f;
-		float y = bitmap.getHeight() / 2.0f - height / 2.0f;
-
-		AltosDebug.debug("map label x %f y %f\n", x, y);
-
-		canvas.drawText(text, 0, text.length(), x, y, paint);
-		return bitmap;
-	}
-
-	private Marker rocket_marker(int serial, double lat, double lon) {
-		Bitmap	bitmap = rocket_bitmap(String.format("%d", serial));
-
-		return mMap.addMarker(new MarkerOptions()
-				      .icon(BitmapDescriptorFactory.fromBitmap(bitmap))
-				      .position(new LatLng(lat, lon))
-				      .visible(true));
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+	}
 
-		mMapFragment = new SupportMapFragment() {
-			@Override
-			public void onActivityCreated(Bundle savedInstanceState) {
-				super.onActivityCreated(savedInstanceState);
-				setupMap();
-			}
-		};
+	private void make_offline_map() {
+	}
+
+	private void make_online_map() {
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_map, container, false);
-		mDistanceView  = (TextView)v.findViewById(R.id.distance_value);
-		mBearingView   = (TextView)v.findViewById(R.id.bearing_value);
-		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value);
-		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value);
-		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value);
-		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value);
-		return v;
+		view = inflater.inflate(R.layout.tab_map, container, false);
+		int map_source = AltosDroidPreferences.map_source();
+
+		mDistanceView  = (TextView)view.findViewById(R.id.distance_value);
+		mBearingView   = (TextView)view.findViewById(R.id.bearing_value);
+		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value);
+		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value);
+		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value);
+		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value);
+		map_offline = (AltosMapOffline)view.findViewById(R.id.map_offline);
+		map_offline.onCreateView(altos_droid.map_type);
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
+		set_map_source(AltosDroidPreferences.map_source());
+		return view;
 	}
 
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
-	}
-
-	private void setupMap() {
-		mMap = mMapFragment.getMap();
-		if (mMap != null) {
-			set_map_type(altos_droid.map_type);
-			mMap.setMyLocationEnabled(true);
-			mMap.getUiSettings().setTiltGesturesEnabled(false);
-			mMap.getUiSettings().setZoomControlsEnabled(false);
-
-			Bitmap label_bitmap = rocket_bitmap("hello");
-
-			mPadMarker = mMap.addMarker(
-					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
-					                   .position(new LatLng(0,0))
-					                   .visible(false)
-					);
-
-			mPolyline = mMap.addPolyline(
-					new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0))
-					                     .width(20)
-					                     .color(Color.BLUE)
-					                     .visible(false)
-					);
-
-			mapLoaded = true;
-		}
+		if (map_online != null)
+			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
 	}
 
-	private void center(double lat, double lon, double accuracy) {
-		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
-			mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(lat, lon),14));
-			mapAccuracy = accuracy;
-		}
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
 	}
 
 	public String tab_name() { return "map"; }
 
-	private void set_rocket(int serial, AltosState state) {
-		Marker	marker;
-
-		if (state.gps == null || state.gps.lat == AltosLib.MISSING)
-			return;
-
-		if (rockets.containsKey(serial)) {
-			marker = rockets.get(serial);
-			marker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
-		} else {
-			marker = rocket_marker(serial, state.gps.lat, state.gps.lon);
-			rockets.put(serial, marker);
-			marker.setVisible(true);
-		}
-	}
-
-	private void remove_rocket(int serial) {
-		Marker marker = rockets.get(serial);
-		marker.remove();
-		rockets.remove(serial);
+	private void center(double lat, double lon, double accuracy) {
+		if (map_offline != null)
+			map_offline.center(lat, lon, accuracy);
+		if (map_online != null)
+			map_online.center(lat, lon, accuracy);
 	}
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
@@ -196,67 +111,59 @@ public class TabMap extends AltosDroidTab {
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
 		}
 
-		if (telem_state != null) {
-			for (int serial : rockets.keySet()) {
-				if (!telem_state.states.containsKey(serial))
-					remove_rocket(serial);
-			}
-
-			for (int serial : telem_state.states.keySet()) {
-				set_rocket(serial, telem_state.states.get(serial));
-			}
-		}
-
 		if (state != null) {
-			if (mapLoaded) {
-				if (!pad_set && state.pad_lat != AltosLib.MISSING) {
-					pad_set = true;
-					mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
-					mPadMarker.setVisible(true);
-				}
-			}
 			if (state.gps != null) {
-
-				target_position = new AltosLatLon(state.gps.lat, state.gps.lon);
-
 				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
 				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-				if (state.gps.locked && state.gps.nsat >= 4)
-					center (state.gps.lat, state.gps.lon, 10);
 			}
 		}
 
 		if (receiver != null) {
 			double accuracy;
 
+			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
 			if (receiver.hasAccuracy())
 				accuracy = receiver.getAccuracy();
 			else
 				accuracy = 1000;
-
-			my_position = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
-			mReceiverLatitudeView.setText(AltosDroid.pos(my_position.lat, "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(my_position.lon, "E", "W"));
-			center (my_position.lat, my_position.lon, accuracy);
+			mReceiverLatitudeView.setText(AltosDroid.pos(here.lat, "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
+			center (here.lat, here.lon, accuracy);
 		}
-
-		if (my_position != null && target_position != null) {
-			mPolyline.setPoints(Arrays.asList(new LatLng(my_position.lat, my_position.lon), new LatLng(target_position.lat, target_position.lon)));
-			mPolyline.setVisible(true);
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_offline != null)
+				map_offline.show(telem_state, state, from_receiver, receiver);
+		} else {
+			if (map_online != null)
+				map_online.show(telem_state, state, from_receiver, receiver);
 		}
-
 	}
 
+	@Override
 	public void set_map_type(int map_type) {
-		if (mMap != null) {
-			if (map_type == AltosMap.maptype_hybrid)
-				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
-			else if (map_type == AltosMap.maptype_satellite)
-				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
-			else if (map_type == AltosMap.maptype_terrain)
-				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
-			else
-				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		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) {
+		this.map_source = map_source;
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_online != null)
+				map_online.set_visible(false);
+			if (map_offline != null) {
+				map_offline.set_visible(true);
+				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		} else {
+			if (map_offline != null)
+				map_offline.set_visible(false);
+			if (map_online != null) {
+				map_online.set_visible(true);
+				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
 		}
 	}
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
deleted file mode 100644
index 26e04c83..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright © 2013 Mike Beattie <mike@ethernal.org>
- *
- * 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.util.*;
-import java.io.*;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.graphics.*;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.view.*;
-import android.widget.*;
-import android.location.Location;
-import android.content.*;
-
-public class TabMapOffline extends AltosDroidTab {
-
-	AltosLatLon	here;
-
-	private TextView mDistanceView;
-	private TextView mBearingView;
-	private TextView mTargetLatitudeView;
-	private TextView mTargetLongitudeView;
-	private TextView mReceiverLatitudeView;
-	private TextView mReceiverLongitudeView;
-	private AltosMapOffline map_offline;
-	private AltosMapOnline map_online;
-	private View view;
-	private int map_source;
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-	}
-
-	private void make_offline_map() {
-	}
-
-	private void make_online_map() {
-		map_online = new AltosMapOnline(view.getContext());
-		map_online.onCreateView(altos_droid.map_type);
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		view = inflater.inflate(R.layout.tab_map_offline, container, false);
-		int map_source = AltosDroidPreferences.map_source();
-
-		mDistanceView  = (TextView)view.findViewById(R.id.distance_value_offline);
-		mBearingView   = (TextView)view.findViewById(R.id.bearing_value_offline);
-		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value_offline);
-		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value_offline);
-		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value_offline);
-		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value_offline);
-		map_offline = (AltosMapOffline)view.findViewById(R.id.map_view_offline);
-		map_offline.onCreateView(altos_droid.map_type);
-		map_online = new AltosMapOnline(view.getContext());
-		map_online.onCreateView(altos_droid.map_type);
-		set_map_source(AltosDroidPreferences.map_source());
-		return view;
-	}
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		if (map_online != null)
-			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
-	}
-
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-	}
-
-	public String tab_name() { return "offmap"; }
-
-	private void center(double lat, double lon, double accuracy) {
-		if (map_offline != null)
-			map_offline.center(lat, lon, accuracy);
-		if (map_online != null)
-			map_online.center(lat, lon, accuracy);
-	}
-
-	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		if (from_receiver != null) {
-			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
-			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
-		}
-
-		if (state != null) {
-			if (state.gps != null) {
-				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-			}
-		}
-
-		if (receiver != null) {
-			double accuracy;
-
-			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
-			if (receiver.hasAccuracy())
-				accuracy = receiver.getAccuracy();
-			else
-				accuracy = 1000;
-			mReceiverLatitudeView.setText(AltosDroid.pos(here.lat, "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
-			center (here.lat, here.lon, accuracy);
-		}
-		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
-			if (map_offline != null)
-				map_offline.show(telem_state, state, from_receiver, receiver);
-		} else {
-			if (map_online != null)
-				map_online.show(telem_state, state, from_receiver, receiver);
-		}
-	}
-
-	@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) {
-		this.map_source = map_source;
-		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
-			if (map_online != null)
-				map_online.set_visible(false);
-			if (map_offline != null) {
-				map_offline.set_visible(true);
-				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
-			}
-		} else {
-			if (map_offline != null)
-				map_offline.set_visible(false);
-			if (map_online != null) {
-				map_online.set_visible(true);
-				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
-			}
-		}
-	}
-
-	public TabMapOffline() {
-	}
-}
-- 
cgit v1.2.3


From 0f56903774d9e8bb033dfc0af6945e8ddc1d3065 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 20:08:05 -0700
Subject: altosdroid: Select tracker by clicking on map

This lets you pick a  tracker from the map, rather than having to use
the menu.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/Notebook                                | 24 ++++++---
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 48 ++++++++++++-----
 .../AltosDroid/AltosDroidMapInterface.java         |  2 +-
 .../altusmetrum/AltosDroid/AltosMapOffline.java    | 61 ++++++++++++++++++----
 .../org/altusmetrum/AltosDroid/AltosMapOnline.java |  6 ++-
 .../src/org/altusmetrum/AltosDroid/TabMap.java     | 12 +----
 altoslib/AltosMap.java                             | 21 ++++++++
 altoslib/AltosMapInterface.java                    |  2 +
 altoslib/AltosMapTransform.java                    |  7 +++
 altosuilib/AltosUIMapNew.java                      |  5 ++
 10 files changed, 146 insertions(+), 42 deletions(-)

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

diff --git a/altosdroid/Notebook b/altosdroid/Notebook
index c0ba2098..6804aa5d 100644
--- a/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@ -15,14 +15,6 @@ Desired AltosDroid feature list
 
  *) Monitor-idle mode
 
- *) Select tracker by clicking map
-
- *) Auto select tracker after long delay
-
- *) Evaluate performance issues
-
- *) Merge offline/online maps into single tab with mode
-
  *) Make voice responses depend on selected tab
 
  *) Monitor TeleMega igniters
@@ -96,3 +88,19 @@ Completed features
  *) TeleBT battery voltage
 
 	Done
+
+ *) Evaluate performance issues
+
+	Done. Offline maps were duplicating tabs at every redisplay.
+
+ *) Merge offline/online maps into single tab with mode
+
+	Done.
+
+ *) Auto select tracker after long delay
+
+	Done.
+
+ *) Select tracker by clicking map
+
+	Done.
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index f6645105..c5da6d0e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -18,10 +18,9 @@
 package org.altusmetrum.AltosDroid;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.text.*;
+import java.util.*;
+import java.io.*;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -248,11 +247,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 	}
 
+	int	selected_serial = 0;
 	int	current_serial;
 	long	switch_time;
 
 	void set_switch_time() {
 		switch_time = System.currentTimeMillis();
+		selected_serial = 0;
 	}
 
 	boolean	registered_units_listener;
@@ -262,6 +263,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		if (new_telemetry_state != null)
 			telemetry_state = new_telemetry_state;
 
+		if (selected_serial != 0)
+			current_serial = selected_serial;
+
 		if (current_serial == 0)
 			current_serial = telemetry_state.latest_serial;
 
@@ -271,6 +275,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 
 		serials = telemetry_state.states.keySet().toArray(new Integer[0]);
+		Arrays.sort(serials);
 
 		update_title(telemetry_state);
 
@@ -282,7 +287,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			int age = state_age(state);
 			if (age < 20)
 				aged = false;
-			if (switch_time != 0 && (switch_time - state.received_time) > 0)
+			if (current_serial == selected_serial)
+				aged = false;
+			else if (switch_time != 0 && (switch_time - state.received_time) > 0)
 				aged = true;
 		}
 
@@ -828,13 +835,26 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 	void select_tracker(int serial) {
 		int i;
-		for (i = 0; i < serials.length; i++)
-			if (serials[i] == serial)
-				break;
-		if (i == serials.length)
+
+		AltosDebug.debug("select tracker %d\n", serial);
+
+		if (serial == selected_serial) {
+			AltosDebug.debug("%d already selected\n", serial);
 			return;
+		}
+
+		if (serial != 0) {
+			for (i = 0; i < serials.length; i++)
+				if (serials[i] == serial)
+					break;
 
-		current_serial = serial;
+			if (i == serials.length) {
+				AltosDebug.debug("attempt to select unknown tracker %d\n", serial);
+				return;
+			}
+		}
+
+		current_serial = selected_serial = serial;
 		update_state(null);
 	}
 
@@ -933,15 +953,19 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			return true;
 		case R.id.select_tracker:
 			if (serials != null) {
-				String[] trackers = new String[serials.length];
+				String[] trackers = new String[serials.length+1];
+				trackers[0] = "Auto";
 				for (int i = 0; i < serials.length; i++)
-					trackers[i] = String.format("%d", serials[i]);
+					trackers[i+1] = String.format("%d", serials[i]);
 				AlertDialog.Builder builder_serial = new AlertDialog.Builder(this);
 				builder_serial.setTitle("Select a tracker");
 				builder_serial.setItems(trackers,
 							new DialogInterface.OnClickListener() {
 								public void onClick(DialogInterface dialog, int item) {
-									select_tracker(serials[item]);
+									if (item == 0)
+										select_tracker(0);
+									else
+										select_tracker(serials[item-1]);
 								}
 							});
 				AlertDialog alert_serial = builder_serial.create();
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
index 681cd311..7aff1341 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
@@ -23,7 +23,7 @@ import android.location.Location;
 import org.altusmetrum.altoslib_7.*;
 
 public interface AltosDroidMapInterface {
-	public void onCreateView(int map_type);
+	public void onCreateView(AltosDroid altos_droid);
 
 	public void set_visible(boolean visible);
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 3ff6ff25..12dd2f25 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -36,7 +36,9 @@ import android.util.*;
 class Rocket implements Comparable {
 	AltosLatLon	position;
 	String		name;
+	int		serial;
 	long		last_packet;
+	boolean		active;
 	AltosMapOffline	map_offline;
 
 	void paint() {
@@ -49,14 +51,18 @@ class Rocket implements Comparable {
 		this.last_packet = last_packet;
 	}
 
-	Rocket(String name, AltosMapOffline map_offline) {
-		this.name = name;
-		this.map_offline = map_offline;
+	void set_active(boolean active) {
+		this.active = active;
 	}
 
 	public int compareTo(Object o) {
 		Rocket other = (Rocket) o;
 
+		if (active && !other.active)
+			return 1;
+		if (other.active && !active)
+			return -1;
+
 		long	diff = last_packet - other.last_packet;
 
 		if (diff > 0)
@@ -65,12 +71,19 @@ class Rocket implements Comparable {
 			return -1;
 		return 0;
 	}
+
+	Rocket(int serial, AltosMapOffline map_offline) {
+		this.serial = serial;
+		this.name = String.format("%d", serial);
+		this.map_offline = map_offline;
+	}
 }
 
 public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface {
 	ScaleGestureDetector	scale_detector;
 	boolean			scaling;
 	AltosMap		map;
+	AltosDroid		altos_droid;
 
 	AltosLatLon	here;
 	AltosLatLon	pad;
@@ -236,6 +249,24 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	public void set_zoom_label(String label) {
 	}
 
+	public void select_object(AltosLatLon latlon) {
+		if (map.transform == null)
+			return;
+		for (Rocket rocket : sorted_rockets()) {
+			if (rocket.position == null) {
+				debug("rocket %d has no position\n", rocket.serial);
+				continue;
+			}
+			double distance = map.transform.hypot(latlon, rocket.position);
+			debug("check select %d distance %g width %d\n", rocket.serial, distance, rocket_bitmap.getWidth());
+			if (distance < rocket_bitmap.getWidth() * 2.0) {
+				debug("selecting %d\n", rocket.serial);
+				altos_droid.select_tracker(rocket.serial);
+				break;
+			}
+		}
+	}
+
 	class Line {
 		AltosLatLon	a, b;
 
@@ -295,16 +326,20 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 		}
 	}
 
+	private Rocket[] sorted_rockets() {
+		Rocket[]	rocket_array = rockets.values().toArray(new Rocket[0]);
+
+		Arrays.sort(rocket_array);
+		return rocket_array;
+	}
+
 	private void draw_positions() {
 		line.set_a(map.last_position);
 		line.set_b(here);
 		line.paint();
 		draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
 
-		Rocket[]	rocket_array = rockets.values().toArray(new Rocket[0]);
-
-		Arrays.sort(rocket_array);
-		for (Rocket rocket : rocket_array)
+		for (Rocket rocket : sorted_rockets())
 			rocket.paint();
 		draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
 	}
@@ -379,6 +414,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 			map.touch_start((int) event.getX(), (int) event.getY(), true);
 		} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
 			map.touch_continue((int) event.getX(), (int) event.getY(), true);
+		} else if (event.getAction() == MotionEvent.ACTION_UP) {
+			map.touch_stop((int) event.getX(), (int) event.getY(), true);
 		}
 		return true;
 	}
@@ -425,11 +462,13 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 				if (rockets.containsKey(serial))
 					rocket = rockets.get(serial);
 				else {
-					rocket = new Rocket(String.format("%d", serial), this);
+					rocket = new Rocket(serial, this);
 					rockets.put(serial, rocket);
 				}
 				if (t_state.gps != null)
 					rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon), t_state.received_time);
+				if (state != null)
+					rocket.set_active(state.serial == serial);
 			}
 		}
 		if (receiver != null) {
@@ -437,9 +476,10 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 		}
 	}
 
-	public void onCreateView(int map_type) {
+	public void onCreateView(AltosDroid altos_droid) {
+		this.altos_droid = altos_droid;
 		map = new AltosMap(this);
-		map.set_maptype(map_type);
+		map.set_maptype(altos_droid.map_type);
 
 		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
 		/* arrow at the bottom of the launchpad image */
@@ -464,6 +504,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 
 	public AltosMapOffline(Context context, AttributeSet attrs) {
 		super(context, attrs);
+		this.altos_droid = altos_droid;
 		scale_detector = new ScaleGestureDetector(context, this);
 	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
index 9503a0bd..3f5f32be 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
@@ -121,7 +121,11 @@ public class AltosMapOnline implements AltosDroidMapInterface {
 	private AltosLatLon my_position = null;
 	private AltosLatLon target_position = null;
 
-	public void onCreateView(final int map_type) {
+	private AltosDroid altos_droid;
+
+	public void onCreateView(AltosDroid altos_droid) {
+		this.altos_droid = altos_droid;
+		final int map_type = altos_droid.map_type;
 		mMapFragment = new SupportMapFragment() {
 			@Override
 			public void onActivityCreated(Bundle savedInstanceState) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 9c39e105..cd59dfe7 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -57,14 +57,6 @@ public class TabMap extends AltosDroidTab {
 		super.onCreate(savedInstanceState);
 	}
 
-	private void make_offline_map() {
-	}
-
-	private void make_online_map() {
-		map_online = new AltosMapOnline(view.getContext());
-		map_online.onCreateView(altos_droid.map_type);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		view = inflater.inflate(R.layout.tab_map, container, false);
@@ -77,9 +69,9 @@ public class TabMap extends AltosDroidTab {
 		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value);
 		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value);
 		map_offline = (AltosMapOffline)view.findViewById(R.id.map_offline);
-		map_offline.onCreateView(altos_droid.map_type);
+		map_offline.onCreateView(altos_droid);
 		map_online = new AltosMapOnline(view.getContext());
-		map_online.onCreateView(altos_droid.map_type);
+		map_online.onCreateView(altos_droid);
 		set_map_source(AltosDroidPreferences.map_source());
 		return view;
 	}
diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index adf52ab9..8d12a180 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -391,6 +391,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
 	AltosPointInt	drag_start;
 
+	boolean		dragged;
+
+	static final double drag_far = 20;
+
 	private void drag(int x, int y) {
 		if (drag_start == null)
 			return;
@@ -398,6 +402,11 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		int dx = x - drag_start.x;
 		int dy = y - drag_start.y;
 
+		double distance = Math.hypot(dx, dy);
+
+		if (distance > drag_far)
+			dragged = true;
+
 		if (transform == null) {
 			debug("Transform not set in drag\n");
 			return;
@@ -410,6 +419,12 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
 	private void drag_start(int x, int y) {
 		drag_start = new AltosPointInt(x, y);
+		dragged = false;
+	}
+
+	private void drag_stop(int x, int y) {
+		if (!dragged)
+			map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
 	}
 
 	private void line_start(int x, int y) {
@@ -442,6 +457,12 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			line(x, y);
 	}
 
+	public void touch_stop(int x, int y, boolean is_drag) {
+		notice_user_input();
+		if (is_drag)
+			drag_stop(x, y);
+	}
+
 	public AltosMap(AltosMapInterface map_interface) {
 		this.map_interface = map_interface;
 		cache = new AltosMapCache(map_interface);
diff --git a/altoslib/AltosMapInterface.java b/altoslib/AltosMapInterface.java
index e6cb5971..7e8dd236 100644
--- a/altoslib/AltosMapInterface.java
+++ b/altoslib/AltosMapInterface.java
@@ -42,4 +42,6 @@ public interface AltosMapInterface {
 	public abstract void set_zoom_label(String label);
 
 	public abstract void debug(String format, Object ... arguments);
+
+	public abstract void select_object(AltosLatLon latlon);
 }
diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index 30994ecb..11ed4eb9 100644
--- a/altoslib/AltosMapTransform.java
+++ b/altoslib/AltosMapTransform.java
@@ -51,6 +51,13 @@ public class AltosMapTransform {
 		return new AltosPointDouble(screen.x + offset_x, screen.y + offset_y);
 	}
 
+	public double hypot(AltosLatLon a, AltosLatLon b) {
+		AltosPointDouble	a_pt = point(a);
+		AltosPointDouble	b_pt = point(b);
+
+		return Math.hypot(a_pt.x - b_pt.x, a_pt.y - b_pt.y);
+	}
+
 	public AltosLatLon screen_lat_lon(AltosPointInt screen) {
 		return lat_lon(screen_point(screen));
 	}
diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index 246222bc..8ac18296 100644
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMapNew.java
@@ -358,10 +358,15 @@ public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, Alt
 		zoom_label.setText(label);
 	}
 
+	public void select_object(AltosLatLon latlon) {
+		debug("select at %f,%f\n", latlon.lat, latlon.lon);
+	}
+
 	public void debug(String format, Object ... arguments) {
 		System.out.printf(format, arguments);
 	}
 
+
 	/* AltosFlightDisplay interface */
 
 	public void set_font() {
-- 
cgit v1.2.3


From a761b34ed8fc64435f5a49623f4a5c55e2dda33a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 23 Jun 2015 21:37:25 -0700
Subject: altosdroid: Define strings for the tab names

Use these everywhere instead of replicating the same name; might
reduce errors.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 23 +++++++++++++---------
 .../src/org/altusmetrum/AltosDroid/TabFlight.java  |  2 +-
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |  2 +-
 .../src/org/altusmetrum/AltosDroid/TabPad.java     |  2 +-
 .../src/org/altusmetrum/AltosDroid/TabRecover.java |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index f1da27d8..c2a6cb29 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -87,6 +87,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	private int mAgeNewColor;
 	private int mAgeOldColor;
 
+	public static final String	tab_pad_name = "pad";
+	public static final String	tab_flight_name = "flight";
+	public static final String	tab_recover_name = "recover";
+	public static final String	tab_map_name = "map";
+
 	// field to display the version at the bottom of the screen
 	private TextView mVersion;
 
@@ -399,9 +404,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				if (prev_locked != locked) {
 					String currentTab = mTabHost.getCurrentTabTag();
 					if (locked) {
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
+						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 					} else {
-						if (currentTab.equals("flight")) mTabHost.setCurrentTabByTag("pad");
+						if (currentTab.equals(tab_flight_name)) mTabHost.setCurrentTabByTag(tab_pad_name);
 					}
 				}
 			} else {
@@ -409,13 +414,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 					String currentTab = mTabHost.getCurrentTabTag();
 					switch (state.state) {
 					case AltosLib.ao_flight_boost:
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
+						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 						break;
 					case AltosLib.ao_flight_landed:
-						if (currentTab.equals("flight")) mTabHost.setCurrentTabByTag("recover");
+						if (currentTab.equals(tab_flight_name)) mTabHost.setCurrentTabByTag(tab_recover_name);
 						break;
 					case AltosLib.ao_flight_stateless:
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
+						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 						break;
 					}
 				}
@@ -535,10 +540,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 		mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager);
 
-		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator(create_tab_view("Pad")), TabPad.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("flight").setIndicator(create_tab_view("Flight")), TabFlight.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("recover").setIndicator(create_tab_view("Recover")), TabRecover.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_pad_name).setIndicator(create_tab_view("Pad")), TabPad.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_flight_name).setIndicator(create_tab_view("Flight")), TabFlight.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_recover_name).setIndicator(create_tab_view("Recover")), TabRecover.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec(tab_map_name).setIndicator(create_tab_view("Map")), TabMap.class, null);
 
 		// Display the Version
 		mVersion = (TextView) findViewById(R.id.version);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
index e1fc737d..e0d49a1c 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
@@ -79,7 +79,7 @@ public class TabFlight extends AltosDroidTab {
 		return v;
 	}
 
-	public String tab_name() { return "flight"; }
+	public String tab_name() { return AltosDroid.tab_flight_name; }
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index cd59dfe7..0ee202a4 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -88,7 +88,7 @@ public class TabMap extends AltosDroidTab {
 		super.onDestroyView();
 	}
 
-	public String tab_name() { return "map"; }
+	public String tab_name() { return AltosDroid.tab_map_name; }
 
 	private void center(double lat, double lon, double accuracy) {
 		if (map_offline != null)
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 92bb9013..cfc55261 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -105,7 +105,7 @@ public class TabPad extends AltosDroidTab {
         return v;
 	}
 
-	public String tab_name() { return "pad"; }
+	public String tab_name() { return AltosDroid.tab_pad_name; }
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
index cb394dbe..523ddb61 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
@@ -58,7 +58,7 @@ public class TabRecover extends AltosDroidTab {
 		return v;
 	}
 
-	public String tab_name() { return "recover"; }
+	public String tab_name() { return AltosDroid.tab_recover_name; }
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
-- 
cgit v1.2.3


From 71d924288d45b09ae655d06df9780ba286e3f3be Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 24 Jun 2015 12:02:22 -0700
Subject: altosdroid: Display direction in map view

Use direction in map view when available, otherwise use bearing

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 10 ++++++++--
 altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java     | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index db7815f3..b87b51b5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -998,6 +998,12 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 	static String direction(AltosGreatCircle from_receiver,
 			     Location receiver) {
+		if (from_receiver == null)
+			return null;
+
+		if (receiver == null)
+			return null;
+
 		if (!receiver.hasBearing())
 			return null;
 
@@ -1016,8 +1022,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		else if (iheading < -179 || 179 < iheading)
 			return "backwards";
 		else if (iheading < 0)
-			return String.format("left %d", -iheading);
+			return String.format("left %d°", -iheading);
 		else
-			return String.format("right %d", iheading);
+			return String.format("right %d°", iheading);
 	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 0ee202a4..81b6fe54 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -37,6 +37,7 @@ public class TabMap extends AltosDroidTab {
 	AltosLatLon	here;
 
 	private TextView mDistanceView;
+	private TextView mBearingLabel;
 	private TextView mBearingView;
 	private TextView mTargetLatitudeView;
 	private TextView mTargetLongitudeView;
@@ -63,6 +64,7 @@ public class TabMap extends AltosDroidTab {
 		int map_source = AltosDroidPreferences.map_source();
 
 		mDistanceView  = (TextView)view.findViewById(R.id.distance_value);
+		mBearingLabel  = (TextView)view.findViewById(R.id.bearing_label);
 		mBearingView   = (TextView)view.findViewById(R.id.bearing_value);
 		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value);
 		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value);
@@ -99,8 +101,19 @@ public class TabMap extends AltosDroidTab {
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
-			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			String	direction = AltosDroid.direction(from_receiver, receiver);
+			if (direction != null) {
+				mBearingLabel.setText("Direction");
+				mBearingView.setText(direction);
+			} else {
+				mBearingLabel.setText("Bearing");
+				mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			}
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
+		} else {
+			mBearingLabel.setText("Bearing");
+			mBearingView.setText("");
+			set_value(mDistanceView, AltosConvert.distance, 6, AltosLib.MISSING);
 		}
 
 		if (state != null) {
-- 
cgit v1.2.3


From d6445b3739ac2c5dd040efdb97317a6b2a48044a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 15 Jul 2015 18:31:05 -0700
Subject: Bump Java library versions

Avoid problems if you have an old version of the library installed

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java         | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java             | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java             | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java         | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java  | 2 +-
 .../src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java  | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java          | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java        | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java         | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java               | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java             | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java        | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java     | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java              | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java                 | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java                 | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java             | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java        | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java        | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java       | 2 +-
 altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java         | 2 +-
 altoslib/AltosAccel.java                                              | 2 +-
 altoslib/AltosCRCException.java                                       | 2 +-
 altoslib/AltosCSV.java                                                | 2 +-
 altoslib/AltosCompanion.java                                          | 2 +-
 altoslib/AltosConfigData.java                                         | 2 +-
 altoslib/AltosConfigDataException.java                                | 2 +-
 altoslib/AltosConfigValues.java                                       | 2 +-
 altoslib/AltosConvert.java                                            | 2 +-
 altoslib/AltosDebug.java                                              | 2 +-
 altoslib/AltosDistance.java                                           | 2 +-
 altoslib/AltosEeprom.java                                             | 2 +-
 altoslib/AltosEepromChunk.java                                        | 2 +-
 altoslib/AltosEepromDownload.java                                     | 2 +-
 altoslib/AltosEepromFile.java                                         | 2 +-
 altoslib/AltosEepromGPS.java                                          | 2 +-
 altoslib/AltosEepromHeader.java                                       | 2 +-
 altoslib/AltosEepromIterable.java                                     | 2 +-
 altoslib/AltosEepromList.java                                         | 2 +-
 altoslib/AltosEepromLog.java                                          | 2 +-
 altoslib/AltosEepromMega.java                                         | 2 +-
 altoslib/AltosEepromMetrum2.java                                      | 2 +-
 altoslib/AltosEepromMini.java                                         | 2 +-
 altoslib/AltosEepromMonitor.java                                      | 2 +-
 altoslib/AltosEepromTM.java                                           | 2 +-
 altoslib/AltosEepromTm.java                                           | 2 +-
 altoslib/AltosFile.java                                               | 2 +-
 altoslib/AltosFlash.java                                              | 2 +-
 altoslib/AltosFlashListener.java                                      | 2 +-
 altoslib/AltosFlightDisplay.java                                      | 2 +-
 altoslib/AltosFlightReader.java                                       | 2 +-
 altoslib/AltosFlightStats.java                                        | 2 +-
 altoslib/AltosFontListener.java                                       | 2 +-
 altoslib/AltosFrequency.java                                          | 2 +-
 altoslib/AltosGPS.java                                                | 2 +-
 altoslib/AltosGPSSat.java                                             | 2 +-
 altoslib/AltosGreatCircle.java                                        | 2 +-
 altoslib/AltosHeight.java                                             | 2 +-
 altoslib/AltosHexfile.java                                            | 2 +-
 altoslib/AltosHexsym.java                                             | 2 +-
 altoslib/AltosIMU.java                                                | 2 +-
 altoslib/AltosIdle.java                                               | 2 +-
 altoslib/AltosIdleFetch.java                                          | 2 +-
 altoslib/AltosIdleMonitor.java                                        | 2 +-
 altoslib/AltosIdleMonitorListener.java                                | 2 +-
 altoslib/AltosIgnite.java                                             | 2 +-
 altoslib/AltosImage.java                                              | 2 +-
 altoslib/AltosKML.java                                                | 2 +-
 altoslib/AltosLatLon.java                                             | 2 +-
 altoslib/AltosLatitude.java                                           | 2 +-
 altoslib/AltosLaunchSite.java                                         | 2 +-
 altoslib/AltosLaunchSiteListener.java                                 | 2 +-
 altoslib/AltosLaunchSites.java                                        | 2 +-
 altoslib/AltosLib.java                                                | 2 +-
 altoslib/AltosLine.java                                               | 2 +-
 altoslib/AltosLink.java                                               | 2 +-
 altoslib/AltosListenerState.java                                      | 2 +-
 altoslib/AltosLocation.java                                           | 2 +-
 altoslib/AltosLog.java                                                | 2 +-
 altoslib/AltosLongitude.java                                          | 2 +-
 altoslib/AltosMag.java                                                | 2 +-
 altoslib/AltosMap.java                                                | 2 +-
 altoslib/AltosMapCache.java                                           | 2 +-
 altoslib/AltosMapCacheListener.java                                   | 2 +-
 altoslib/AltosMapInterface.java                                       | 2 +-
 altoslib/AltosMapLine.java                                            | 2 +-
 altoslib/AltosMapLoader.java                                          | 2 +-
 altoslib/AltosMapLoaderListener.java                                  | 2 +-
 altoslib/AltosMapMark.java                                            | 2 +-
 altoslib/AltosMapPath.java                                            | 2 +-
 altoslib/AltosMapPathPoint.java                                       | 2 +-
 altoslib/AltosMapRectangle.java                                       | 2 +-
 altoslib/AltosMapStore.java                                           | 2 +-
 altoslib/AltosMapStoreListener.java                                   | 2 +-
 altoslib/AltosMapTile.java                                            | 2 +-
 altoslib/AltosMapTileListener.java                                    | 2 +-
 altoslib/AltosMapTransform.java                                       | 2 +-
 altoslib/AltosMapZoomListener.java                                    | 2 +-
 altoslib/AltosMma655x.java                                            | 2 +-
 altoslib/AltosMs5607.java                                             | 2 +-
 altoslib/AltosNoSymbol.java                                           | 2 +-
 altoslib/AltosOrient.java                                             | 2 +-
 altoslib/AltosParse.java                                              | 2 +-
 altoslib/AltosPointDouble.java                                        | 2 +-
 altoslib/AltosPointInt.java                                           | 2 +-
 altoslib/AltosPreferences.java                                        | 2 +-
 altoslib/AltosPreferencesBackend.java                                 | 2 +-
 altoslib/AltosProgrammer.java                                         | 2 +-
 altoslib/AltosPyro.java                                               | 2 +-
 altoslib/AltosQuaternion.java                                         | 2 +-
 altoslib/AltosRectangle.java                                          | 2 +-
 altoslib/AltosReplayReader.java                                       | 2 +-
 altoslib/AltosRomconfig.java                                          | 2 +-
 altoslib/AltosRotation.java                                           | 2 +-
 altoslib/AltosSavedState.java                                         | 2 +-
 altoslib/AltosSelfFlash.java                                          | 2 +-
 altoslib/AltosSensorEMini.java                                        | 2 +-
 altoslib/AltosSensorMM.java                                           | 2 +-
 altoslib/AltosSensorMega.java                                         | 2 +-
 altoslib/AltosSensorMetrum.java                                       | 2 +-
 altoslib/AltosSensorTGPS.java                                         | 2 +-
 altoslib/AltosSensorTM.java                                           | 2 +-
 altoslib/AltosSensorTMini.java                                        | 2 +-
 altoslib/AltosSpeed.java                                              | 2 +-
 altoslib/AltosState.java                                              | 2 +-
 altoslib/AltosStateIterable.java                                      | 2 +-
 altoslib/AltosStateUpdate.java                                        | 2 +-
 altoslib/AltosTelemetry.java                                          | 2 +-
 altoslib/AltosTelemetryConfiguration.java                             | 2 +-
 altoslib/AltosTelemetryFile.java                                      | 2 +-
 altoslib/AltosTelemetryIterable.java                                  | 2 +-
 altoslib/AltosTelemetryLegacy.java                                    | 2 +-
 altoslib/AltosTelemetryLocation.java                                  | 2 +-
 altoslib/AltosTelemetryMap.java                                       | 2 +-
 altoslib/AltosTelemetryMegaData.java                                  | 2 +-
 altoslib/AltosTelemetryMegaSensor.java                                | 2 +-
 altoslib/AltosTelemetryMetrumData.java                                | 2 +-
 altoslib/AltosTelemetryMetrumSensor.java                              | 2 +-
 altoslib/AltosTelemetryMini.java                                      | 2 +-
 altoslib/AltosTelemetryRaw.java                                       | 2 +-
 altoslib/AltosTelemetryReader.java                                    | 2 +-
 altoslib/AltosTelemetrySatellite.java                                 | 2 +-
 altoslib/AltosTelemetrySensor.java                                    | 2 +-
 altoslib/AltosTelemetryStandard.java                                  | 2 +-
 altoslib/AltosTemperature.java                                        | 2 +-
 altoslib/AltosUnits.java                                              | 2 +-
 altoslib/AltosUnitsListener.java                                      | 2 +-
 altoslib/AltosVersion.java.in                                         | 2 +-
 altoslib/AltosVoltage.java                                            | 2 +-
 altoslib/AltosWriter.java                                             | 2 +-
 altosui/Altos.java                                                    | 4 ++--
 altosui/AltosAscent.java                                              | 4 ++--
 altosui/AltosCompanionInfo.java                                       | 4 ++--
 altosui/AltosConfig.java                                              | 4 ++--
 altosui/AltosConfigPyroUI.java                                        | 4 ++--
 altosui/AltosConfigTD.java                                            | 4 ++--
 altosui/AltosConfigTDUI.java                                          | 4 ++--
 altosui/AltosConfigUI.java                                            | 4 ++--
 altosui/AltosConfigureUI.java                                         | 2 +-
 altosui/AltosDescent.java                                             | 4 ++--
 altosui/AltosFlightStatus.java                                        | 4 ++--
 altosui/AltosFlightStatusTableModel.java                              | 2 +-
 altosui/AltosFlightStatusUpdate.java                                  | 2 +-
 altosui/AltosFlightUI.java                                            | 4 ++--
 altosui/AltosGraphUI.java                                             | 4 ++--
 altosui/AltosIdleMonitorUI.java                                       | 4 ++--
 altosui/AltosIgniteUI.java                                            | 4 ++--
 altosui/AltosIgnitor.java                                             | 4 ++--
 altosui/AltosLanded.java                                              | 4 ++--
 altosui/AltosLaunch.java                                              | 2 +-
 altosui/AltosLaunchUI.java                                            | 2 +-
 altosui/AltosPad.java                                                 | 4 ++--
 altosui/AltosUI.java                                                  | 4 ++--
 altosuilib/AltosBTDevice.java                                         | 4 ++--
 altosuilib/AltosBTDeviceIterator.java                                 | 4 ++--
 altosuilib/AltosBTKnown.java                                          | 4 ++--
 altosuilib/AltosBTManage.java                                         | 4 ++--
 altosuilib/AltosCSVUI.java                                            | 4 ++--
 altosuilib/AltosConfigFreqUI.java                                     | 4 ++--
 altosuilib/AltosDataChooser.java                                      | 4 ++--
 altosuilib/AltosDevice.java                                           | 2 +-
 altosuilib/AltosDeviceDialog.java                                     | 2 +-
 altosuilib/AltosDeviceUIDialog.java                                   | 2 +-
 altosuilib/AltosDisplayThread.java                                    | 4 ++--
 altosuilib/AltosEepromDelete.java                                     | 4 ++--
 altosuilib/AltosEepromManage.java                                     | 4 ++--
 altosuilib/AltosEepromMonitor.java                                    | 2 +-
 altosuilib/AltosEepromMonitorUI.java                                  | 4 ++--
 altosuilib/AltosEepromSelect.java                                     | 4 ++--
 altosuilib/AltosFlashUI.java                                          | 4 ++--
 altosuilib/AltosFlightInfoTableModel.java                             | 2 +-
 altosuilib/AltosFlightStatsTable.java                                 | 4 ++--
 altosuilib/AltosGraph.java                                            | 4 ++--
 altosuilib/AltosGraphDataPoint.java                                   | 4 ++--
 altosuilib/AltosGraphDataSet.java                                     | 4 ++--
 altosuilib/AltosInfoTable.java                                        | 4 ++--
 altosuilib/AltosLed.java                                              | 2 +-
 altosuilib/AltosLights.java                                           | 2 +-
 altosuilib/AltosPositionListener.java                                 | 2 +-
 altosuilib/AltosRomconfigUI.java                                      | 4 ++--
 altosuilib/AltosScanUI.java                                           | 4 ++--
 altosuilib/AltosSerial.java                                           | 4 ++--
 altosuilib/AltosSerialInUseException.java                             | 2 +-
 altosuilib/AltosUIAxis.java                                           | 4 ++--
 altosuilib/AltosUIConfigure.java                                      | 4 ++--
 altosuilib/AltosUIDataMissing.java                                    | 2 +-
 altosuilib/AltosUIDataPoint.java                                      | 2 +-
 altosuilib/AltosUIDataSet.java                                        | 2 +-
 altosuilib/AltosUIDialog.java                                         | 2 +-
 altosuilib/AltosUIEnable.java                                         | 4 ++--
 altosuilib/AltosUIFlightTab.java                                      | 4 ++--
 altosuilib/AltosUIFrame.java                                          | 2 +-
 altosuilib/AltosUIFreqList.java                                       | 4 ++--
 altosuilib/AltosUIGraph.java                                          | 4 ++--
 altosuilib/AltosUIGrapher.java                                        | 4 ++--
 altosuilib/AltosUIImage.java                                          | 2 +-
 altosuilib/AltosUIIndicator.java                                      | 4 ++--
 altosuilib/AltosUILib.java                                            | 4 ++--
 altosuilib/AltosUIListener.java                                       | 2 +-
 altosuilib/AltosUIMapNew.java                                         | 4 ++--
 altosuilib/AltosUIMapPreloadNew.java                                  | 4 ++--
 altosuilib/AltosUIMarker.java                                         | 4 ++--
 altosuilib/AltosUIPreferences.java                                    | 4 ++--
 altosuilib/AltosUIPreferencesBackend.java                             | 4 ++--
 altosuilib/AltosUIRateList.java                                       | 4 ++--
 altosuilib/AltosUISeries.java                                         | 4 ++--
 altosuilib/AltosUITelemetryList.java                                  | 4 ++--
 altosuilib/AltosUIUnitsIndicator.java                                 | 4 ++--
 altosuilib/AltosUIVoltageIndicator.java                               | 4 ++--
 altosuilib/AltosUSBDevice.java                                        | 2 +-
 altosuilib/AltosVoice.java                                            | 2 +-
 altosuilib/GrabNDrag.java                                             | 2 +-
 altosuilib/OSXAdapter.java                                            | 2 +-
 configure.ac                                                          | 4 ++--
 micropeak/MicroData.java                                              | 4 ++--
 micropeak/MicroDataPoint.java                                         | 2 +-
 micropeak/MicroDeviceDialog.java                                      | 2 +-
 micropeak/MicroDownload.java                                          | 4 ++--
 micropeak/MicroExport.java                                            | 4 ++--
 micropeak/MicroFile.java                                              | 4 ++--
 micropeak/MicroFileChooser.java                                       | 4 ++--
 micropeak/MicroFrame.java                                             | 2 +-
 micropeak/MicroGraph.java                                             | 4 ++--
 micropeak/MicroPeak.java                                              | 4 ++--
 micropeak/MicroRaw.java                                               | 4 ++--
 micropeak/MicroSave.java                                              | 4 ++--
 micropeak/MicroSerial.java                                            | 2 +-
 micropeak/MicroSerialLog.java                                         | 2 +-
 micropeak/MicroStats.java                                             | 4 ++--
 micropeak/MicroStatsTable.java                                        | 4 ++--
 micropeak/MicroUSB.java                                               | 4 ++--
 telegps/TeleGPS.java                                                  | 4 ++--
 telegps/TeleGPSConfig.java                                            | 4 ++--
 telegps/TeleGPSConfigUI.java                                          | 4 ++--
 telegps/TeleGPSDisplayThread.java                                     | 4 ++--
 telegps/TeleGPSGraphUI.java                                           | 4 ++--
 telegps/TeleGPSInfo.java                                              | 4 ++--
 telegps/TeleGPSPreferences.java                                       | 2 +-
 telegps/TeleGPSState.java                                             | 4 ++--
 telegps/TeleGPSStatus.java                                            | 4 ++--
 telegps/TeleGPSStatusUpdate.java                                      | 2 +-
 262 files changed, 341 insertions(+), 341 deletions(-)

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 03ae5cb8..976e64bb 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -30,7 +30,7 @@ import android.bluetooth.BluetoothSocket;
 import android.os.Handler;
 //import android.os.Message;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosBluetooth extends AltosDroidLink {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java
index cee6e56e..db63d810 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.io.*;
 import java.lang.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.app.Activity;
 import android.graphics.*;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 71ac298e..3a07212a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -49,7 +49,7 @@ import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java
index c7230512..7cbba794 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java
@@ -24,7 +24,7 @@ import java.util.UUID;
 
 import android.os.Handler;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public abstract class AltosDroidLink extends AltosLink {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
index 7aff1341..5f6ff198 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
@@ -20,7 +20,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 import android.location.Location;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public interface AltosDroidMapInterface {
 	public void onCreateView(AltosDroid altos_droid);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index 6f74014a..a4e27006 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -17,7 +17,7 @@
 package org.altusmetrum.AltosDroid;
 
 import android.content.Context;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosDroidPreferences extends AltosPreferences {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
index dfc37153..2ff711f5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java
@@ -24,7 +24,7 @@ import android.content.SharedPreferences;
 import android.os.Environment;
 import android.util.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosDroidPreferencesBackend implements AltosPreferencesBackend {
 	public final static String        NAME    = "org.altusmetrum.AltosDroid";
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index f75035d4..9d612a1e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 import android.location.Location;
 import android.app.Activity;
 import android.graphics.Color;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 0bf6ab20..eb059901 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_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.app.Activity;
 import android.graphics.*;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
index 3b56fb54..4ac95c0b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
@@ -19,7 +19,7 @@ package org.altusmetrum.AltosDroid;
 
 import java.util.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import com.google.android.gms.maps.*;
 import com.google.android.gms.maps.model.*;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java
index e559f814..b7eb76a5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java
@@ -28,7 +28,7 @@ import android.hardware.usb.*;
 import android.app.*;
 import android.os.Handler;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosUsb extends AltosDroidLink {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index adf52dd9..325b89d2 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -22,7 +22,7 @@ import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.location.Location;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosVoice {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
index e43841a8..8846e56c 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
@@ -34,7 +34,7 @@ import android.view.View.OnClickListener;
 import android.widget.*;
 import android.widget.AdapterView.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class MapTypeActivity extends Activity {
 	private Button hybrid;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index 498b208e..d7462089 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -41,7 +41,7 @@ import android.location.LocationManager;
 import android.location.LocationListener;
 import android.location.Criteria;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 /**
  * This Activity appears as a dialog. It lists any paired devices and
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
index a02ae3a2..a503f1bc 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 81b6fe54..54ccd18f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -20,7 +20,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.app.Activity;
 import android.graphics.*;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 5ff9d12b..4d04316f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
index 523ddb61..19bb79d3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
index 28bab401..79020c16 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java
@@ -1,6 +1,6 @@
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index 4d4f0ed1..3199f252 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import android.os.Handler;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 
 public class TelemetryReader extends Thread {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index d7fa704d..4a056d95 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -43,7 +43,7 @@ import android.location.LocationManager;
 import android.location.LocationListener;
 import android.location.Criteria;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class TelemetryService extends Service implements LocationListener {
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index c40df648..f9191a32 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -18,7 +18,7 @@
 package org.altusmetrum.AltosDroid;
 
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 import android.location.Location;
 
 public class TelemetryState {
diff --git a/altoslib/AltosAccel.java b/altoslib/AltosAccel.java
index a358eda9..e4e7df90 100644
--- a/altoslib/AltosAccel.java
+++ b/altoslib/AltosAccel.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosCRCException.java b/altoslib/AltosCRCException.java
index 8100f4f6..eaff0808 100644
--- a/altoslib/AltosCRCException.java
+++ b/altoslib/AltosCRCException.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosCRCException extends Exception {
 	public int rssi;
diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index f4e50ff1..edb23e69 100644
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosCompanion.java b/altoslib/AltosCompanion.java
index f4221c4b..86b23eb6 100644
--- a/altoslib/AltosCompanion.java
+++ b/altoslib/AltosCompanion.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index a722a689..8e052934 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.*;
 import java.text.*;
diff --git a/altoslib/AltosConfigDataException.java b/altoslib/AltosConfigDataException.java
index 32f1ab51..da11336d 100644
--- a/altoslib/AltosConfigDataException.java
+++ b/altoslib/AltosConfigDataException.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosConfigDataException extends Exception {
 
diff --git a/altoslib/AltosConfigValues.java b/altoslib/AltosConfigValues.java
index d11bcde1..f8a2fb14 100644
--- a/altoslib/AltosConfigValues.java
+++ b/altoslib/AltosConfigValues.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosConfigValues {
 	/* set and get all of the dialog values */
diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 3e0f0e1a..fd2f5750 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosConvert {
 	/*
diff --git a/altoslib/AltosDebug.java b/altoslib/AltosDebug.java
index 004ab566..16dcf6f5 100644
--- a/altoslib/AltosDebug.java
+++ b/altoslib/AltosDebug.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosDistance.java b/altoslib/AltosDistance.java
index e00f9500..a05fb7e2 100644
--- a/altoslib/AltosDistance.java
+++ b/altoslib/AltosDistance.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosDistance extends AltosUnits {
 
diff --git a/altoslib/AltosEeprom.java b/altoslib/AltosEeprom.java
index 4aed6ba2..194b10e8 100644
--- a/altoslib/AltosEeprom.java
+++ b/altoslib/AltosEeprom.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromChunk.java b/altoslib/AltosEepromChunk.java
index 75dd2998..9174c6a9 100644
--- a/altoslib/AltosEepromChunk.java
+++ b/altoslib/AltosEepromChunk.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 import java.util.concurrent.*;
diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java
index 868571e4..baaeb993 100644
--- a/altoslib/AltosEepromDownload.java
+++ b/altoslib/AltosEepromDownload.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index ac537856..33d4f63b 100644
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromGPS.java b/altoslib/AltosEepromGPS.java
index 564cd70c..aeb61661 100644
--- a/altoslib/AltosEepromGPS.java
+++ b/altoslib/AltosEepromGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromHeader.java b/altoslib/AltosEepromHeader.java
index 5483ebb7..95ecc32c 100644
--- a/altoslib/AltosEepromHeader.java
+++ b/altoslib/AltosEepromHeader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index 515efda7..c3cd5d86 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromList.java b/altoslib/AltosEepromList.java
index 086483e3..6dc6a3d6 100644
--- a/altoslib/AltosEepromList.java
+++ b/altoslib/AltosEepromList.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromLog.java b/altoslib/AltosEepromLog.java
index fe1c25dc..538c102b 100644
--- a/altoslib/AltosEepromLog.java
+++ b/altoslib/AltosEepromLog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 import java.util.concurrent.*;
diff --git a/altoslib/AltosEepromMega.java b/altoslib/AltosEepromMega.java
index 49ea3b5d..d5f0e0e0 100644
--- a/altoslib/AltosEepromMega.java
+++ b/altoslib/AltosEepromMega.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromMetrum2.java b/altoslib/AltosEepromMetrum2.java
index 4dacb7cb..1b4cb04a 100644
--- a/altoslib/AltosEepromMetrum2.java
+++ b/altoslib/AltosEepromMetrum2.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index c9b41004..8d0343b8 100644
--- a/altoslib/AltosEepromMini.java
+++ b/altoslib/AltosEepromMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromMonitor.java b/altoslib/AltosEepromMonitor.java
index c1a7fdf8..1c1d1010 100644
--- a/altoslib/AltosEepromMonitor.java
+++ b/altoslib/AltosEepromMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosEepromMonitor {
 
diff --git a/altoslib/AltosEepromTM.java b/altoslib/AltosEepromTM.java
index 39bbb336..44b98e49 100644
--- a/altoslib/AltosEepromTM.java
+++ b/altoslib/AltosEepromTM.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosEepromTm.java b/altoslib/AltosEepromTm.java
index 2f857667..0a37a2aa 100644
--- a/altoslib/AltosEepromTm.java
+++ b/altoslib/AltosEepromTm.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosFile.java b/altoslib/AltosFile.java
index 80468079..cab38d6d 100644
--- a/altoslib/AltosFile.java
+++ b/altoslib/AltosFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.File;
 import java.util.*;
diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java
index 95ea73b5..e4b980b0 100644
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosFlashListener.java b/altoslib/AltosFlashListener.java
index 03404a4e..6a7351f3 100644
--- a/altoslib/AltosFlashListener.java
+++ b/altoslib/AltosFlashListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosFlashListener {
 	public void position(String label, int percent);
diff --git a/altoslib/AltosFlightDisplay.java b/altoslib/AltosFlightDisplay.java
index e87865bd..33d71fc3 100644
--- a/altoslib/AltosFlightDisplay.java
+++ b/altoslib/AltosFlightDisplay.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosFlightDisplay extends AltosUnitsListener, AltosFontListener {
 	void reset();
diff --git a/altoslib/AltosFlightReader.java b/altoslib/AltosFlightReader.java
index 9c4b7351..fca0f20b 100644
--- a/altoslib/AltosFlightReader.java
+++ b/altoslib/AltosFlightReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 import java.io.*;
diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 8bdd43cf..b837ba84 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosFontListener.java b/altoslib/AltosFontListener.java
index 0d8effa3..78049350 100644
--- a/altoslib/AltosFontListener.java
+++ b/altoslib/AltosFontListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosFontListener {
 	void font_size_changed(int font_size);
diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 6d42fd69..6d2bb8d0 100644
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosFrequency {
 	public double	frequency;
diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 6793adf1..a2584e77 100644
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 import java.util.concurrent.*;
diff --git a/altoslib/AltosGPSSat.java b/altoslib/AltosGPSSat.java
index 3cbdcd9b..44782003 100644
--- a/altoslib/AltosGPSSat.java
+++ b/altoslib/AltosGPSSat.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosGPSSat {
 	public int	svid;
diff --git a/altoslib/AltosGreatCircle.java b/altoslib/AltosGreatCircle.java
index 4f934517..e13eca48 100644
--- a/altoslib/AltosGreatCircle.java
+++ b/altoslib/AltosGreatCircle.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.lang.Math;
 import java.io.*;
diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index b7b3529b..bc20ef24 100644
--- a/altoslib/AltosHeight.java
+++ b/altoslib/AltosHeight.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosHeight extends AltosUnits {
 
diff --git a/altoslib/AltosHexfile.java b/altoslib/AltosHexfile.java
index 6a66a869..ece822d8 100644
--- a/altoslib/AltosHexfile.java
+++ b/altoslib/AltosHexfile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.LinkedList;
diff --git a/altoslib/AltosHexsym.java b/altoslib/AltosHexsym.java
index fba50527..e1561c7d 100644
--- a/altoslib/AltosHexsym.java
+++ b/altoslib/AltosHexsym.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosHexsym {
 	String	name;
diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index fe264d3c..7a4a705d 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.*;
 import java.io.*;
diff --git a/altoslib/AltosIdle.java b/altoslib/AltosIdle.java
index 89f8ed64..0e2576cd 100644
--- a/altoslib/AltosIdle.java
+++ b/altoslib/AltosIdle.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 9ff5a53e..6c0d130b 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index 74536204..1b62f385 100644
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.concurrent.*;
diff --git a/altoslib/AltosIdleMonitorListener.java b/altoslib/AltosIdleMonitorListener.java
index 86135a2e..1d06c4d9 100644
--- a/altoslib/AltosIdleMonitorListener.java
+++ b/altoslib/AltosIdleMonitorListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosIdleMonitorListener {
 	public void update(AltosState state, AltosListenerState listener_state);
diff --git a/altoslib/AltosIgnite.java b/altoslib/AltosIgnite.java
index 8701aec9..39f792db 100644
--- a/altoslib/AltosIgnite.java
+++ b/altoslib/AltosIgnite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.*;
 import java.io.*;
diff --git a/altoslib/AltosImage.java b/altoslib/AltosImage.java
index 6360ecea..fc0192a3 100644
--- a/altoslib/AltosImage.java
+++ b/altoslib/AltosImage.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosKML.java b/altoslib/AltosKML.java
index 0c9f46c9..81433958 100644
--- a/altoslib/AltosKML.java
+++ b/altoslib/AltosKML.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosLatLon.java b/altoslib/AltosLatLon.java
index 1bcf6fd8..e438a787 100644
--- a/altoslib/AltosLatLon.java
+++ b/altoslib/AltosLatLon.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosLatLon {
 	public double	lat;
diff --git a/altoslib/AltosLatitude.java b/altoslib/AltosLatitude.java
index f4580cde..7091ce9c 100644
--- a/altoslib/AltosLatitude.java
+++ b/altoslib/AltosLatitude.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosLatitude extends AltosLocation {
 	public String pos() { return "N"; }
diff --git a/altoslib/AltosLaunchSite.java b/altoslib/AltosLaunchSite.java
index 70a4bb58..0fa9bbd4 100644
--- a/altoslib/AltosLaunchSite.java
+++ b/altoslib/AltosLaunchSite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.*;
diff --git a/altoslib/AltosLaunchSiteListener.java b/altoslib/AltosLaunchSiteListener.java
index 21015909..f4658660 100644
--- a/altoslib/AltosLaunchSiteListener.java
+++ b/altoslib/AltosLaunchSiteListener.java
@@ -14,7 +14,7 @@
  * 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_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.*;
diff --git a/altoslib/AltosLaunchSites.java b/altoslib/AltosLaunchSites.java
index 0922bcea..fa4026ba 100644
--- a/altoslib/AltosLaunchSites.java
+++ b/altoslib/AltosLaunchSites.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.*;
diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index a4afd269..e82b1c73 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.*;
 import java.io.*;
diff --git a/altoslib/AltosLine.java b/altoslib/AltosLine.java
index 33737e95..b18aa965 100644
--- a/altoslib/AltosLine.java
+++ b/altoslib/AltosLine.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosLine {
 	public String	line;
diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index e33f7c77..f8bf4702 100644
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.concurrent.*;
diff --git a/altoslib/AltosListenerState.java b/altoslib/AltosListenerState.java
index ac31e198..9d7922d5 100644
--- a/altoslib/AltosListenerState.java
+++ b/altoslib/AltosListenerState.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosLocation.java b/altoslib/AltosLocation.java
index 5fc4a368..231cd94b 100644
--- a/altoslib/AltosLocation.java
+++ b/altoslib/AltosLocation.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public abstract class AltosLocation extends AltosUnits {
 
diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 704dfc68..b89bac38 100644
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.text.*;
diff --git a/altoslib/AltosLongitude.java b/altoslib/AltosLongitude.java
index 65e1402c..e3e53282 100644
--- a/altoslib/AltosLongitude.java
+++ b/altoslib/AltosLongitude.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosLongitude extends AltosLocation {
 	public String pos() { return "E"; }
diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index e03108d6..351125bf 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.*;
 import java.io.*;
diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 2c93adb8..8a3266c9 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.*;
diff --git a/altoslib/AltosMapCache.java b/altoslib/AltosMapCache.java
index 929fbb01..f0ad433c 100644
--- a/altoslib/AltosMapCache.java
+++ b/altoslib/AltosMapCache.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.net.*;
diff --git a/altoslib/AltosMapCacheListener.java b/altoslib/AltosMapCacheListener.java
index 26618c0f..dec181bc 100644
--- a/altoslib/AltosMapCacheListener.java
+++ b/altoslib/AltosMapCacheListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosMapCacheListener {
 	public void map_cache_changed(int map_cache);
diff --git a/altoslib/AltosMapInterface.java b/altoslib/AltosMapInterface.java
index 7e8dd236..45398ecd 100644
--- a/altoslib/AltosMapInterface.java
+++ b/altoslib/AltosMapInterface.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.net.*;
diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java
index 23a6f889..09ecb0c9 100644
--- a/altoslib/AltosMapLine.java
+++ b/altoslib/AltosMapLine.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.Math;
diff --git a/altoslib/AltosMapLoader.java b/altoslib/AltosMapLoader.java
index 2cd5dbd3..8573489a 100644
--- a/altoslib/AltosMapLoader.java
+++ b/altoslib/AltosMapLoader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosMapLoaderListener.java b/altoslib/AltosMapLoaderListener.java
index 11f59b28..0b41d9f4 100644
--- a/altoslib/AltosMapLoaderListener.java
+++ b/altoslib/AltosMapLoaderListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosMapLoaderListener {
 	public abstract void loader_start(int max);
diff --git a/altoslib/AltosMapMark.java b/altoslib/AltosMapMark.java
index 74e6790f..cc28f438 100644
--- a/altoslib/AltosMapMark.java
+++ b/altoslib/AltosMapMark.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.Math;
diff --git a/altoslib/AltosMapPath.java b/altoslib/AltosMapPath.java
index a238ba1a..6967f479 100644
--- a/altoslib/AltosMapPath.java
+++ b/altoslib/AltosMapPath.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.Math;
diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java
index 0d54744a..0af98997 100644
--- a/altoslib/AltosMapPathPoint.java
+++ b/altoslib/AltosMapPathPoint.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.Math;
diff --git a/altoslib/AltosMapRectangle.java b/altoslib/AltosMapRectangle.java
index 941bad9e..9fdab1a0 100644
--- a/altoslib/AltosMapRectangle.java
+++ b/altoslib/AltosMapRectangle.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosMapRectangle {
 	AltosLatLon	ul, lr;
diff --git a/altoslib/AltosMapStore.java b/altoslib/AltosMapStore.java
index a10a1665..b24fabc8 100644
--- a/altoslib/AltosMapStore.java
+++ b/altoslib/AltosMapStore.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.net.*;
diff --git a/altoslib/AltosMapStoreListener.java b/altoslib/AltosMapStoreListener.java
index b744b88c..cef4f926 100644
--- a/altoslib/AltosMapStoreListener.java
+++ b/altoslib/AltosMapStoreListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosMapStoreListener {
 	abstract void notify_store(AltosMapStore store, int status);
diff --git a/altoslib/AltosMapTile.java b/altoslib/AltosMapTile.java
index ee9206ee..a6ba5da5 100644
--- a/altoslib/AltosMapTile.java
+++ b/altoslib/AltosMapTile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosMapTileListener.java b/altoslib/AltosMapTileListener.java
index ed47e833..c02483bb 100644
--- a/altoslib/AltosMapTileListener.java
+++ b/altoslib/AltosMapTileListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosMapTileListener {
 	abstract public void notify_tile(AltosMapTile tile, int status);
diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index 7615c83b..b8f29107 100644
--- a/altoslib/AltosMapTransform.java
+++ b/altoslib/AltosMapTransform.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.Math;
diff --git a/altoslib/AltosMapZoomListener.java b/altoslib/AltosMapZoomListener.java
index d50774b4..aa067303 100644
--- a/altoslib/AltosMapZoomListener.java
+++ b/altoslib/AltosMapZoomListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosMapZoomListener {
 	abstract public void zoom_changed(int zoom);
diff --git a/altoslib/AltosMma655x.java b/altoslib/AltosMma655x.java
index a24e76bd..8b1ac088 100644
--- a/altoslib/AltosMma655x.java
+++ b/altoslib/AltosMma655x.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.*;
 
diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 8e6f2658..e7ca1ba3 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.*;
 import java.io.*;
diff --git a/altoslib/AltosNoSymbol.java b/altoslib/AltosNoSymbol.java
index 2e1da598..6ef2a142 100644
--- a/altoslib/AltosNoSymbol.java
+++ b/altoslib/AltosNoSymbol.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosNoSymbol extends Exception {
 	public AltosNoSymbol(String name) {
diff --git a/altoslib/AltosOrient.java b/altoslib/AltosOrient.java
index d9350554..1c2e2aab 100644
--- a/altoslib/AltosOrient.java
+++ b/altoslib/AltosOrient.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosOrient extends AltosUnits {
 
diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index de79c2fb..8f624b96 100644
--- a/altoslib/AltosParse.java
+++ b/altoslib/AltosParse.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.*;
 import java.text.*;
diff --git a/altoslib/AltosPointDouble.java b/altoslib/AltosPointDouble.java
index 45e7785e..ecfcbea7 100644
--- a/altoslib/AltosPointDouble.java
+++ b/altoslib/AltosPointDouble.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosPointDouble {
 	public double	x, y;
diff --git a/altoslib/AltosPointInt.java b/altoslib/AltosPointInt.java
index a7dd00f7..e690aa43 100644
--- a/altoslib/AltosPointInt.java
+++ b/altoslib/AltosPointInt.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosPointInt {
 	public int	x, y;
diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index cdff93f6..a1e76834 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosPreferencesBackend.java b/altoslib/AltosPreferencesBackend.java
index b68eea19..3154a519 100644
--- a/altoslib/AltosPreferencesBackend.java
+++ b/altoslib/AltosPreferencesBackend.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.File;
 
diff --git a/altoslib/AltosProgrammer.java b/altoslib/AltosProgrammer.java
index 6c53e1db..74ab42b5 100644
--- a/altoslib/AltosProgrammer.java
+++ b/altoslib/AltosProgrammer.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java
index c5b3e0eb..9b7e79f3 100644
--- a/altoslib/AltosPyro.java
+++ b/altoslib/AltosPyro.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.*;
 import java.text.*;
diff --git a/altoslib/AltosQuaternion.java b/altoslib/AltosQuaternion.java
index af7667d0..f78b5065 100644
--- a/altoslib/AltosQuaternion.java
+++ b/altoslib/AltosQuaternion.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosQuaternion {
 	double	r;		/* real bit */
diff --git a/altoslib/AltosRectangle.java b/altoslib/AltosRectangle.java
index cfa2ea60..1b1cc9f4 100644
--- a/altoslib/AltosRectangle.java
+++ b/altoslib/AltosRectangle.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosRectangle {
 	public int	x, y, width, height;
diff --git a/altoslib/AltosReplayReader.java b/altoslib/AltosReplayReader.java
index 90072754..9419ec93 100644
--- a/altoslib/AltosReplayReader.java
+++ b/altoslib/AltosReplayReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosRomconfig.java b/altoslib/AltosRomconfig.java
index d0912f4b..28134aeb 100644
--- a/altoslib/AltosRomconfig.java
+++ b/altoslib/AltosRomconfig.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index 4e4127cf..9771c166 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosRotation {
 	private AltosQuaternion		rotation;
diff --git a/altoslib/AltosSavedState.java b/altoslib/AltosSavedState.java
index f557801a..e2ca9f73 100644
--- a/altoslib/AltosSavedState.java
+++ b/altoslib/AltosSavedState.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java
index 1be45998..e2988b56 100644
--- a/altoslib/AltosSelfFlash.java
+++ b/altoslib/AltosSelfFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java
index cdcd9f20..e8b7b044 100644
--- a/altoslib/AltosSensorEMini.java
+++ b/altoslib/AltosSensorEMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSensorMM.java b/altoslib/AltosSensorMM.java
index 95edea22..9be29ae0 100644
--- a/altoslib/AltosSensorMM.java
+++ b/altoslib/AltosSensorMM.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSensorMega.java b/altoslib/AltosSensorMega.java
index 939bae16..1f71302e 100644
--- a/altoslib/AltosSensorMega.java
+++ b/altoslib/AltosSensorMega.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSensorMetrum.java b/altoslib/AltosSensorMetrum.java
index 6feb26c0..c00e00d5 100644
--- a/altoslib/AltosSensorMetrum.java
+++ b/altoslib/AltosSensorMetrum.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSensorTGPS.java b/altoslib/AltosSensorTGPS.java
index e9265bce..64cce640 100644
--- a/altoslib/AltosSensorTGPS.java
+++ b/altoslib/AltosSensorTGPS.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java
index 1c439817..4957b94d 100644
--- a/altoslib/AltosSensorTM.java
+++ b/altoslib/AltosSensorTM.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java
index ee51a8f6..9b2db2ff 100644
--- a/altoslib/AltosSensorTMini.java
+++ b/altoslib/AltosSensorTMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index 093d196d..b9fca82b 100644
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosSpeed extends AltosUnits {
 
diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 347c1198..4edae54a 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
diff --git a/altoslib/AltosStateIterable.java b/altoslib/AltosStateIterable.java
index 6202f970..5533468b 100644
--- a/altoslib/AltosStateIterable.java
+++ b/altoslib/AltosStateIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosStateUpdate.java b/altoslib/AltosStateUpdate.java
index 55007eb1..ed2e1826 100644
--- a/altoslib/AltosStateUpdate.java
+++ b/altoslib/AltosStateUpdate.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosStateUpdate {
 	public void	update_state(AltosState state) throws InterruptedException;
diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 3825ab8f..4c973cd9 100644
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 
diff --git a/altoslib/AltosTelemetryConfiguration.java b/altoslib/AltosTelemetryConfiguration.java
index 1cce0f24..c4cd36b2 100644
--- a/altoslib/AltosTelemetryConfiguration.java
+++ b/altoslib/AltosTelemetryConfiguration.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 
 public class AltosTelemetryConfiguration extends AltosTelemetryStandard {
diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index d28795c4..d2275f54 100644
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java
index ced29121..e18f7eda 100644
--- a/altoslib/AltosTelemetryIterable.java
+++ b/altoslib/AltosTelemetryIterable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.util.*;
diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java
index 5aad8e62..f8e72c86 100644
--- a/altoslib/AltosTelemetryLegacy.java
+++ b/altoslib/AltosTelemetryLegacy.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 
diff --git a/altoslib/AltosTelemetryLocation.java b/altoslib/AltosTelemetryLocation.java
index 2cd75621..9341d003 100644
--- a/altoslib/AltosTelemetryLocation.java
+++ b/altoslib/AltosTelemetryLocation.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 
 public class AltosTelemetryLocation extends AltosTelemetryStandard {
diff --git a/altoslib/AltosTelemetryMap.java b/altoslib/AltosTelemetryMap.java
index 36b5b1c8..d3242254 100644
--- a/altoslib/AltosTelemetryMap.java
+++ b/altoslib/AltosTelemetryMap.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 import java.text.*;
 import java.util.HashMap;
 
diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index 30752365..2af8d931 100644
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 	int	state;
diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java
index bb3fdb37..77a76cd7 100644
--- a/altoslib/AltosTelemetryMegaSensor.java
+++ b/altoslib/AltosTelemetryMegaSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
 	int	accel;
diff --git a/altoslib/AltosTelemetryMetrumData.java b/altoslib/AltosTelemetryMetrumData.java
index 6d593467..17a3410a 100644
--- a/altoslib/AltosTelemetryMetrumData.java
+++ b/altoslib/AltosTelemetryMetrumData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 
 public class AltosTelemetryMetrumData extends AltosTelemetryStandard {
diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 6d4cbea0..71fbd544 100644
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
diff --git a/altoslib/AltosTelemetryMini.java b/altoslib/AltosTelemetryMini.java
index fa722fa5..c9fda5b8 100644
--- a/altoslib/AltosTelemetryMini.java
+++ b/altoslib/AltosTelemetryMini.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 
 public class AltosTelemetryMini extends AltosTelemetryStandard {
diff --git a/altoslib/AltosTelemetryRaw.java b/altoslib/AltosTelemetryRaw.java
index a6e5ca49..843ca4eb 100644
--- a/altoslib/AltosTelemetryRaw.java
+++ b/altoslib/AltosTelemetryRaw.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosTelemetryRaw extends AltosTelemetryStandard {
 	public AltosTelemetryRaw(int[] bytes) {
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index cd5a08c4..cbbdceff 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 import java.io.*;
diff --git a/altoslib/AltosTelemetrySatellite.java b/altoslib/AltosTelemetrySatellite.java
index e3d52b46..2f4e3354 100644
--- a/altoslib/AltosTelemetrySatellite.java
+++ b/altoslib/AltosTelemetrySatellite.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosTelemetrySatellite extends AltosTelemetryStandard {
 	int		channels;
diff --git a/altoslib/AltosTelemetrySensor.java b/altoslib/AltosTelemetrySensor.java
index 8dd2c225..27cf22f0 100644
--- a/altoslib/AltosTelemetrySensor.java
+++ b/altoslib/AltosTelemetrySensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {
diff --git a/altoslib/AltosTelemetryStandard.java b/altoslib/AltosTelemetryStandard.java
index d4aaff5b..27561826 100644
--- a/altoslib/AltosTelemetryStandard.java
+++ b/altoslib/AltosTelemetryStandard.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public abstract class AltosTelemetryStandard extends AltosTelemetry {
 	int[]	bytes;
diff --git a/altoslib/AltosTemperature.java b/altoslib/AltosTemperature.java
index d729b576..b4d465a0 100644
--- a/altoslib/AltosTemperature.java
+++ b/altoslib/AltosTemperature.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosTemperature extends AltosUnits {
 
diff --git a/altoslib/AltosUnits.java b/altoslib/AltosUnits.java
index 7ca2f03c..6b4fff0c 100644
--- a/altoslib/AltosUnits.java
+++ b/altoslib/AltosUnits.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.text.*;
 
diff --git a/altoslib/AltosUnitsListener.java b/altoslib/AltosUnitsListener.java
index c5539fc9..0e31492e 100644
--- a/altoslib/AltosUnitsListener.java
+++ b/altoslib/AltosUnitsListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosUnitsListener {
 	public void units_changed(boolean imperial_units);
diff --git a/altoslib/AltosVersion.java.in b/altoslib/AltosVersion.java.in
index ebba5a00..89ed400f 100644
--- a/altoslib/AltosVersion.java.in
+++ b/altoslib/AltosVersion.java.in
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosVersion {
 	public final static String version = "@VERSION@";
diff --git a/altoslib/AltosVoltage.java b/altoslib/AltosVoltage.java
index 0469fb14..fb6f41ee 100644
--- a/altoslib/AltosVoltage.java
+++ b/altoslib/AltosVoltage.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public class AltosVoltage extends AltosUnits {
 
diff --git a/altoslib/AltosWriter.java b/altoslib/AltosWriter.java
index 70fadd2e..1dcd3391 100644
--- a/altoslib/AltosWriter.java
+++ b/altoslib/AltosWriter.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 public interface AltosWriter {
 
diff --git a/altosui/Altos.java b/altosui/Altos.java
index a4077a38..4b3d17fe 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -20,8 +20,8 @@ package altosui;
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class Altos extends AltosUILib {
 
diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index ef7c1cdb..453246bc 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosAscent extends AltosUIFlightTab {
 	JLabel	cur, max;
diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 20004ad4..28f26a62 100644
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -19,8 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosCompanionInfo extends JTable implements AltosFlightDisplay {
 	private AltosFlightInfoTableModel model;
diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 570354a3..39ed5ca4 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -22,8 +22,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosConfig implements ActionListener {
 
diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index 694226be..50a25f00 100644
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -22,8 +22,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosConfigPyroUI
 	extends AltosUIDialog
diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 9b9cdcaa..112ebbc6 100644
--- a/altosui/AltosConfigTD.java
+++ b/altosui/AltosConfigTD.java
@@ -21,8 +21,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosConfigTD implements ActionListener {
 
diff --git a/altosui/AltosConfigTDUI.java b/altosui/AltosConfigTDUI.java
index e17af47d..857ab64d 100644
--- a/altosui/AltosConfigTDUI.java
+++ b/altosui/AltosConfigTDUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosConfigTDUI
 	extends AltosUIDialog
diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 3872ff83..76837b31 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.text.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosConfigUI
 	extends AltosUIDialog
diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 543711b2..fa815762 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -22,7 +22,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosConfigureUI
 	extends AltosUIConfigure
diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index d37f6f66..f5b92816 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosDescent extends AltosUIFlightTab {
 
diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index 42127b1c..815a6fa4 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,8 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
diff --git a/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java
index 5238e14b..b5587a84 100644
--- a/altosui/AltosFlightStatusTableModel.java
+++ b/altosui/AltosFlightStatusTableModel.java
@@ -27,7 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosFlightStatusTableModel extends AbstractTableModel {
 	private String[] columnNames = {
diff --git a/altosui/AltosFlightStatusUpdate.java b/altosui/AltosFlightStatusUpdate.java
index 44c3261a..9768c6d1 100644
--- a/altosui/AltosFlightStatusUpdate.java
+++ b/altosui/AltosFlightStatusUpdate.java
@@ -18,7 +18,7 @@
 package altosui;
 
 import java.awt.event.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosFlightStatusUpdate implements ActionListener {
 
diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 009ba4ad..db33e0d9 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 70543610..6e45a092 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 7f6abbde..d54b05c5 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -24,8 +24,8 @@ import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index 4fff5d72..14a2b606 100644
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -24,8 +24,8 @@ import java.io.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosIgniteUI
 	extends AltosUIDialog
diff --git a/altosui/AltosIgnitor.java b/altosui/AltosIgnitor.java
index deb96a5e..682afc5e 100644
--- a/altosui/AltosIgnitor.java
+++ b/altosui/AltosIgnitor.java
@@ -20,8 +20,8 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosIgnitor extends AltosUIFlightTab {
 
diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 6a4bdbd7..c2997b29 100644
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 
diff --git a/altosui/AltosLaunch.java b/altosui/AltosLaunch.java
index 67bbddc2..6dc1ca02 100644
--- a/altosui/AltosLaunch.java
+++ b/altosui/AltosLaunch.java
@@ -20,7 +20,7 @@ package altosui;
 import java.io.*;
 import java.util.concurrent.*;
 import java.awt.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosLaunch {
 	AltosDevice	device;
diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 52587e58..132001bf 100644
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 class FireButton extends JButton {
 	protected void processMouseEvent(MouseEvent e) {
diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 4f3ea137..2f87b681 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -18,8 +18,8 @@
 package altosui;
 
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosPad extends AltosUIFlightTab {
 
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 32490b65..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_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
diff --git a/altosuilib/AltosBTDevice.java b/altosuilib/AltosBTDevice.java
index d6eed64d..0d7d07c0 100644
--- a/altosuilib/AltosBTDevice.java
+++ b/altosuilib/AltosBTDevice.java
@@ -15,10 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
diff --git a/altosuilib/AltosBTDeviceIterator.java b/altosuilib/AltosBTDeviceIterator.java
index 1e46899a..ca6c436e 100644
--- a/altosuilib/AltosBTDeviceIterator.java
+++ b/altosuilib/AltosBTDeviceIterator.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.util.*;
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosBTDeviceIterator implements Iterator<AltosBTDevice> {
 	AltosBTDevice	current;
diff --git a/altosuilib/AltosBTKnown.java b/altosuilib/AltosBTKnown.java
index 27897836..0d10fafd 100644
--- a/altosuilib/AltosBTKnown.java
+++ b/altosuilib/AltosBTKnown.java
@@ -15,10 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosBTKnown implements Iterable<AltosBTDevice> {
 	LinkedList<AltosBTDevice>	devices = new LinkedList<AltosBTDevice>();
diff --git a/altosuilib/AltosBTManage.java b/altosuilib/AltosBTManage.java
index 94468a03..8a912c94 100644
--- a/altosuilib/AltosBTManage.java
+++ b/altosuilib/AltosBTManage.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +23,7 @@ import javax.swing.*;
 import javax.swing.plaf.basic.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> {
 	LinkedBlockingQueue<AltosBTDevice> found_devices;
diff --git a/altosuilib/AltosCSVUI.java b/altosuilib/AltosCSVUI.java
index 353b5127..281a9081 100644
--- a/altosuilib/AltosCSVUI.java
+++ b/altosuilib/AltosCSVUI.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosCSVUI
 	extends AltosUIDialog
diff --git a/altosuilib/AltosConfigFreqUI.java b/altosuilib/AltosConfigFreqUI.java
index de7b4bed..04d93f6e 100644
--- a/altosuilib/AltosConfigFreqUI.java
+++ b/altosuilib/AltosConfigFreqUI.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.text.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
 	Frame		frame;
diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index ea8a5648..d30aec3f 100644
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosDataChooser extends JFileChooser {
 	JFrame	frame;
diff --git a/altosuilib/AltosDevice.java b/altosuilib/AltosDevice.java
index b7cfe97e..64a99596 100644
--- a/altosuilib/AltosDevice.java
+++ b/altosuilib/AltosDevice.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import libaltosJNI.*;
 
diff --git a/altosuilib/AltosDeviceDialog.java b/altosuilib/AltosDeviceDialog.java
index 53e3ed84..a3c5d283 100644
--- a/altosuilib/AltosDeviceDialog.java
+++ b/altosuilib/AltosDeviceDialog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/altosuilib/AltosDeviceUIDialog.java b/altosuilib/AltosDeviceUIDialog.java
index d82892a5..aa6d323f 100644
--- a/altosuilib/AltosDeviceUIDialog.java
+++ b/altosuilib/AltosDeviceUIDialog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/altosuilib/AltosDisplayThread.java b/altosuilib/AltosDisplayThread.java
index d3783860..73d85698 100644
--- a/altosuilib/AltosDisplayThread.java
+++ b/altosuilib/AltosDisplayThread.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import javax.swing.*;
 import java.io.*;
 import java.text.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosDisplayThread extends Thread {
 
diff --git a/altosuilib/AltosEepromDelete.java b/altosuilib/AltosEepromDelete.java
index 57ebb4c1..7648382d 100644
--- a/altosuilib/AltosEepromDelete.java
+++ b/altosuilib/AltosEepromDelete.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosEepromDelete implements Runnable {
 	AltosEepromList		flights;
diff --git a/altosuilib/AltosEepromManage.java b/altosuilib/AltosEepromManage.java
index 522fac45..d97edd12 100644
--- a/altosuilib/AltosEepromManage.java
+++ b/altosuilib/AltosEepromManage.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosEepromManage implements ActionListener {
 
diff --git a/altosuilib/AltosEepromMonitor.java b/altosuilib/AltosEepromMonitor.java
index 52a4b640..28fa734d 100644
--- a/altosuilib/AltosEepromMonitor.java
+++ b/altosuilib/AltosEepromMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/altosuilib/AltosEepromMonitorUI.java b/altosuilib/AltosEepromMonitorUI.java
index dd01ce25..5f0df7d3 100644
--- a/altosuilib/AltosEepromMonitorUI.java
+++ b/altosuilib/AltosEepromMonitorUI.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMonitor {
 	JFrame		owner;
diff --git a/altosuilib/AltosEepromSelect.java b/altosuilib/AltosEepromSelect.java
index 2c9d10cf..56b10ef0 100644
--- a/altosuilib/AltosEepromSelect.java
+++ b/altosuilib/AltosEepromSelect.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
 import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 class AltosEepromItem implements ActionListener {
 	AltosEepromLog	log;
diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index 6b4a5238..0ab085cf 100644
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +23,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosFlashUI
 	extends AltosUIDialog
diff --git a/altosuilib/AltosFlightInfoTableModel.java b/altosuilib/AltosFlightInfoTableModel.java
index 76fe682a..e55004e4 100644
--- a/altosuilib/AltosFlightInfoTableModel.java
+++ b/altosuilib/AltosFlightInfoTableModel.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.table.*;
 
diff --git a/altosuilib/AltosFlightStatsTable.java b/altosuilib/AltosFlightStatsTable.java
index 4240bf9f..9c613365 100644
--- a/altosuilib/AltosFlightStatsTable.java
+++ b/altosuilib/AltosFlightStatsTable.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import javax.swing.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosFlightStatsTable extends JComponent implements AltosFontListener {
 	GridBagLayout	layout;
diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 34a5e1b3..be013d57 100644
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosGraphDataPoint.java b/altosuilib/AltosGraphDataPoint.java
index b849dd7c..30d436ae 100644
--- a/altosuilib/AltosGraphDataPoint.java
+++ b/altosuilib/AltosGraphDataPoint.java
@@ -15,9 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosGraphDataPoint implements AltosUIDataPoint {
 
diff --git a/altosuilib/AltosGraphDataSet.java b/altosuilib/AltosGraphDataSet.java
index f0cda986..7902f407 100644
--- a/altosuilib/AltosGraphDataSet.java
+++ b/altosuilib/AltosGraphDataSet.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.lang.*;
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 class AltosGraphIterator implements Iterator<AltosUIDataPoint> {
 	AltosGraphDataSet	dataSet;
diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java
index 68008b2f..d87c38e2 100644
--- a/altosuilib/AltosInfoTable.java
+++ b/altosuilib/AltosInfoTable.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosInfoTable extends JTable implements AltosFlightDisplay, HierarchyListener {
 	private AltosFlightInfoTableModel model;
diff --git a/altosuilib/AltosLed.java b/altosuilib/AltosLed.java
index e328b717..b47aa493 100644
--- a/altosuilib/AltosLed.java
+++ b/altosuilib/AltosLed.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
 
diff --git a/altosuilib/AltosLights.java b/altosuilib/AltosLights.java
index b2c1cbcc..8cbd1d10 100644
--- a/altosuilib/AltosLights.java
+++ b/altosuilib/AltosLights.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/altosuilib/AltosPositionListener.java b/altosuilib/AltosPositionListener.java
index 81e2cbaf..0c900787 100644
--- a/altosuilib/AltosPositionListener.java
+++ b/altosuilib/AltosPositionListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 public interface AltosPositionListener {
 	public void position_changed(int position);
diff --git a/altosuilib/AltosRomconfigUI.java b/altosuilib/AltosRomconfigUI.java
index e7977cf4..257674dc 100644
--- a/altosuilib/AltosRomconfigUI.java
+++ b/altosuilib/AltosRomconfigUI.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosRomconfigUI
 	extends AltosUIDialog
diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index fccfbaee..e2efd4b3 100644
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -25,7 +25,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 class AltosScanResult {
 	String		callsign;
diff --git a/altosuilib/AltosSerial.java b/altosuilib/AltosSerial.java
index 280887a6..ff8d900a 100644
--- a/altosuilib/AltosSerial.java
+++ b/altosuilib/AltosSerial.java
@@ -19,13 +19,13 @@
  * Deal with TeleDongle on a serial port
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.*;
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 import libaltosJNI.*;
 
 /*
diff --git a/altosuilib/AltosSerialInUseException.java b/altosuilib/AltosSerialInUseException.java
index 1ca8e792..2b198aec 100644
--- a/altosuilib/AltosSerialInUseException.java
+++ b/altosuilib/AltosSerialInUseException.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 public class AltosSerialInUseException extends Exception {
 	public AltosDevice	device;
diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index 4173232f..155e7ed6 100644
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 75957b33..146acda8 100644
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 class DelegatingRenderer implements ListCellRenderer<Object> {
 
diff --git a/altosuilib/AltosUIDataMissing.java b/altosuilib/AltosUIDataMissing.java
index b2a76165..39b8f900 100644
--- a/altosuilib/AltosUIDataMissing.java
+++ b/altosuilib/AltosUIDataMissing.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 public class AltosUIDataMissing extends Exception {
 	public int	id;
diff --git a/altosuilib/AltosUIDataPoint.java b/altosuilib/AltosUIDataPoint.java
index fcbfbe95..793fabfb 100644
--- a/altosuilib/AltosUIDataPoint.java
+++ b/altosuilib/AltosUIDataPoint.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 public interface AltosUIDataPoint {
 	public abstract double x() throws AltosUIDataMissing;
diff --git a/altosuilib/AltosUIDataSet.java b/altosuilib/AltosUIDataSet.java
index f25a6bcb..b7472000 100644
--- a/altosuilib/AltosUIDataSet.java
+++ b/altosuilib/AltosUIDataSet.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 public interface AltosUIDataSet {
 	public abstract String name();
diff --git a/altosuilib/AltosUIDialog.java b/altosuilib/AltosUIDialog.java
index a0c180c1..cfbf2cd3 100644
--- a/altosuilib/AltosUIDialog.java
+++ b/altosuilib/AltosUIDialog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java
index 0f9ed8ff..b4d8d81e 100644
--- a/altosuilib/AltosUIEnable.java
+++ b/altosuilib/AltosUIEnable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIFlightTab.java b/altosuilib/AltosUIFlightTab.java
index 270466a6..a2a3e367 100644
--- a/altosuilib/AltosUIFlightTab.java
+++ b/altosuilib/AltosUIFlightTab.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public abstract class AltosUIFlightTab extends JComponent implements AltosFlightDisplay, HierarchyListener {
 	public GridBagLayout	layout;
diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 3f74bca6..79015103 100644
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/altosuilib/AltosUIFreqList.java b/altosuilib/AltosUIFreqList.java
index 744a05dd..9479087e 100644
--- a/altosuilib/AltosUIFreqList.java
+++ b/altosuilib/AltosUIFreqList.java
@@ -15,10 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosUIFreqList extends JComboBox<AltosFrequency> {
 
diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index 3b34a988..a11978d0 100644
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIGrapher.java b/altosuilib/AltosUIGrapher.java
index 80b3acd7..0fe685ef 100644
--- a/altosuilib/AltosUIGrapher.java
+++ b/altosuilib/AltosUIGrapher.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIImage.java b/altosuilib/AltosUIImage.java
index 3a2e2c01..77743741 100644
--- a/altosuilib/AltosUIImage.java
+++ b/altosuilib/AltosUIImage.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import javax.swing.*;
 import javax.imageio.ImageIO;
diff --git a/altosuilib/AltosUIIndicator.java b/altosuilib/AltosUIIndicator.java
index 989af389..0a940d97 100644
--- a/altosuilib/AltosUIIndicator.java
+++ b/altosuilib/AltosUIIndicator.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public abstract class AltosUIIndicator implements AltosFontListener, AltosUnitsListener {
 	JLabel		label;
diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index abd9e7e1..2fc20317 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosUILib extends AltosLib {
 
diff --git a/altosuilib/AltosUIListener.java b/altosuilib/AltosUIListener.java
index 80c18c35..5b49e7da 100644
--- a/altosuilib/AltosUIListener.java
+++ b/altosuilib/AltosUIListener.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 public interface AltosUIListener {
 	public void ui_changed(String look_and_feel);
diff --git a/altosuilib/AltosUIMapNew.java b/altosuilib/AltosUIMapNew.java
index 8ac18296..016a202b 100644
--- a/altosuilib/AltosUIMapNew.java
+++ b/altosuilib/AltosUIMapNew.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -27,7 +27,7 @@ import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
 import javax.imageio.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosUIMapNew extends JComponent implements AltosFlightDisplay, AltosMapInterface {
 
diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java
index ba559534..2d4d45b2 100644
--- a/altosuilib/AltosUIMapPreloadNew.java
+++ b/altosuilib/AltosUIMapPreloadNew.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,7 +26,7 @@ import java.text.*;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 class AltosUIMapPos extends Box {
 	AltosUIFrame	owner;
diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java
index 287468bd..ec5aae78 100644
--- a/altosuilib/AltosUIMarker.java
+++ b/altosuilib/AltosUIMarker.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIPreferences.java b/altosuilib/AltosUIPreferences.java
index e9378442..5602dc17 100644
--- a/altosuilib/AltosUIPreferences.java
+++ b/altosuilib/AltosUIPreferences.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.*;
 import java.awt.Component;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosUIPreferences extends AltosPreferences {
 
diff --git a/altosuilib/AltosUIPreferencesBackend.java b/altosuilib/AltosUIPreferencesBackend.java
index 5fbfa7f9..ebdc8b77 100644
--- a/altosuilib/AltosUIPreferencesBackend.java
+++ b/altosuilib/AltosUIPreferencesBackend.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.File;
 import java.util.prefs.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
diff --git a/altosuilib/AltosUIRateList.java b/altosuilib/AltosUIRateList.java
index 12d791b1..a8898808 100644
--- a/altosuilib/AltosUIRateList.java
+++ b/altosuilib/AltosUIRateList.java
@@ -15,10 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosUIRateList extends JComboBox<String> {
 
diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index c91c1204..d4421ac7 100644
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/altosuilib/AltosUITelemetryList.java b/altosuilib/AltosUITelemetryList.java
index b4f80b0b..edbc7fd6 100644
--- a/altosuilib/AltosUITelemetryList.java
+++ b/altosuilib/AltosUITelemetryList.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.util.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 
 public class AltosUITelemetryList extends JComboBox<String> {
diff --git a/altosuilib/AltosUIUnitsIndicator.java b/altosuilib/AltosUIUnitsIndicator.java
index 8e0a9e07..b58cd1cc 100644
--- a/altosuilib/AltosUIUnitsIndicator.java
+++ b/altosuilib/AltosUIUnitsIndicator.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public abstract class AltosUIUnitsIndicator extends AltosUIIndicator {
 
diff --git a/altosuilib/AltosUIVoltageIndicator.java b/altosuilib/AltosUIVoltageIndicator.java
index 840e5ad0..12649730 100644
--- a/altosuilib/AltosUIVoltageIndicator.java
+++ b/altosuilib/AltosUIVoltageIndicator.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public abstract class AltosUIVoltageIndicator extends AltosUIUnitsIndicator {
 
diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 48daf131..74306523 100644
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.util.*;
 import libaltosJNI.*;
diff --git a/altosuilib/AltosVoice.java b/altosuilib/AltosVoice.java
index 98cc3c83..71a05a23 100644
--- a/altosuilib/AltosVoice.java
+++ b/altosuilib/AltosVoice.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import com.sun.speech.freetts.Voice;
 import com.sun.speech.freetts.VoiceManager;
diff --git a/altosuilib/GrabNDrag.java b/altosuilib/GrabNDrag.java
index cf0eacee..919289c7 100644
--- a/altosuilib/GrabNDrag.java
+++ b/altosuilib/GrabNDrag.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/altosuilib/OSXAdapter.java b/altosuilib/OSXAdapter.java
index 7397e2a0..5155b0fe 100755
--- a/altosuilib/OSXAdapter.java
+++ b/altosuilib/OSXAdapter.java
@@ -55,7 +55,7 @@ Copyright © 2003-2007 Apple, Inc., All Rights Reserved
 
 */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_8;
 
 import java.lang.reflect.*;
 import java.util.HashMap;
diff --git a/configure.ac b/configure.ac
index efa68e2a..bbf82377 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ AC_SUBST(ANDROID_VERSION)
 dnl ==========================================================================
 dnl Java library versions
 
-ALTOSUILIB_VERSION=7
-ALTOSLIB_VERSION=7
+ALTOSUILIB_VERSION=8
+ALTOSLIB_VERSION=8
 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index 1001a370..62f03c9d 100644
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 class MicroIterator implements Iterator<MicroDataPoint> {
 	int		i;
diff --git a/micropeak/MicroDataPoint.java b/micropeak/MicroDataPoint.java
index 1d42032f..1c36fefe 100644
--- a/micropeak/MicroDataPoint.java
+++ b/micropeak/MicroDataPoint.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.micropeak;
 
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroDataPoint implements AltosUIDataPoint {
 	public double		time;
diff --git a/micropeak/MicroDeviceDialog.java b/micropeak/MicroDeviceDialog.java
index 91c3306b..a6d0f321 100644
--- a/micropeak/MicroDeviceDialog.java
+++ b/micropeak/MicroDeviceDialog.java
@@ -21,7 +21,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroDeviceDialog extends AltosDeviceDialog {
 
diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index 028f4431..7314cc7f 100644
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener, MicroSerialLog, WindowListener {
 	MicroPeak	owner;
diff --git a/micropeak/MicroExport.java b/micropeak/MicroExport.java
index 7e75574d..d3cfc3b8 100644
--- a/micropeak/MicroExport.java
+++ b/micropeak/MicroExport.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroExport extends JFileChooser {
 
diff --git a/micropeak/MicroFile.java b/micropeak/MicroFile.java
index 1d2447fc..d48598cb 100644
--- a/micropeak/MicroFile.java
+++ b/micropeak/MicroFile.java
@@ -19,8 +19,8 @@ package org.altusmetrum.micropeak;
 
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroFile {
 
diff --git a/micropeak/MicroFileChooser.java b/micropeak/MicroFileChooser.java
index a48df6d1..d72d956a 100644
--- a/micropeak/MicroFileChooser.java
+++ b/micropeak/MicroFileChooser.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroFileChooser extends JFileChooser {
 	JFrame	frame;
diff --git a/micropeak/MicroFrame.java b/micropeak/MicroFrame.java
index 4cb156f2..9b0f1e7c 100644
--- a/micropeak/MicroFrame.java
+++ b/micropeak/MicroFrame.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroFrame extends AltosUIFrame {
 	static String[] micro_icon_names = {
diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index d2c6a9e3..c7a2d345 100644
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index be50ac18..2df81621 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
 
diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index ed5410e0..6aae0bde 100644
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 import java.awt.*;
 import java.io.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroRaw extends JTextArea {
 
diff --git a/micropeak/MicroSave.java b/micropeak/MicroSave.java
index 15916ba0..d8fe59c2 100644
--- a/micropeak/MicroSave.java
+++ b/micropeak/MicroSave.java
@@ -24,8 +24,8 @@ import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroSave extends JFileChooser {
 
diff --git a/micropeak/MicroSerial.java b/micropeak/MicroSerial.java
index c0ec161c..8d20718f 100644
--- a/micropeak/MicroSerial.java
+++ b/micropeak/MicroSerial.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroSerial extends InputStream {
 	SWIGTYPE_p_altos_file	file;
diff --git a/micropeak/MicroSerialLog.java b/micropeak/MicroSerialLog.java
index a8c8b2ad..c7a0525d 100644
--- a/micropeak/MicroSerialLog.java
+++ b/micropeak/MicroSerialLog.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
 import java.util.*;
 import java.io.*;
 import libaltosJNI.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public interface MicroSerialLog {
 
diff --git a/micropeak/MicroStats.java b/micropeak/MicroStats.java
index 8cb64f4d..8d83fe3e 100644
--- a/micropeak/MicroStats.java
+++ b/micropeak/MicroStats.java
@@ -18,8 +18,8 @@
 package org.altusmetrum.micropeak;
 
 import java.io.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroStats {
 	double		coast_height;
diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java
index ef6023dc..35d10eee 100644
--- a/micropeak/MicroStatsTable.java
+++ b/micropeak/MicroStatsTable.java
@@ -19,8 +19,8 @@ package org.altusmetrum.micropeak;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroStatsTable extends JComponent implements AltosFontListener {
 	GridBagLayout	layout;
diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index 906458c4..3a7891cb 100644
--- a/micropeak/MicroUSB.java
+++ b/micropeak/MicroUSB.java
@@ -19,8 +19,8 @@ package org.altusmetrum.micropeak;
 
 import java.util.*;
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class MicroUSB extends altos_device implements AltosDevice {
 
diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index 4f83e8e5..0208e81d 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -24,8 +24,8 @@ import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.text.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPS
 	extends AltosUIFrame
diff --git a/telegps/TeleGPSConfig.java b/telegps/TeleGPSConfig.java
index e44c528c..e2cf1258 100644
--- a/telegps/TeleGPSConfig.java
+++ b/telegps/TeleGPSConfig.java
@@ -22,8 +22,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSConfig implements ActionListener {
 
diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index 8c3d0c2e..8d4916aa 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -22,8 +22,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSConfigUI
 	extends AltosUIDialog
diff --git a/telegps/TeleGPSDisplayThread.java b/telegps/TeleGPSDisplayThread.java
index d0d97876..fa394b17 100644
--- a/telegps/TeleGPSDisplayThread.java
+++ b/telegps/TeleGPSDisplayThread.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import javax.swing.*;
 import java.io.*;
 import java.text.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSDisplayThread extends Thread {
 
diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
index f9ca9408..8fe479cc 100644
--- a/telegps/TeleGPSGraphUI.java
+++ b/telegps/TeleGPSGraphUI.java
@@ -26,8 +26,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
diff --git a/telegps/TeleGPSInfo.java b/telegps/TeleGPSInfo.java
index a5efb059..6baccce9 100644
--- a/telegps/TeleGPSInfo.java
+++ b/telegps/TeleGPSInfo.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSInfo extends AltosUIFlightTab {
 
diff --git a/telegps/TeleGPSPreferences.java b/telegps/TeleGPSPreferences.java
index b62ea5a8..d0b843e1 100644
--- a/telegps/TeleGPSPreferences.java
+++ b/telegps/TeleGPSPreferences.java
@@ -22,7 +22,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSPreferences
 	extends AltosUIConfigure
diff --git a/telegps/TeleGPSState.java b/telegps/TeleGPSState.java
index 7c410e98..dac7da52 100644
--- a/telegps/TeleGPSState.java
+++ b/telegps/TeleGPSState.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSState extends AltosUIFlightTab {
 
diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index cc9966b8..896df9d4 100644
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.java
@@ -19,8 +19,8 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
diff --git a/telegps/TeleGPSStatusUpdate.java b/telegps/TeleGPSStatusUpdate.java
index 1d545927..eef0a034 100644
--- a/telegps/TeleGPSStatusUpdate.java
+++ b/telegps/TeleGPSStatusUpdate.java
@@ -18,7 +18,7 @@
 package org.altusmetrum.telegps;
 
 import java.awt.event.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class TeleGPSStatusUpdate implements ActionListener {
 
-- 
cgit v1.2.3