X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIMapPreload.java;h=6d0d8b70576e881cae6ec9473eccad5627acd424;hp=31c8ed1b8abc9911df9ef2d77a3807b616039916;hb=HEAD;hpb=ec46adee44ea08120b1940ca55a5fbdf56874bb1

diff --git a/altosuilib/AltosUIMapPreload.java b/altosuilib/AltosUIMapPreload.java
index 31c8ed1b..6d0d8b70 100644
--- a/altosuilib/AltosUIMapPreload.java
+++ b/altosuilib/AltosUIMapPreload.java
@@ -139,6 +139,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 	JProgressBar	pbar;
 
 	JLabel		site_list_label;
+	java.util.List<AltosLaunchSite> sites;
 	JComboBox<AltosLaunchSite>	site_list;
 
 	JToggleButton	load_button;
@@ -227,10 +228,29 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 		return 1 << AltosMap.maptype_hybrid;
 	}
 
+	void add_mark(double lat, double lon, int state, String label) {
+		map.add_mark(lat, lon, state, label);
+	}
+
+	void reset_marks() {
+		map.clear_marks();
+		AltosLatLon centre = null;
+		String centre_name = null;
+		if (map != null && map.map != null)
+			centre = map.map.centre;
+		for (AltosLaunchSite site : sites) {
+			if (centre != null && centre.lat == site.latitude && centre.lon == site.longitude)
+				centre_name = site.name;
+			else
+				add_mark(site.latitude, site.longitude, AltosLib.ao_flight_main, site.name);
+		}
+		if (centre != null)
+			add_mark(centre.lat, centre.lon, AltosLib.ao_flight_boost, centre_name);
+	}
+
 	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);
+		reset_marks();
 	}
 
 	void center_map() {
@@ -294,6 +314,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 	}
 
 	public void notify_launch_sites(final java.util.List<AltosLaunchSite> sites) {
+		this.sites = sites;
 		SwingUtilities.invokeLater(new Runnable() {
 				public void run() {
 					int	i = 1;
@@ -301,6 +322,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 						site_list.insertItemAt(site, i);
 						i++;
 					}
+					reset_marks();
 				}
 			});
 	}
@@ -336,7 +358,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 	public AltosUIMapPreload(AltosUIFrame in_owner) {
 		owner = in_owner;
 
-		Container		pane = getContentPane();
+		Container		pane = getScrollablePane();
 		GridBagConstraints	c = new GridBagConstraints();
 		Insets			i = new Insets(4,4,4,4);