projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add config and pyro tabs to graph widget
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index b033cbff75b59e855f62c42ccca1dc3e3fbd257f..3877c7dce7a3631419c1c7e4ac37011c493fc267 100644
(file)
--- a/
altoslib/AltosMap.java
+++ b/
altoslib/AltosMap.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
3
;
+package org.altusmetrum.altoslib_1
4
;
import java.io.*;
import java.lang.*;
import java.io.*;
import java.lang.*;
@@
-82,7
+82,7
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
static final long auto_scroll_delay = 20 * 1000;
public AltosMapTransform transform;
static final long auto_scroll_delay = 20 * 1000;
public AltosMapTransform transform;
-
AltosLatLon
centre;
+
public AltosLatLon
centre;
public void reset() {
// nothing
public void reset() {
// nothing
@@
-222,8
+222,7
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
return false;
}
return false;
}
- public void show(AltosGPS gps, 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, 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.
state
());
+ show(state.gps, state.
time, state.state(), state.gps_height
());
}
public void centre(AltosLatLon lat_lon) {
}
public void centre(AltosLatLon lat_lon) {
@@
-290,13
+289,23
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
centre(lat_lon);
}
centre(lat_lon);
}
- public void add_mark(double lat, double lon, int state) {
+ public AltosMapMark add_mark(double lat, double lon, int state, String label) {
+ AltosMapMark mark;
synchronized(marks) {
synchronized(marks) {
-
AltosMapMark mark = map_interface.new_mark(lat, lon, state
);
+
mark = map_interface.new_mark(lat, lon, state, label
);
if (mark != null)
marks.add(mark);
}
repaint();
if (mark != null)
marks.add(mark);
}
repaint();
+ return mark;
+ }
+
+ public AltosMapMark add_mark(double lat, double lon, int state) {
+ return add_mark(lat, lon, state, null);
+ }
+
+ public void del_mark(AltosMapMark mark) {
+ marks.remove(mark);
}
public void clear_marks() {
}
public void clear_marks() {
@@
-490,6
+499,16
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
drag_stop(x, y);
}
drag_stop(x, y);
}
+ public AltosMapPathPoint nearest(int x, int y) {
+ 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);
+ }
+
public AltosMap(AltosMapInterface map_interface, int scale) {
this.map_interface = map_interface;
this.scale = scale;
public AltosMap(AltosMapInterface map_interface, int scale) {
this.map_interface = map_interface;
this.scale = scale;