From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2015 05:43:53 +0000 (-0700)
Subject: altoslib: Start with map empty
X-Git-Tag: 1.6.0.3~58
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=756f501593365b80cfa6f7ca871da3291bbde67a

altoslib: Start with map empty

Don't load images from 0,0 for no good reason; wait until someone sets
a desired lat/lon

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 762054a3..d39c3302 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -150,8 +150,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	}
 
 	public void set_transform() {
-		transform = new AltosMapTransform(width(), height(), zoom, centre);
-		repaint();
+		if (centre != null) {
+			transform = new AltosMapTransform(width(), height(), zoom, centre);
+			repaint();
+		}
 	}
 
 	private void set_zoom_label() {
@@ -285,6 +287,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 			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);
@@ -319,7 +322,8 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 	}
 
 	public void paint() {
-		make_tiles();
+		if (centre != null)
+			make_tiles();
 
 		for (AltosMapTile tile : tiles.values())
 			tile.paint(transform);
@@ -411,6 +415,5 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		line = map_interface.new_line();
 		path = map_interface.new_path();
 		set_zoom_label();
-		centre(0, 0);
 	}
 }