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>

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 8037eb93deb37ec63e44b49d5b3975c7e31b8dd8..57ac4061dbadde59678979119add0c6a7aae8adf 100644 (file)
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -92,6 +92,10 @@ public class AltosGPS implements Cloneable {
                return odt.toEpochSecond();
        }
 
                return odt.toEpochSecond();
        }
 

+       public  AltosLatLon lat_lon() {
+               return new AltosLatLon(lat, lon);
+       }
+

        public AltosGPS(AltosTelemetryMap map) throws ParseException {
                String  state = map.get_string(AltosTelemetryLegacy.AO_TELEM_GPS_STATE,
                                               AltosTelemetryLegacy.AO_TELEM_GPS_STATE_ERROR);
        public AltosGPS(AltosTelemetryMap map) throws ParseException {
                String  state = map.get_string(AltosTelemetryLegacy.AO_TELEM_GPS_STATE,
                                               AltosTelemetryLegacy.AO_TELEM_GPS_STATE_ERROR);

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index b9c4bfc104fac18c35abd00a75aa64431615bdb5..69142c375c3656bf37b1c75a3d80a260dd994b40 100644 (file)
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -222,8 +222,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                return false;
        }
 
                return false;
        }
 

-       public void show(AltosGPS gps, double time, int state) {
-
+       public void show(AltosGPS gps, double time, int state, double gps_height) {

                /*
                 * If insufficient gps data, nothing to update
                 */
                /*
                 * If insufficient gps data, nothing to update
                 */


@@ -250,7 +249,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                }
 
                if (path != null) {
                }
 
                if (path != null) {

-                       AltosMapRectangle       damage = path.add(gps.lat, gps.lon, time, state);
+                       AltosMapRectangle       damage = path.add(gps, time, state, gps_height);

 
                        if (damage != null)
                                repaint(damage, AltosMapPath.stroke_width);
 
                        if (damage != null)
                                repaint(damage, AltosMapPath.stroke_width);


@@ -262,7 +261,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
        }
 
        public void show(AltosState state, AltosListenerState listener_state) {
        }
 
        public void show(AltosState state, AltosListenerState listener_state) {

-               show(state.gps, state.time, state.state());
+               show(state.gps, state.time, state.state(), state.gps_height());

        }
 
        public void centre(AltosLatLon lat_lon) {
        }
 
        public void centre(AltosLatLon lat_lon) {

diff --git a/altoslib/AltosMapPath.java b/altoslib/AltosMapPath.java
index 54ff51fc11eb59dfcd257f39300acd8bd430e81b..bbb6c994aae11833dc9853797c7305ad5204f99c 100644 (file)
--- a/altoslib/AltosMapPath.java
+++ b/altoslib/AltosMapPath.java
@@ -32,13 +32,13 @@ public abstract class AltosMapPath {
 
        public abstract void paint(AltosMapTransform t);
 
 
        public abstract void paint(AltosMapTransform t);
 

-       public AltosMapRectangle add(double lat, double lon, double time, int state) {
-               AltosMapPathPoint               point = new AltosMapPathPoint(new AltosLatLon (lat, lon), time, state);
+       public AltosMapRectangle add(AltosGPS gps, double time, int state, double gps_height) {
+               AltosMapPathPoint               point = new AltosMapPathPoint(gps, time, state, gps_height);

                AltosMapRectangle       rect = null;
 
                if (!point.equals(last_point)) {
                        if (last_point != null)
                AltosMapRectangle       rect = null;
 
                if (!point.equals(last_point)) {
                        if (last_point != null)

-                               rect = new AltosMapRectangle(last_point.lat_lon, point.lat_lon);
+                               rect = new AltosMapRectangle(last_point.gps.lat_lon(), point.gps.lat_lon());

                        points.add (point);
                        last_point = point;
                }
                        points.add (point);
                        last_point = point;
                }


@@ -48,8 +48,8 @@ public abstract class AltosMapPath {
        private double dist(AltosLatLon lat_lon, AltosMapPathPoint point) {
                return (new AltosGreatCircle(lat_lon.lat,
                                             lat_lon.lon,
        private double dist(AltosLatLon lat_lon, AltosMapPathPoint point) {
                return (new AltosGreatCircle(lat_lon.lat,
                                             lat_lon.lon,

-                                            point.lat_lon.lat,
-                                            point.lat_lon.lon)).distance;
+                                            point.gps.lat,
+                                            point.gps.lon)).distance;

        }
 
        public AltosMapPathPoint nearest(AltosLatLon lat_lon) {
        }
 
        public AltosMapPathPoint nearest(AltosLatLon lat_lon) {

diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java
index c23d8567bda162428833cdbdb6c4c3b2f81ea758..88a8bfcf28db86706154f397688f647a4845127b 100644 (file)
--- a/altoslib/AltosMapPathPoint.java
+++ b/altoslib/AltosMapPathPoint.java
@@ -24,12 +24,13 @@ import java.util.*;
 import java.util.concurrent.*;
 
 public class AltosMapPathPoint {
 import java.util.concurrent.*;
 
 public class AltosMapPathPoint {

-       public AltosLatLon      lat_lon;
+       public AltosGPS         gps;

        public double           time;
        public int              state;
        public double           time;
        public int              state;

+       public double           gps_height;

 
        public int hashCode() {
 
        public int hashCode() {

-               return lat_lon.hashCode() ^ state;
+               return Double.valueOf(gps.lat).hashCode() ^ Double.valueOf(gps.lon).hashCode() ^ state;

        }
 
        public boolean equals(Object o) {
        }
 
        public boolean equals(Object o) {


@@ -41,13 +42,14 @@ public class AltosMapPathPoint {
 
                AltosMapPathPoint other = (AltosMapPathPoint) o;
 
 
                AltosMapPathPoint other = (AltosMapPathPoint) o;
 

-               return lat_lon.equals(other.lat_lon) && state == other.state;
+               return gps.lat == other.gps.lat && gps.lon == other.gps.lon && state == other.state;

        }
 
        }
 

-       public AltosMapPathPoint(AltosLatLon lat_lon, double time, int state) {
-               this.lat_lon = lat_lon;
+       public AltosMapPathPoint(AltosGPS gps, double time, int state, double gps_height) {
+               this.gps = gps;

                this.time = time;
                this.state = state;
                this.time = time;
                this.state = state;

+               this.gps_height = gps_height;

        }
 }
 
        }
 }
 

diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java
index 6bc6c6f809baaa114dcb6928c94f0b49ceea601b..9eac2654220150ac29ea114bf04b23015b41e45a 100644 (file)
--- a/altoslib/AltosMapTransform.java
+++ b/altoslib/AltosMapTransform.java
@@ -67,13 +67,13 @@ public class AltosMapTransform {
                return lat_lon(screen_point(screen));
        }
 
                return lat_lon(screen_point(screen));
        }
 

-       public AltosPointDouble point(AltosLatLon lat_lon) {
+       public  AltosPointDouble point(double lat, double lon) {

                double x, y;
                double e;
 
                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 );
 
                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);
        }
 
                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);
        }
        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));
        }
 
                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() {
        private boolean has_location;
 
        public boolean has_location() {

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index c1e18ac1b9d97dce0233c123e994ad400021e660..c1fdc3a3f25f46d21f597f6893153e892a034e6e 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -45,6 +45,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
        void fill_map(AltosFlightSeries flight_series) {
                boolean                 any_gps = false;
                AltosGPSTimeValue       gtv_last = null;
        void fill_map(AltosFlightSeries flight_series) {
                boolean                 any_gps = false;
                AltosGPSTimeValue       gtv_last = null;

+               double gps_pad_altitude = flight_series.cal_data().gps_pad_altitude;;

 
                if (flight_series.gps_series != null) {
                        for (AltosGPSTimeValue gtv : flight_series.gps_series) {
 
                if (flight_series.gps_series != null) {
                        for (AltosGPSTimeValue gtv : flight_series.gps_series) {


@@ -54,7 +55,9 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                                    gps.nsat >= 4) {
                                        if (map == null)
                                                map = new AltosUIMap();
                                    gps.nsat >= 4) {
                                        if (map == null)
                                                map = new AltosUIMap();

-                                       map.show(gps, gtv. time, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
+                                       double gps_height = gps.alt - gps_pad_altitude;
+                                       int state = (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time);
+                                       map.show(gps, gtv.time, state, gps_height);

                                        this.gps = gps;
                                        gtv_last = gtv;
                                        has_gps = true;
                                        this.gps = gps;
                                        gtv_last = gtv;
                                        has_gps = true;


@@ -63,8 +66,9 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                }
                if (gtv_last != null) {
                        int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
                }
                if (gtv_last != null) {
                        int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);

+                       double gps_height = gps.alt - gps_pad_altitude;

                        if (state == AltosLib.ao_flight_landed)
                        if (state == AltosLib.ao_flight_landed)

-                               map.show(gtv_last.gps, gtv_last.time, state);
+                               map.show(gtv_last.gps, gtv_last.time, state,gps_height);

                }
        }
 
                }
        }
 

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 6b78c35a5f5b41d2ee14d12d06df6dea2df59beb..5b981d14e6113f2fa9d24c5a3616168295329c9d 100644 (file)
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.java
@@ -117,6 +117,8 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
                }
 
                String pos(double p, String pos, String neg) {
                }
 
                String pos(double p, String pos, String neg) {

+                       if (p == AltosLib.MISSING)
+                               return "";

                        String  h = pos;
                        if (p < 0) {
                                h = neg;
                        String  h = pos;
                        if (p < 0) {
                                h = neg;


@@ -127,25 +129,44 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
                        return String.format("%s %4d° %9.6f'", h, deg, min);
                }
 
                        return String.format("%s %4d° %9.6f'", h, deg, min);
                }
 

+               String height(double h, String label) {
+                       if (h == AltosLib.MISSING)
+                               return "";
+                       return String.format(" %s%s",
+                                            AltosConvert.height.show(6, h),
+                                            label);
+               }
+
+               String speed(double s, String label) {
+                       if (s == AltosLib.MISSING)
+                               return "";
+                       return String.format(" %s%s",
+                                            AltosConvert.speed.show(6, s),
+                                            label);
+               }
+

                public void mouseMoved(MouseEvent e) {
                        AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
 
                        if (nearest_mark == null)
                public void mouseMoved(MouseEvent e) {
                        AltosMapPathPoint point = map.nearest(e.getPoint().x, e.getPoint().y);
 
                        if (nearest_mark == null)

-                               nearest_mark = map.add_mark(point.lat_lon.lat,
-                                                           point.lat_lon.lon,
+                               nearest_mark = map.add_mark(point.gps.lat,
+                                                           point.gps.lon,

                                                            point.state);
                        else {
                                                            point.state);
                        else {

-                               nearest_mark.lat_lon.lat = point.lat_lon.lat;
-                               nearest_mark.lat_lon.lon = point.lat_lon.lon;
+                               nearest_mark.lat_lon.lat = point.gps.lat;
+                               nearest_mark.lat_lon.lon = point.gps.lon;

                                nearest_mark.state = point.state;
                        }
                        if (point != null) {
                                nearest_mark.state = point.state;
                        }
                        if (point != null) {

-                               nearest_label.setText(String.format("Time: %9.2f Position:  %s  %s",
+                               nearest_label.setText(String.format("%9.2f sec %s%s%s%s",

                                                                    point.time,
                                                                    point.time,

-                                                                   pos(point.lat_lon.lat,
+                                                                   pos(point.gps.lat,

                                                                        "N", "S"),
                                                                        "N", "S"),

-                                                                   pos(point.lat_lon.lon,
-                                                                       "E", "W")));
+                                                                   pos(point.gps.lon,
+                                                                       "E", "W"),
+                                                                   height(point.gps_height, ""),
+                                                                   speed(point.gps.ground_speed, "(h)"),
+                                                                   speed(point.gps.climb_rate, "(v)")));

                        } else {
                                nearest_label.setText("");
                        }
                        } else {
                                nearest_label.setText("");
                        }


@@ -256,7 +277,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
                        g.setStroke(new BasicStroke(stroke_width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
 
                        for (AltosMapPathPoint point : points) {
                        g.setStroke(new BasicStroke(stroke_width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
 
                        for (AltosMapPathPoint point : points) {

-                               Point2D.Double  cur = point2d(t.screen(point.lat_lon));
+                               Point2D.Double  cur = point2d(t.screen(point.gps.lat, point.gps.lon));

                                if (prev != null) {
                                        Line2D.Double   line = new Line2D.Double (prev, cur);
                                        Rectangle       bounds = line.getBounds();
                                if (prev != null) {
                                        Line2D.Double   line = new Line2D.Double (prev, cur);
                                        Rectangle       bounds = line.getBounds();


@@ -468,8 +489,8 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
                map.show(state, listener_state);
        }
 
                map.show(state, listener_state);
        }
 

-       public void show(AltosGPS gps, double time, int state) {
-               map.show(gps, time, state);
+       public void show(AltosGPS gps, double time, int state, double gps_height) {
+               map.show(gps, time, state, gps_height);

        }
 
        public String getName() {
        }
 
        public String getName() {