altosui: Add speed and gps height to map display data

And generalize the API so that any other GPS data could be added in
the future.

This feature was proposed by Mike Beattie

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index 6bc6c6f8..9eac2654 100644
--- a/altoslib/AltosMapTransform.java
+++ b/altoslib/AltosMapTransform.java
@@ -67,13 +67,13 @@ public class AltosMapTransform {
 		return lat_lon(screen_point(screen));
 	}
 
-	public AltosPointDouble point(AltosLatLon lat_lon) {
+	public  AltosPointDouble point(double lat, double lon) {
 		double x, y;
 		double e;
 
-		x = lat_lon.lon * scale_x;
+		x = lon * scale_x;
 
-		e = Math.sin(Math.toRadians(lat_lon.lat));
+		e = Math.sin(Math.toRadians(lat));
 		e = Math.max(e,-(1-1.0E-15));
 		e = Math.min(e,  1-1.0E-15 );
 
@@ -82,6 +82,10 @@ public class AltosMapTransform {
 		return new AltosPointDouble(x, y);
 	}
 
+	public AltosPointDouble point(AltosLatLon lat_lon) {
+		return point(lat_lon.lat, lat_lon.lon);
+	}
+
 	public AltosPointDouble screen(AltosPointDouble point) {
 		return new AltosPointDouble(point.x - offset_x, point.y - offset_y);
 	}
@@ -102,6 +106,10 @@ public class AltosMapTransform {
 		return screen(point(lat_lon));
 	}
 
+	public AltosPointDouble screen(double lat, double lon) {
+		return screen(point(lat, lon));
+	}
+
 	private boolean has_location;
 
 	public boolean has_location() {