diff options
Diffstat (limited to 'altoslib')
| -rw-r--r-- | altoslib/AltosMap.java | 14 | ||||
| -rw-r--r-- | altoslib/AltosMapTransform.java | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java index 1504120c..59420d4b 100644 --- a/altoslib/AltosMap.java +++ b/altoslib/AltosMap.java @@ -280,29 +280,23 @@ 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()))); } - LinkedList<AltosPointInt> to_remove = new LinkedList<AltosPointInt>(); - for (AltosPointInt point : tiles.keySet()) { if (point.x < upper_left.x || lower_right.x < point.x || point.y < upper_left.y || lower_right.y < point.y) { - to_remove.add(point); + tiles.remove(point); } } - for (AltosPointInt point : to_remove) - tiles.remove(point); - cache.set_cache_size((width() / AltosMap.px_size + 2) * (height() / AltosMap.px_size + 2)); for (int y = (int) upper_left.y; y <= lower_right.y; y += AltosMap.px_size) { for (int x = (int) upper_left.x; x <= lower_right.x; x += AltosMap.px_size) { - AltosPointInt point = new AltosPointInt(x, y); + AltosPointInt point = new AltosPointInt(x, y); if (!tiles.containsKey(point)) { - AltosLatLon ul = transform.lat_lon(new AltosPointDouble(x, y)); + 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(this, ul, center, zoom, maptype, px_size); tiles.put(point, tile); } } diff --git a/altoslib/AltosMapTransform.java b/altoslib/AltosMapTransform.java index e0e8afb0..30994ecb 100644 --- a/altoslib/AltosMapTransform.java +++ b/altoslib/AltosMapTransform.java @@ -39,6 +39,10 @@ public class AltosMapTransform { return new AltosLatLon(lat,lon); } + public AltosLatLon lat_lon (AltosPointInt point) { + return lat_lon(new AltosPointDouble(point.x, point.y)); + } + public AltosPointDouble screen_point(AltosPointInt screen) { return new AltosPointDouble(screen.x + offset_x, screen.y + offset_y); } |