X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosSiteMap.java;fp=altosuilib%2FAltosSiteMap.java;h=f22d9531848acd4d87be60ae4b5ed06946e7d155;hp=f4143fe2433d84fbdcfeb072daee35f19772381e;hb=8e44580cbe978f1570d4d2ac13d3dd7cd470ecf7;hpb=c674a20432c2cb97e5bc2a3de891f78b9e172fe9

diff --git a/altosuilib/AltosSiteMap.java b/altosuilib/AltosSiteMap.java
index f4143fe2..f22d9531 100644
--- a/altosuilib/AltosSiteMap.java
+++ b/altosuilib/AltosSiteMap.java
@@ -22,7 +22,7 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.lang.Math;
-import java.awt.geom.Point2D;
+import java.awt.geom.*;
 import java.util.*;
 import java.util.concurrent.*;
 import org.altusmetrum.altoslib_4.*;
@@ -50,7 +50,7 @@ class MapPoint {
 	}
 }
 
-public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
+public class AltosSiteMap extends JComponent implements AltosFlightDisplay, MouseMotionListener, MouseListener {
 	// preferred vertical step in a tile in naut. miles
 	// will actually choose a step size between x and 2x, where this
 	// is 1.5x
@@ -160,6 +160,10 @@ public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
 	}
 	*/
 
+	private LatLng latlng(Point pt) {
+		return latlng(new Point2D.Double(pt.x, pt.y), scale_x, scale_y);
+	}
+
 	ConcurrentHashMap<Point,AltosSiteMapTile> mapTiles = new ConcurrentHashMap<Point,AltosSiteMapTile>();
 	Point2D.Double centre;
 
@@ -307,16 +311,15 @@ public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
 		base_location_set = false;
 		circle_set = false;
 		points = new LinkedList<MapPoint>();
-		for (AltosSiteMapTile tile : mapTiles.values())
-			tile.clearMap();
+		line_start = line_end = null;
 	}
 
 	public void setBaseLocation(double lat, double lng) {
+		for (AltosSiteMapTile tile : mapTiles.values())
+			tile.clearMap();
 		this.lat = lat;
 		this.lon = lng;
 		base_location_set = true;
-		for (AltosSiteMapTile tile : mapTiles.values())
-			tile.clearMap();
 
 		centre = getBaseLocation(lat, lng);
 		scrollRocketToVisible(pt(lat,lng));
@@ -442,6 +445,8 @@ public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
 		}
 		if (circle_set)
 			draw_circle(circle_lat, circle_lon);
+		if (line_start != null)
+			set_line();
 	}
 
 	public void show(final AltosState state, final AltosListenerState listener_state) {
@@ -598,14 +603,85 @@ public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
 		}
 	}
 
-	JComponent comp = new JComponent() { };
+	JComponent comp;
+
 	private GridBagLayout layout = new GridBagLayout();
 
+	LatLng	line_start, line_end;
+
+	private void set_line() {
+		if (line_start != null && line_end != null) {
+			Point2D.Double	start = pt(line_start.lat, line_start.lng);
+			Point2D.Double	end = pt(line_end.lat, line_end.lng);
+			AltosGreatCircle	g = new AltosGreatCircle(line_start.lat, line_start.lng,
+									 line_end.lat, line_end.lng);
+
+			for (Point offset : mapTiles.keySet()) {
+				AltosSiteMapTile tile = mapTiles.get(offset);
+				Point2D.Double s, e;
+				s = translatePoint(start, tileCoordOffset(offset));
+				e = translatePoint(end, tileCoordOffset(offset));
+				tile.set_line(new Line2D.Double(s.x, s.y, e.x, e.y), g.distance);
+			}
+		} else {
+			for (AltosSiteMapTile tile : mapTiles.values())
+				tile.set_line(null, 0);
+		}
+	}
+
+	LatLng latlng(MouseEvent e) {
+		if (!base_location_set)
+			return null;
+
+		Rectangle	zerozero = mapTiles.get(new Point(0, 0)).getBounds();
+
+		return latlng(-centre.x + e.getPoint().x - zerozero.x, -centre.y + e.getPoint().y - zerozero.y);
+	}
+
+	/* MouseMotionListener methods */
+	public void mouseDragged(MouseEvent e) {
+		if (!GrabNDrag.grab_n_drag(e)) {
+			LatLng	loc = latlng(e);
+			line_end = loc;
+			set_line();
+		}
+	}
+
+	public void mouseMoved(MouseEvent e) {
+	}
+
+	/* MouseListener methods */
+	public void mouseClicked(MouseEvent e) {
+	}
+
+	public void mouseEntered(MouseEvent e) {
+	}
+
+	public void mouseExited(MouseEvent e) {
+	}
+
+	public void mousePressed(MouseEvent e) {
+		if (!GrabNDrag.grab_n_drag(e)) {
+			LatLng	loc = latlng(e);
+			line_start = loc;
+			line_end = null;
+			set_line();
+		}
+	}
+
+	public void mouseReleased(MouseEvent e) {
+	}
+
 	JScrollPane	pane = new JScrollPane();
 
 	public AltosSiteMap(int in_radius) {
 		radius = in_radius;
 
+		comp = new JComponent() { };
+
+		comp.addMouseMotionListener(this);
+		comp.addMouseListener(this);
+
 		GrabNDrag scroller = new GrabNDrag(comp);
 
 		comp.setLayout(layout);