Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 15 insertions, 8 deletions

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index 23085f3e..9491ce2b 100644
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -23,7 +23,7 @@ import java.io.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
@@ -271,27 +271,34 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
 	int last_state = -1;
 
 	public void show(double lat, double lon) {
-		initMaps(lat, lon);
-		scrollRocketToVisible(pt(lat, lon));
+		System.out.printf ("show %g %g\n", lat, lon);
+		return;
+//		initMaps(lat, lon);
+//		scrollRocketToVisible(pt(lat, lon));
 	}
 	public void show(final AltosState state, final AltosListenerState listener_state) {
 		// if insufficient gps data, nothing to update
-		if (!state.gps.locked && state.gps.nsat < 4)
+		AltosGPS	gps = state.gps;
+
+		if (gps == null)
+			return;
+
+		if (!gps.locked && gps.nsat < 4)
 			return;
 
 		if (!initialised) {
-			if (state.pad_lat != 0 || state.pad_lon != 0) {
+			if (state.pad_lat != AltosLib.MISSING && state.pad_lon != AltosLib.MISSING) {
 				initMaps(state.pad_lat, state.pad_lon);
 				initialised = true;
-			} else if (state.gps.lat != 0 || state.gps.lon != 0) {
-				initMaps(state.gps.lat, state.gps.lon);
+			} else if (gps.lat != AltosLib.MISSING && gps.lon != AltosLib.MISSING) {
+				initMaps(gps.lat, gps.lon);
 				initialised = true;
 			} else {
 				return;
 			}
 		}
 
-		final Point2D.Double pt = pt(state.gps.lat, state.gps.lon);
+		final Point2D.Double pt = pt(gps.lat, gps.lon);
 		if (last_pt == pt && last_state == state.state)
 			return;