X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMap.java;fp=altoslib%2FAltosMap.java;h=b9c4bfc104fac18c35abd00a75aa64431615bdb5;hp=b033cbff75b59e855f62c42ccca1dc3e3fbd257f;hb=b13893245e8c66b48e23bb2005ef6ce46e69744f;hpb=936a5ff21d01db6f0084ee7e4712042c914942a5

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index b033cbff..b9c4bfc1 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -222,7 +222,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		return false;
 	}
 
-	public void show(AltosGPS gps, int state) {
+	public void show(AltosGPS gps, double time, int state) {
 
 		/*
 		 * If insufficient gps data, nothing to update
@@ -250,7 +250,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		}
 
 		if (path != null) {
-			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, state);
+			AltosMapRectangle	damage = path.add(gps.lat, gps.lon, time, state);
 
 			if (damage != null)
 				repaint(damage, AltosMapPath.stroke_width);
@@ -262,7 +262,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	}
 
 	public void show(AltosState state, AltosListenerState listener_state) {
-		show(state.gps, state.state());
+		show(state.gps, state.time, state.state());
 	}
 
 	public void centre(AltosLatLon lat_lon) {
@@ -290,13 +290,19 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			centre(lat_lon);
 	}
 
-	public void add_mark(double lat, double lon, int state) {
+	public AltosMapMark add_mark(double lat, double lon, int state) {
+		AltosMapMark mark;
 		synchronized(marks) {
-			AltosMapMark mark = map_interface.new_mark(lat, lon, state);
+			mark = map_interface.new_mark(lat, lon, state);
 			if (mark != null)
 				marks.add(mark);
 		}
 		repaint();
+		return mark;
+	}
+
+	public void del_mark(AltosMapMark mark) {
+		marks.remove(mark);
 	}
 
 	public void clear_marks() {
@@ -490,6 +496,14 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			drag_stop(x, y);
 	}
 
+	public AltosMapPathPoint nearest(int x, int y) {
+		notice_user_input();
+		if (path == null)
+			return null;
+		AltosLatLon	at = transform.screen_lat_lon(new  AltosPointInt(x, y));
+		return path.nearest(at);
+	}
+
 	public AltosMap(AltosMapInterface map_interface, int scale) {
 		this.map_interface = map_interface;
 		this.scale = scale;