X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMap.java;h=8fc40e8af307057a269e2552271ed09f0a47d060;hp=69142c375c3656bf37b1c75a3d80a260dd994b40;hb=HEAD;hpb=260dd06107c8f8f5c7e606a283d388cb3ba46465

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 69142c37..3877c7dc 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.lang.*;
@@ -82,7 +82,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	static final long auto_scroll_delay = 20 * 1000;
 
 	public AltosMapTransform	transform;
-	AltosLatLon		centre;
+	public AltosLatLon		centre;
 
 	public void reset() {
 		// nothing
@@ -289,10 +289,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			centre(lat_lon);
 	}
 
-	public AltosMapMark add_mark(double lat, double lon, int state) {
+	public AltosMapMark add_mark(double lat, double lon, int state, String label) {
 		AltosMapMark mark;
 		synchronized(marks) {
-			mark = map_interface.new_mark(lat, lon, state);
+			mark = map_interface.new_mark(lat, lon, state, label);
 			if (mark != null)
 				marks.add(mark);
 		}
@@ -300,6 +300,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		return mark;
 	}
 
+	public AltosMapMark add_mark(double lat, double lon, int state) {
+		return add_mark(lat, lon, state, null);
+	}
+
 	public void del_mark(AltosMapMark mark) {
 		marks.remove(mark);
 	}
@@ -499,6 +503,8 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		notice_user_input();
 		if (path == null)
 			return null;
+		if (transform == null)
+			return null;
 		AltosLatLon	at = transform.screen_lat_lon(new  AltosPointInt(x, y));
 		return path.nearest(at);
 	}