X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIMapPreload.java;h=06c4c59bcf406590f3edf18b5d59d0a230144565;hp=42fdd301b9d780853b339e5268105a6554de4f6c;hb=c296acd643698d0128e2f58f91a9cfeea63f580a;hpb=0d966b74f756e88e5dffa92400b105f540429262

diff --git a/altosuilib/AltosUIMapPreload.java b/altosuilib/AltosUIMapPreload.java
index 42fdd301..06c4c59b 100644
--- a/altosuilib/AltosUIMapPreload.java
+++ b/altosuilib/AltosUIMapPreload.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
@@ -28,7 +29,8 @@ import java.net.URL;
 import java.net.URLConnection;
 import org.altusmetrum.altoslib_11.*;
 
-class AltosUIMapPos extends Box {
+class AltosUIMapPos extends Box implements ActionListener {
+	AltosUIMapPreload	preload;
 	AltosUIFrame	owner;
 	JLabel		label;
 	JComboBox	hemi;
@@ -37,6 +39,11 @@ class AltosUIMapPos extends Box {
 	JTextField	min;
 	JLabel		min_label;
 
+	/* ActionListener interface */
+	public void actionPerformed(ActionEvent e) {
+		preload.center_map();
+	}
+
 	public void set_value(double new_value) {
 		double	d, m;
 		int	h;
@@ -88,19 +95,23 @@ class AltosUIMapPos extends Box {
 	}
 
 	public AltosUIMapPos(AltosUIFrame in_owner,
-			   String label_value,
-			   String[] hemi_names,
-			   double default_value) {
+			     AltosUIMapPreload preload,
+			     String label_value,
+			     String[] hemi_names,
+			     double default_value) {
 		super(BoxLayout.X_AXIS);
 		owner = in_owner;
+		this.preload = preload;
 		label = new JLabel(label_value);
 		hemi = new JComboBox<String>(hemi_names);
 		hemi.setEditable(false);
 		deg = new JTextField(5);
+		deg.addActionListener(this);
 		deg.setMinimumSize(deg.getPreferredSize());
 		deg.setHorizontalAlignment(JTextField.RIGHT);
 		deg_label = new JLabel("°");
 		min = new JTextField(9);
+		min.addActionListener(this);
 		min.setMinimumSize(min.getPreferredSize());
 		min_label = new JLabel("'");
 		set_value(default_value);
@@ -166,8 +177,6 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 					pbar.setMaximum(max);
 					pbar.setValue(0);
 					pbar.setString("");
-					map.clear_marks();
-					map.add_mark(latitude, longitude, AltosLib.ao_flight_boost);
 				}
 			});
 	}
@@ -213,6 +222,19 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 		return all_types;
 	}
 
+	void center_map(double latitude, double longitude) {
+		map.map.centre(new AltosLatLon(latitude, longitude));
+		map.clear_marks();
+		map.add_mark(latitude, longitude, AltosLib.ao_flight_boost);
+	}
+
+	void center_map() {
+		try {
+			center_map(lat.get_value(), lon.get_value());
+		} catch (ParseException pe) {
+		}
+	}
+
 	public void itemStateChanged(ItemEvent e) {
 		int		state = e.getStateChange();
 
@@ -222,6 +244,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 				AltosLaunchSite	site = (AltosLaunchSite) o;
 				lat.set_value(site.latitude);
 				lon.set_value(site.longitude);
+				center_map(site.latitude, site.longitude);
 			}
 		}
 	}
@@ -251,7 +274,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 					else
 						r = r * 1000;
 
-					map.map.centre(new AltosLatLon(latitude, longitude));
+					center_map(latitude, longitude);
 
 					loader = new AltosMapLoader(this,
 								    latitude, longitude,
@@ -393,7 +416,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 
 		pane.add(site_list, c);
 
-		lat = new AltosUIMapPos(owner,
+		lat = new AltosUIMapPos(owner, this,
 					"Latitude:",
 					lat_hemi_names,
 					37.167833333);
@@ -410,7 +433,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 
 		pane.add(lat, c);
 
-		lon = new AltosUIMapPos(owner,
+		lon = new AltosUIMapPos(owner, this,
 					"Longitude:",
 					lon_hemi_names,
 					-97.73975);