From: Bdale Garbee <bdale@gag.com>
Date: Sun, 14 Jan 2018 20:05:37 +0000 (-0300)
Subject: lose the map related code
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=01cd1603859aa53d593999ef0adb0e0df053f62c

lose the map related code
---

diff --git a/teststand/AltosFlightUI.java b/teststand/AltosFlightUI.java
index e0605085..32f24994 100644
--- a/teststand/AltosFlightUI.java
+++ b/teststand/AltosFlightUI.java
@@ -39,8 +39,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosIgnitor	igniter;
 	AltosLanded	landed;
 	AltosCompanionInfo	companion;
-	AltosUIMap      sitemap;
-	boolean		has_map;
 	boolean		has_companion;
 	boolean		has_state;
 	boolean		has_igniter;
@@ -134,18 +132,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 			}
 		}
 
-		if (state.gps != null) {
-			if (!has_map) {
-				pane.add("Site Map", sitemap);
-				has_map = true;
-			}
-		} else {
-			if (has_map) {
-				pane.remove(sitemap);
-				has_map = false;
-			}
-		}
-
 		for (AltosFlightDisplay d : displays) {
 			try {
 				d.show(state, listener_state);
@@ -275,10 +261,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		has_companion = false;
 		has_state = false;
 
-		sitemap = new AltosUIMap();
-		displays.add(sitemap);
-		has_map = false;
-
 		/* Make the tabbed pane use the rest of the window space */
 		bag.add(pane, constraints(0, 4, GridBagConstraints.BOTH));
 
diff --git a/teststand/AltosGraphUI.java b/teststand/AltosGraphUI.java
index 6cad982c..1db2c6c0 100644
--- a/teststand/AltosGraphUI.java
+++ b/teststand/AltosGraphUI.java
@@ -36,48 +36,17 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 	JTabbedPane		pane;
 	AltosGraph		graph;
 	AltosUIEnable		enable;
-	AltosUIMap		map;
 	AltosFlightStats	stats;
 	AltosFlightStatsTable	statsTable;
 	AltosGPS		gps;
 	boolean			has_gps;
 
-	void fill_map(AltosFlightSeries flight_series) {
-		boolean			any_gps = false;
-		AltosGPSTimeValue	gtv_last = null;
-
-		if (flight_series.gps_series != null) {
-			for (AltosGPSTimeValue gtv : flight_series.gps_series) {
-				AltosGPS gps = gtv.gps;
-				if (gps != null &&
-				    gps.locked &&
-				    gps.nsat >= 4) {
-					if (map == null)
-						map = new AltosUIMap();
-					map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
-					this.gps = gps;
-					gtv_last = gtv;
-					has_gps = true;
-				}
-			}
-		}
-		if (gtv_last != null) {
-			int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
-			if (state == AltosLib.ao_flight_landed)
-				map.show(gtv_last.gps, state);
-		}
-	}
-
 	public void font_size_changed(int font_size) {
-		if (map != null)
-			map.font_size_changed(font_size);
 		if (statsTable != null)
 			statsTable.font_size_changed(font_size);
 	}
 
 	public void units_changed(boolean imperial_units) {
-		if (map != null)
-			map.units_changed(imperial_units);
 		if (enable != null)
 			enable.units_changed(imperial_units);
 	}
@@ -125,9 +94,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		pane.add("Flight Statistics", statsTable);
 
 		has_gps = false;
-		fill_map(flight_series);
-		if (has_gps)
-			pane.add("Map", map);
 
 		setContentPane (pane);
 
@@ -144,7 +110,5 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		pack();
 
 		setVisible(true);
-		if (gps != null)
-			map.centre(gps);
 	}
 }
diff --git a/teststand/TestStand.java b/teststand/TestStand.java
index 29001d99..3cdf2daf 100644
--- a/teststand/TestStand.java
+++ b/teststand/TestStand.java
@@ -199,20 +199,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 				}
 			});
 		b.setToolTipText("Find what channel an altimeter is sending telemetry on");
-		b = addButton(1, 2, "Load Maps");
-		b.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					LoadMaps();
-				}
-			});
-		b.setToolTipText("Download satellite images for off-line flight monitoring");
-
-//		b = addButton(3, 2, "Launch Controller");
-//		b.addActionListener(new ActionListener() {
-//				public void actionPerformed(ActionEvent e) {
-//					LaunchController();
-//				}
-//			});
 
 		b = addButton(4, 2, "Quit");
 		b.addActionListener(new ActionListener() {
@@ -281,10 +267,6 @@ public class TestStand extends AltosUIFrame implements AltosEepromGrapher {
 		new AltosScanUI(TestStand.this, true);
 	}
 
-	void LoadMaps() {
-		new AltosUIMapPreload(TestStand.this);
-	}
-
 	void LaunchController() {
 		new AltosLaunchUI(TestStand.this);
 	}