From 2524730217e6972f3d0f04a9954350ba1964a83a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 2 Sep 2019 15:20:14 -0500 Subject: 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 --- altoslib/AltosMapTransform.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'altoslib/AltosMapTransform.java') 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() { -- cgit v1.2.3