X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMapPath.java;h=1542a4e9bea71ed0afdcd84260b2a8e81294f191;hp=272a4316c78f212296de23ba1cb43ca82a58dd08;hb=b3474fb33a58e78b3b8f36958dd44768e49f3edc;hpb=29edc37a8de56cb6eb028e3bf3f56aa70f109eba

diff --git a/altoslib/AltosMapPath.java b/altoslib/AltosMapPath.java
index 272a4316..1542a4e9 100644
--- a/altoslib/AltosMapPath.java
+++ b/altoslib/AltosMapPath.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,41 +16,24 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.lang.Math;
 import java.util.*;
 import java.util.concurrent.*;
 
-class PathPoint {
-	AltosLatLon	lat_lon;
-	int		state;
-
-	public PathPoint(AltosLatLon lat_lon, int state) {
-		this.lat_lon = lat_lon;
-		this.state = state;
-	}
-
-	public boolean equals(PathPoint other) {
-		if (other == null)
-			return false;
-
-		return lat_lon.equals(other.lat_lon) && state == other.state;
-	}
-}
-
 public abstract class AltosMapPath {
 
-	LinkedList<PathPoint>	points = new LinkedList<PathPoint>();
-	PathPoint		last_point = null;
+	public LinkedList<AltosMapPathPoint>	points = new LinkedList<AltosMapPathPoint>();
+	public AltosMapPathPoint		last_point = null;
 
 	static public int stroke_width = 6;
 
 	public abstract void paint(AltosMapTransform t);
 
 	public AltosMapRectangle add(double lat, double lon, int state) {
-		PathPoint		point = new PathPoint(new AltosLatLon (lat, lon), state);
+		AltosMapPathPoint		point = new AltosMapPathPoint(new AltosLatLon (lat, lon), state);
 		AltosMapRectangle	rect = null;
 
 		if (!point.equals(last_point)) {
@@ -62,6 +46,6 @@ public abstract class AltosMapPath {
 	}
 
 	public void clear () {
-		points = new LinkedList<PathPoint>();
+		points = new LinkedList<AltosMapPathPoint>();
 	}
 }