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

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 36454054..7b9459a1 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_13;
 
 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_13.*;
 
 public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
 
@@ -105,7 +106,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		}
 
 		private boolean is_drag_event(MouseEvent e) {
-			return e.getModifiers() == InputEvent.BUTTON1_MASK;
+			return e.getModifiersEx() == InputEvent.BUTTON1_DOWN_MASK;
 		}
 
 		/* MouseMotionListener methods */
@@ -277,10 +278,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 						message = "Internal error";
 						break;
 					case AltosMapTile.failed:
-						message = "Network error, check connection";
+						message = "Network error";
 						break;
 					case AltosMapTile.forbidden:
-						message = "Too many requests, try later";
+						message = "Outside of launch area";
 						break;
 					}
 					if (message != null && tile_font != null) {
@@ -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);
 	}
 
 
@@ -384,8 +386,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 	JLabel	zoom_label;
 
 	public void set_maptype(int type) {
+/*
 		map.set_maptype(type);
 		maptype_combo.setSelectedIndex(type);
+*/
 	}
 
 	/* AltosUIMapPreload functions */
@@ -411,6 +415,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,10 +428,16 @@ 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();
 
+/*
 	JComboBox<String>	maptype_combo;
+*/
 
 	MapView	view;
 
@@ -512,6 +526,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		c.weighty = 0;
 		add(zoom_out, c);
 
+/*
 		maptype_combo = new JComboBox<String>(map.maptype_labels);
 
 		maptype_combo.setEditable(false);
@@ -530,7 +545,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		c.weightx = 0;
 		c.weighty = 0;
 		add(maptype_combo, c);
-
+*/
 		map = new AltosMap(this);
 	}
 }