projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Clean up map file and url handling
[fw/altos]
/
altoslib
/
AltosMap.java
diff --git
a/altoslib/AltosMap.java
b/altoslib/AltosMap.java
index c79e52294d20942321b8af7ec047cbdfcf92b32f..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_
9
;
+package org.altusmetrum.altoslib_
10
;
import java.io.*;
import java.lang.*;
import java.io.*;
import java.lang.*;
@@
-328,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);
}
}
@@
-345,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();
}
@@
-421,10
+417,8
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
if (distance > drag_far)
dragged = true;
if (distance > drag_far)
dragged = true;
- if (transform == null) {
- debug("Transform not set in drag\n");
+ 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);
@@
-439,7
+433,6
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
private void drag_stop(int x, int y) {
if (!dragged) {
if (transform == null) {
private void drag_stop(int x, int y) {
if (!dragged) {
if (transform == null) {
- debug("Transform not set in stop\n");
return;
}
map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
return;
}
map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
@@
-447,14
+440,14
@@
public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
}
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();
}