X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMap.java;h=286cf1bb696de34e2992728af6e0328810ecf45a;hp=0c775f333ee79aacf9ffb08a4c11c243fd9910e5;hb=b3474fb33a58e78b3b8f36958dd44768e49f3edc;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 0c775f33..286cf1bb 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.lang.*;
@@ -219,11 +220,11 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		return false;
 	}
 
-	public void show(AltosState state, AltosListenerState listener_state) {
+	public void show(AltosGPS gps, int state) {
 
-		/* If insufficient gps data, nothing to update
+		/*
+		 * If insufficient gps data, nothing to update
 		 */
-		AltosGPS	gps = state.gps;
 
 		if (gps == null)
 			return;
@@ -231,23 +232,23 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		if (!gps.locked && gps.nsat < 4)
 			return;
 
-		switch (state.state()) {
+		switch (state) {
 		case AltosLib.ao_flight_boost:
 			if (!have_boost) {
-				add_mark(gps.lat, gps.lon, state.state());
+				add_mark(gps.lat, gps.lon, state);
 				have_boost = true;
 			}
 			break;
 		case AltosLib.ao_flight_landed:
 			if (!have_landed) {
-				add_mark(gps.lat, gps.lon, state.state());
+				add_mark(gps.lat, gps.lon, state);
 				have_landed = true;
 			}
 			break;
 		}
 
 		if (path != null) {
-			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state.state());
+			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state);
 
 			if (damage != null)
 				repaint(damage, AltosMapPath.stroke_width);
@@ -258,6 +259,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		maybe_centre(gps.lat, gps.lon);
 	}
 
+	public void show(AltosState state, AltosListenerState listener_state) {
+		show(state.gps, state.state());
+	}
+
 	public void centre(AltosLatLon lat_lon) {
 		centre = lat_lon;
 		set_transform();
@@ -267,10 +272,14 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		centre(new AltosLatLon(lat, lon));
 	}
 
-	public void centre(AltosState state) {
-		if (!state.gps.locked && state.gps.nsat < 4)
+	public void centre(AltosGPS gps) {
+		if (!gps.locked && gps.nsat < 4)
 			return;
-		centre(state.gps.lat, state.gps.lon);
+		centre(gps.lat, gps.lon);
+	}
+
+	public void centre(AltosState state) {
+		centre(state.gps);
 	}
 
 	public void maybe_centre(double lat, double lon) {