Update java library version numbers

[fw/altos] / altoslib / AltosMap.java

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 8d12a18094007c7cbf30b555c1a52acf49598227..9fbb94a6e1f5870f6ba13646ed19000fbb0c6d8f 100644 (file)
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -15,7 +15,7 @@
  * 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.*;
@@ -113,12 +113,12 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                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);
        }
 
-       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);
        }
@@ -131,6 +131,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                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)
@@ -226,23 +230,23 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                if (!gps.locked && gps.nsat < 4)
                        return;
 
-               switch (state.state) {
+               switch (state.state()) {
                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) {
-                               add_mark(gps.lat, gps.lon, state.state);
+                               add_mark(gps.lat, gps.lon, state.state());
                                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);
@@ -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())));
                }
-               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);
@@ -353,6 +361,9 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                if (centre != null)
                        make_tiles();
 
+               if (transform == null)
+                       return;
+
                for (AltosMapTile tile : tiles.values())
                        tile.paint(transform);
 
@@ -370,7 +381,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
        /* 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);
@@ -423,8 +437,13 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
        }
 
        private void drag_stop(int x, int y) {
-               if (!dragged)
+               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)));
+               }
        }
 
        private void line_start(int x, int y) {