projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/scheme: Use memory manager mark code to note recursive print
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index 08ac5f3c9bc6c859491c9447964af115196f4bbc..286cf1bb696de34e2992728af6e0328810ecf45a 100644
(file)
--- a/
altoslib/AltosMap.java
+++ b/
altoslib/AltosMap.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,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
0
;
+package org.altusmetrum.altoslib_1
2
;
import java.io.*;
import java.lang.*;
import java.io.*;
import java.lang.*;
@@
-219,11
+220,11
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
return false;
}
return false;
}
- public void show(Altos
State state, AltosListenerState listener_
state) {
+ public void show(Altos
GPS gps, int
state) {
- /* If insufficient gps data, nothing to update
+ /*
+ * If insufficient gps data, nothing to update
*/
*/
- AltosGPS gps = state.gps;
if (gps == null)
return;
if (gps == null)
return;
@@
-231,23
+232,23
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
if (!gps.locked && gps.nsat < 4)
return;
if (!gps.locked && gps.nsat < 4)
return;
- switch (state
.state()
) {
+ switch (state) {
case AltosLib.ao_flight_boost:
if (!have_boost) {
case AltosLib.ao_flight_boost:
if (!have_boost) {
- add_mark(gps.lat, gps.lon, state
.state()
);
+ add_mark(gps.lat, gps.lon, state);
have_boost = true;
}
break;
case AltosLib.ao_flight_landed:
if (!have_landed) {
have_boost = true;
}
break;
case AltosLib.ao_flight_landed:
if (!have_landed) {
- add_mark(gps.lat, gps.lon, state
.state()
);
+ add_mark(gps.lat, gps.lon, state);
have_landed = true;
}
break;
}
if (path != null) {
have_landed = true;
}
break;
}
if (path != null) {
- AltosMapRectangle damage = path.add(gps.lat, gps.lon, state
.state()
);
+ AltosMapRectangle damage = path.add(gps.lat, gps.lon, state);
if (damage != null)
repaint(damage, AltosMapPath.stroke_width);
if (damage != null)
repaint(damage, AltosMapPath.stroke_width);
@@
-258,6
+259,10
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
maybe_centre(gps.lat, gps.lon);
}
maybe_centre(gps.lat, gps.lon);
}
+ public void show(AltosState state, AltosListenerState listener_state) {
+ show(state.gps, state.state());
+ }
+
public void centre(AltosLatLon lat_lon) {
centre = lat_lon;
set_transform();
public void centre(AltosLatLon lat_lon) {
centre = lat_lon;
set_transform();
@@
-267,10
+272,14
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
centre(new AltosLatLon(lat, lon));
}
centre(new AltosLatLon(lat, lon));
}
- public void centre(Altos
State state
) {
- if (!
state.gps.locked && state.
gps.nsat < 4)
+ public void centre(Altos
GPS gps
) {
+ if (!
gps.locked &&
gps.nsat < 4)
return;
return;
- centre(state.gps.lat, state.gps.lon);
+ centre(gps.lat, gps.lon);
+ }
+
+ public void centre(AltosState state) {
+ centre(state.gps);
}
public void maybe_centre(double lat, double lon) {
}
public void maybe_centre(double lat, double lon) {