X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMapMark.java;h=0676f54f566b24f38e0b4c0e07b5df651943a317;hb=3af81a45be69b4693396de4a5e2c386be566b933;hp=5eb1907b2e1755ff64b299d2e4c09aac893fb998;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c;p=fw%2Faltos

diff --git a/altoslib/AltosMapMark.java b/altoslib/AltosMapMark.java
index 5eb1907b..0676f54f 100644
--- a/altoslib/AltosMapMark.java
+++ b/altoslib/AltosMapMark.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.lang.Math;
@@ -24,15 +25,25 @@ import java.util.concurrent.*;
 
 public abstract class AltosMapMark {
 
-	AltosLatLon	lat_lon;
-	int		state;
+	public AltosLatLon	lat_lon;
+	public int		state;
+	public String		label;
 
 	static public int stroke_width = 6;
 
 	public abstract void paint(AltosMapTransform t);
 
-	public AltosMapMark (double lat, double lon, int state) {
+	public AltosMapMark (double lat, double lon, int state, String label) {
 		lat_lon = new AltosLatLon(lat, lon);
 		this.state = state;
+		this.label = label;
+	}
+
+	public AltosMapMark (double lat, double lon, int state) {
+		this(lat, lon, state, null);
+	}
+
+	public AltosMapMark () {
+		this(0, 0, 0);
 	}
 }