X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMap.java;h=bd0a855c01ee6468c549bbdafeb3af6ebb0bfe44;hb=5ff0442702ee41179341240b1bbf290be89e1718;hp=8dfdba64c8bca8da70beb0f8462e6c2e3882341c;hpb=2bcbd39a37cf1fa0002345d5c401869a387dc84f;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 8dfdba64..bd0a855c 100644
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.java
@@ -36,6 +36,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 	Graphics2D	g;
 	Font		tile_font;
 	Font		line_font;
+	AltosMapMark	nearest_mark;
 
 	static Point2D.Double point2d(AltosPointDouble pt) {
 		return new Point2D.Double(pt.x, pt.y);
@@ -115,7 +116,61 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 			map.touch_continue(e.getPoint().x, e.getPoint().y, is_drag_event(e));
 		}
 
+		String pos(double p, String pos, String neg) {
+			if (p == AltosLib.MISSING)
+				return "";
+			String	h = pos;
+			if (p < 0) {
+				h = neg;
+				p = -p;
+			}
+			int deg = (int) Math.floor(p);
+			double min = (p - Math.floor(p)) * 60.0;
+			return String.format("%s %4d° %9.6f'", h, deg, min);
+		}
+
+		String height(double h, String label) {
+			if (h == AltosLib.MISSING)
+				return "";
+			return String.format(" %s%s",
+					     AltosConvert.height.show(6, h),
+					     label);
+		}
+
+		String speed(double s, String label) {
+			if (s == AltosLib.MISSING)
+				return "";
+			return String.format(" %s%s",
+					     AltosConvert.speed.show(6, s),
+					     label);
+		}
+
 		public void mouseMoved(MouseEvent e) {
+			AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
+
+			if (point != null) {
+				if (nearest_mark == null)
+					nearest_mark = map.add_mark(point.gps.lat,
+								    point.gps.lon,
+								    point.state);
+				else {
+					nearest_mark.lat_lon.lat = point.gps.lat;
+					nearest_mark.lat_lon.lon = point.gps.lon;
+					nearest_mark.state = point.state;
+				}
+				nearest_label.setText(String.format("%9.2f sec %s%s%s%s",
+								    point.time,
+								    pos(point.gps.lat,
+									"N", "S"),
+								    pos(point.gps.lon,
+									"E", "W"),
+								    height(point.gps_height, ""),
+								    speed(point.gps.ground_speed, "(h)"),
+								    speed(point.gps.climb_rate, "(v)")));
+			} else {
+				nearest_label.setText("");
+			}
+			repaint();
 		}
 
 		/* MouseListener methods */
@@ -222,7 +277,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 			g.setStroke(new BasicStroke(stroke_width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
 
 			for (AltosMapPathPoint point : points) {
-				Point2D.Double	cur = point2d(t.screen(point.lat_lon));
+				Point2D.Double	cur = point2d(t.screen(point.gps.lat, point.gps.lon));
 				if (prev != null) {
 					Line2D.Double	line = new Line2D.Double (prev, cur);
 					Rectangle	bounds = line.getBounds();
@@ -387,6 +442,8 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 	public void set_font() {
 		tile_font = AltosUILib.value_font;
 		line_font = AltosUILib.status_font;
+		if (nearest_label != null)
+			nearest_label.setFont(AltosUILib.value_font);
 	}
 
 	public void font_size_changed(int font_size) {
@@ -400,6 +457,8 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 
 	JLabel	zoom_label;
 
+	JLabel	nearest_label;
+
 	public void set_maptype(int type) {
 /*
 		map.set_maptype(type);
@@ -430,8 +489,8 @@ 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 void show(AltosGPS gps, double time, int state, double gps_height) {
+		map.show(gps, time, state, gps_height);
 	}
 
 	public String getName() {
@@ -541,6 +600,20 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		c.weighty = 0;
 		add(zoom_out, c);
 
+
+		nearest_label = new JLabel("", JLabel.LEFT);
+		nearest_label.setFont(tile_font);
+
+		c = new GridBagConstraints();
+		c.anchor = GridBagConstraints.CENTER;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.gridx = 0;
+		c.gridy = 11;
+		c.weightx = 0;
+		c.weighty = 0;
+		c.gridwidth = 1;
+		c.gridheight = 1;
+		add(nearest_label, c);
 /*
 		maptype_combo = new JComboBox<String>(map.maptype_labels);