projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao_lco_v2: Add casts to reduce -Wconversion warnings
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index 8fc40e8af307057a269e2552271ed09f0a47d060..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
@@
-289,10
+289,10
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
centre(lat_lon);
}
centre(lat_lon);
}
- public AltosMapMark add_mark(double lat, double lon, int state) {
+ public AltosMapMark add_mark(double lat, double lon, int state
, String label
) {
AltosMapMark mark;
synchronized(marks) {
AltosMapMark mark;
synchronized(marks) {
- mark = map_interface.new_mark(lat, lon, state);
+ mark = map_interface.new_mark(lat, lon, state
, label
);
if (mark != null)
marks.add(mark);
}
if (mark != null)
marks.add(mark);
}
@@
-300,6
+300,10
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
return mark;
}
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 del_mark(AltosMapMark mark) {
marks.remove(mark);
}