X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMapPath.java;h=bbb6c994aae11833dc9853797c7305ad5204f99c;hb=8554da3b6c05c1094045f4fb21b43c183029408f;hp=1542a4e9bea71ed0afdcd84260b2a8e81294f191;hpb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a;p=fw%2Faltos

diff --git a/altoslib/AltosMapPath.java b/altoslib/AltosMapPath.java
index 1542a4e9..bbb6c994 100644
--- a/altoslib/AltosMapPath.java
+++ b/altoslib/AltosMapPath.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.lang.Math;
@@ -32,19 +32,44 @@ public abstract class AltosMapPath {
 
 	public abstract void paint(AltosMapTransform t);
 
-	public AltosMapRectangle add(double lat, double lon, int state) {
-		AltosMapPathPoint		point = new AltosMapPathPoint(new AltosLatLon (lat, lon), state);
+	public AltosMapRectangle add(AltosGPS gps, double time, int state, double gps_height) {
+		AltosMapPathPoint		point = new AltosMapPathPoint(gps, time, state, gps_height);
 		AltosMapRectangle	rect = null;
 
 		if (!point.equals(last_point)) {
 			if (last_point != null)
-				rect = new AltosMapRectangle(last_point.lat_lon, point.lat_lon);
+				rect = new AltosMapRectangle(last_point.gps.lat_lon(), point.gps.lat_lon());
 			points.add (point);
 			last_point = point;
 		}
 		return rect;
 	}
 
+	private double dist(AltosLatLon lat_lon, AltosMapPathPoint point) {
+		return (new AltosGreatCircle(lat_lon.lat,
+					     lat_lon.lon,
+					     point.gps.lat,
+					     point.gps.lon)).distance;
+	}
+
+	public AltosMapPathPoint nearest(AltosLatLon lat_lon) {
+		AltosMapPathPoint nearest = null;
+		double nearest_dist = 0;
+		for (AltosMapPathPoint point : points) {
+			if (nearest == null) {
+				nearest = point;
+				nearest_dist = dist(lat_lon, point);
+			} else {
+				double d = dist(lat_lon, point);
+				if (d < nearest_dist) {
+					nearest = point;
+					nearest_dist = d;
+				}
+			}
+		}
+		return nearest;
+	}
+
 	public void clear () {
 		points = new LinkedList<AltosMapPathPoint>();
 	}