projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add TeleMega v4.0 firmware to altosui packaged bits
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index b9c4bfc104fac18c35abd00a75aa64431615bdb5..8fc40e8af307057a269e2552271ed09f0a47d060 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) {
@@
-500,6
+499,8
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
notice_user_input();
if (path == null)
return null;
notice_user_input();
if (path == null)
return null;
+ if (transform == null)
+ return null;
AltosLatLon at = transform.screen_lat_lon(new AltosPointInt(x, y));
return path.nearest(at);
}
AltosLatLon at = transform.screen_lat_lon(new AltosPointInt(x, y));
return path.nearest(at);
}