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

diff --git a/altoslib/AltosMapPath.java b/altoslib/AltosMapPath.java
index 272a4316..a238ba1a 100644
--- a/altoslib/AltosMapPath.java
+++ b/altoslib/AltosMapPath.java
@@ -15,41 +15,24 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_7;
 
 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 +45,6 @@ public abstract class AltosMapPath {
 	}
 
 	public void clear () {
-		points = new LinkedList<PathPoint>();
+		points = new LinkedList<AltosMapPathPoint>();
 	}
 }