X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMap.java;h=2e1e8f160bf8f5a2899c1993c1a534a9bdb224d6;hb=cc83d57454ed07e4828b4413e5af6ae2ecfe2e5a;hp=364540542c7488c6db120fb13a9570997e2dae2c;hpb=0d966b74f756e88e5dffa92400b105f540429262;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 36454054..2e1e8f16 100644
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.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.altosuilib_11;
+package org.altusmetrum.altosuilib_12;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -27,7 +28,7 @@ import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
 import javax.imageio.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_12.*;
 
 public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
 
@@ -361,7 +362,8 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 	}
 
 	public void debug(String format, Object ... arguments) {
-		System.out.printf(format, arguments);
+		if (AltosUIPreferences.serial_debug())
+			System.out.printf(format, arguments);
 	}
 
 
@@ -411,6 +413,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		map.show(state, listener_state);
 	}
 
+	public void show(AltosGPS gps, int state) {
+		map.show(gps, state);
+	}
+
 	public String getName() {
 		return "Map";
 	}
@@ -420,6 +426,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		map.centre(state);
 	}
 
+	public void centre(AltosGPS gps) {
+		map.centre(gps);
+	}
+
 	/* internal layout bits */
 	private GridBagLayout layout = new GridBagLayout();