first cut at turnon scripts for EasyTimer v2

[fw/altos] / altoslib / AltosMapMark.java

diff --git a/altoslib/AltosMapMark.java b/altoslib/AltosMapMark.java
index cc28f438b7e850c502dad5f0b15117291d78bc9a..0676f54f566b24f38e0b4c0e07b5df651943a317 100644 (file)
--- 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_8;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.lang.Math;
@@ -26,13 +27,23 @@ public abstract class AltosMapMark {
 
        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);
        }
 }