X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMap.java;h=aaa68f238c893549641585858a12dc291bff6ce0;hb=debian;hp=5b981d14e6113f2fa9d24c5a3616168295329c9d;hpb=260dd06107c8f8f5c7e606a283d388cb3ba46465;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 5b981d14..0a80959f 100644
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_13;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -28,7 +28,7 @@ import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
 import javax.imageio.*;
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosMapInterface {
 
@@ -48,20 +48,48 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 
 	class MapMark extends AltosMapMark {
 		public void paint(AltosMapTransform t) {
-			AltosPointDouble pt = t.screen(lat_lon);
-
-			g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-					   RenderingHints.VALUE_ANTIALIAS_ON);
-			g.setStroke(new BasicStroke(stroke_width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-
-			if (0 <= state && state < AltosUIMap.stateColors.length)
-				g.setColor(AltosUIMap.stateColors[state]);
-			else
-				g.setColor(AltosUIMap.stateColors[AltosLib.ao_flight_invalid]);
+			double lat = lat_lon.lat;
+			double lon;
+			double first_lon = t.first_lon(lat_lon.lon);
+			double last_lon = t.last_lon(lat_lon.lon);
+			for (lon = first_lon; lon <= last_lon; lon += 360.0) {
+				AltosPointDouble pt = t.screen(lat, lon);
+
+				g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+						   RenderingHints.VALUE_ANTIALIAS_ON);
+				g.setStroke(new BasicStroke(stroke_width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+
+				if (0 <= state && state < AltosUIMap.stateColors.length)
+					g.setColor(AltosUIMap.stateColors[state]);
+				else
+					g.setColor(AltosUIMap.stateColors[AltosLib.ao_flight_invalid]);
+
+				g.drawOval((int)pt.x-5, (int)pt.y-5, 10, 10);
+				g.drawOval((int)pt.x-20, (int)pt.y-20, 40, 40);
+				g.drawOval((int)pt.x-35, (int)pt.y-35, 70, 70);
+
+				if (label != null) {
+					Rectangle2D	bounds;
+					bounds = line_font.getStringBounds(label, g.getFontRenderContext());
+					float x = (float) pt.x;
+					float y = (float) pt.y + (float) bounds.getHeight() / 2.0f;
+
+					g.setFont(line_font);
+					g.setColor(Color.WHITE);
+					for (int dy = -2; dy <= 2; dy += 2)
+						for (int dx = -2; dx <= 2; dx += 2)
+							g.drawString(label, x + dx, y + dy);
+					if (0 <= state && state < AltosUIMap.stateColors.length)
+						g.setColor(AltosUIMap.stateColors[state]);
+					else
+						g.setColor(AltosUIMap.stateColors[AltosLib.ao_flight_invalid]);
+					g.drawString(label, x, y);
+				}
+			}
+		}
 
-			g.drawOval((int)pt.x-5, (int)pt.y-5, 10, 10);
-			g.drawOval((int)pt.x-20, (int)pt.y-20, 40, 40);
-			g.drawOval((int)pt.x-35, (int)pt.y-35, 70, 70);
+		MapMark(double lat, double lon, int state, String label) {
+			super(lat, lon, state, label);
 		}
 
 		MapMark(double lat, double lon, int state) {
@@ -148,16 +176,16 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		public void mouseMoved(MouseEvent e) {
 			AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
 
-			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;
-			}
 			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,
@@ -403,6 +431,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		return new MapMark(lat, lon, state);
 	}
 
+	public AltosMapMark new_mark(double lat, double lon, int state, String label) {
+		return new MapMark(lat, lon, state, label);
+	}
+
 	public AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size, int scale) {
 		return new MapTile(cache, upper_left, center, zoom, maptype, px_size, scale);
 	}
@@ -476,6 +508,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		map.add_mark(lat, lon, status);
 	}
 
+	public void add_mark(double lat, double lon, int status, String label) {
+		map.add_mark(lat, lon, status, label);
+	}
+
 	public void clear_marks() {
 		map.clear_marks();
 	}