projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add beep to TeleMega turnon script
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index adf52ab9469d0be1405a4295a201b92fe7dca718..1841277f8bd61889390f0d5802dff09a7584b603 100644
(file)
--- a/
altoslib/AltosMap.java
+++ b/
altoslib/AltosMap.java
@@
-15,7
+15,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_
7
;
+package org.altusmetrum.altoslib_
10
;
import java.io.*;
import java.lang.*;
import java.io.*;
import java.lang.*;
@@
-113,12
+113,12
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
map_interface.debug(format, arguments);
}
map_interface.debug(format, arguments);
}
- public AltosPointInt floor(AltosPointDouble point) {
+
static
public AltosPointInt floor(AltosPointDouble point) {
return new AltosPointInt ((int) Math.floor(point.x / AltosMap.px_size) * AltosMap.px_size,
(int) Math.floor(point.y / AltosMap.px_size) * AltosMap.px_size);
}
return new AltosPointInt ((int) Math.floor(point.x / AltosMap.px_size) * AltosMap.px_size,
(int) Math.floor(point.y / AltosMap.px_size) * AltosMap.px_size);
}
- public AltosPointInt ceil(AltosPointDouble point) {
+
static
public AltosPointInt ceil(AltosPointDouble point) {
return new AltosPointInt ((int) Math.ceil(point.x / AltosMap.px_size) * AltosMap.px_size,
(int) Math.ceil(point.y / AltosMap.px_size) * AltosMap.px_size);
}
return new AltosPointInt ((int) Math.ceil(point.x / AltosMap.px_size) * AltosMap.px_size,
(int) Math.ceil(point.y / AltosMap.px_size) * AltosMap.px_size);
}
@@
-131,6
+131,10
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
return (System.currentTimeMillis() - user_input_time) < auto_scroll_delay;
}
return (System.currentTimeMillis() - user_input_time) < auto_scroll_delay;
}
+ public boolean has_centre() {
+ return centre != null;
+ }
+
public boolean far_from_centre(AltosLatLon lat_lon) {
if (centre == null || transform == null)
public boolean far_from_centre(AltosLatLon lat_lon) {
if (centre == null || transform == null)
@@
-226,23
+230,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.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.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.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.state
()
);
if (damage != null)
repaint(damage, AltosMapPath.stroke_width);
if (damage != null)
repaint(damage, AltosMapPath.stroke_width);
@@
-304,7
+308,11
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
upper_left = floor(transform.screen_point(new AltosPointInt(0, 0)));
lower_right = floor(transform.screen_point(new AltosPointInt(width(), height())));
}
upper_left = floor(transform.screen_point(new AltosPointInt(0, 0)));
lower_right = floor(transform.screen_point(new AltosPointInt(width(), height())));
}
- for (AltosPointInt point : tiles.keySet()) {
+
+ Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+ while (keyEnumeration.hasMoreElements()) {
+ AltosPointInt point = keyEnumeration.nextElement();
if (point.x < upper_left.x || lower_right.x < point.x ||
point.y < upper_left.y || lower_right.y < point.y) {
tiles.remove(point);
if (point.x < upper_left.x || lower_right.x < point.x ||
point.y < upper_left.y || lower_right.y < point.y) {
tiles.remove(point);
@@
-320,7
+328,8
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
if (!tiles.containsKey(point)) {
AltosLatLon ul = transform.lat_lon(point);
AltosLatLon center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
if (!tiles.containsKey(point)) {
AltosLatLon ul = transform.lat_lon(point);
AltosLatLon center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
- AltosMapTile tile = map_interface.new_tile(this, ul, center, zoom, maptype, px_size);
+ AltosMapTile tile = map_interface.new_tile(cache, ul, center, zoom, maptype, px_size);
+ tile.add_listener(this);
tiles.put(point, tile);
}
}
tiles.put(point, tile);
}
}
@@
-337,11
+346,6
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
centre(lat, lon);
tiles.clear();
make_tiles();
centre(lat, lon);
tiles.clear();
make_tiles();
- for (AltosMapTile tile : tiles.values()) {
- tile.add_store_listener(this);
- if (tile.store_status() != AltosMapTile.loading)
- listener.notify_tile(tile, tile.store_status());
- }
repaint();
}
repaint();
}
@@
-353,6
+357,9
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
if (centre != null)
make_tiles();
if (centre != null)
make_tiles();
+ if (transform == null)
+ return;
+
for (AltosMapTile tile : tiles.values())
tile.paint(transform);
for (AltosMapTile tile : tiles.values())
tile.paint(transform);
@@
-370,7
+377,10
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
/* AltosMapTileListener methods */
public synchronized void notify_tile(AltosMapTile tile, int status) {
/* AltosMapTileListener methods */
public synchronized void notify_tile(AltosMapTile tile, int status) {
- for (AltosPointInt point : tiles.keySet()) {
+ Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+ while (keyEnumeration.hasMoreElements()) {
+ AltosPointInt point = keyEnumeration.nextElement();
if (tile == tiles.get(point)) {
AltosPointInt screen = transform.screen(point);
repaint(screen.x, screen.y, AltosMap.px_size, AltosMap.px_size);
if (tile == tiles.get(point)) {
AltosPointInt screen = transform.screen(point);
repaint(screen.x, screen.y, AltosMap.px_size, AltosMap.px_size);
@@
-391,6
+401,10
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
AltosPointInt drag_start;
AltosPointInt drag_start;
+ boolean dragged;
+
+ static final double drag_far = 20;
+
private void drag(int x, int y) {
if (drag_start == null)
return;
private void drag(int x, int y) {
if (drag_start == null)
return;
@@
-398,10
+412,13
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
int dx = x - drag_start.x;
int dy = y - drag_start.y;
int dx = x - drag_start.x;
int dy = y - drag_start.y;
- if (transform == null) {
- debug("Transform not set in drag\n");
+ double distance = Math.hypot(dx, dy);
+
+ if (distance > drag_far)
+ dragged = true;
+
+ if (transform == null)
return;
return;
- }
AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointInt(width() / 2 - dx, height() / 2 - dy));
centre(new_centre);
AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointInt(width() / 2 - dx, height() / 2 - dy));
centre(new_centre);
@@
-410,17
+427,27
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
private void drag_start(int x, int y) {
drag_start = new AltosPointInt(x, y);
private void drag_start(int x, int y) {
drag_start = new AltosPointInt(x, y);
+ dragged = false;
+ }
+
+ private void drag_stop(int x, int y) {
+ if (!dragged) {
+ if (transform == null) {
+ return;
+ }
+ map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
+ }
}
private void line_start(int x, int y) {
}
private void line_start(int x, int y) {
- if (line != null) {
+ if (line != null
&& transform != null
) {
line.pressed(new AltosPointInt(x, y), transform);
repaint();
}
}
private void line(int x, int y) {
line.pressed(new AltosPointInt(x, y), transform);
repaint();
}
}
private void line(int x, int y) {
- if (line != null) {
+ if (line != null
&& transform != null
) {
line.dragged(new AltosPointInt(x, y), transform);
repaint();
}
line.dragged(new AltosPointInt(x, y), transform);
repaint();
}
@@
-442,6
+469,12
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
line(x, y);
}
line(x, y);
}
+ public void touch_stop(int x, int y, boolean is_drag) {
+ notice_user_input();
+ if (is_drag)
+ drag_stop(x, y);
+ }
+
public AltosMap(AltosMapInterface map_interface) {
this.map_interface = map_interface;
cache = new AltosMapCache(map_interface);
public AltosMap(AltosMapInterface map_interface) {
this.map_interface = map_interface;
cache = new AltosMapCache(map_interface);