Merge branch 'master' into branch-1.6

1 files changed, 38 insertions, 0 deletions

diff --git a/altoslib/AltosMapMark.java b/altoslib/AltosMapMark.java
new file mode 100644
index 00000000..cc28f438
--- /dev/null
+++ b/altoslib/AltosMapMark.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2014 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_8;
+
+import java.io.*;
+import java.lang.Math;
+import java.util.*;
+import java.util.concurrent.*;
+
+public abstract class AltosMapMark {
+
+	public AltosLatLon	lat_lon;
+	public int		state;
+
+	static public int stroke_width = 6;
+
+	public abstract void paint(AltosMapTransform t);
+
+	public AltosMapMark (double lat, double lon, int state) {
+		lat_lon = new AltosLatLon(lat, lon);
+		this.state = state;
+	}
+}