Update java library versions

[fw/altos] / altoslib / AltosMap.java

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 85f95eef9cfdf3af49cae55224b6d1b165dd9ae5..6c08f2d73ddcae1d0cc31caa89da8e93528cc424 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_9;
 
 import java.io.*;
 import java.lang.*;
@@ -109,12 +109,16 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                return map_interface.height();
        }
 
-       public AltosPointInt floor(AltosPointDouble point) {
+       public void debug(String format, Object ... arguments) {
+               map_interface.debug(format, arguments);
+       }
+
+       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);
        }
@@ -127,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)
@@ -162,6 +170,7 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
 
        public boolean set_zoom(int zoom) {
+               notice_user_input();
                if (AltosMap.min_zoom <= zoom && zoom <= AltosMap.max_zoom && zoom != this.zoom) {
                        this.zoom = zoom;
                        tiles.clear();
@@ -172,6 +181,29 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                return false;
        }
 
+       public boolean set_zoom_centre(int zoom, AltosPointInt centre) {
+               AltosLatLon     mouse_lat_lon = null;
+               boolean         ret;
+
+               if (transform != null)
+                       mouse_lat_lon = transform.screen_lat_lon(centre);
+
+               ret = set_zoom(zoom);
+
+               if (ret && mouse_lat_lon != null) {
+                       AltosPointDouble        new_mouse = transform.screen(mouse_lat_lon);
+
+                       double  dx = width()/2.0 - centre.x;
+                       double  dy = height()/2.0 - centre.y;
+
+                       AltosLatLon     new_centre = transform.screen_lat_lon(new AltosPointDouble(new_mouse.x + dx, new_mouse.y + dy));
+
+                       centre(new_centre);
+               }
+
+               return ret;
+       }
+
        public int get_zoom() {
                return zoom;
        }
@@ -198,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);
@@ -276,29 +308,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);
                                }
                        }
@@ -331,6 +357,9 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                if (centre != null)
                        make_tiles();
 
+               if (transform == null)
+                       return;
+
                for (AltosMapTile tile : tiles.values())
                        tile.paint(transform);
 
@@ -369,6 +398,10 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
        AltosPointInt   drag_start;
 
+       boolean         dragged;
+
+       static final double drag_far = 20;
+
        private void drag(int x, int y) {
                if (drag_start == null)
                        return;
@@ -376,6 +409,16 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                int dx = x - drag_start.x;
                int dy = y - drag_start.y;
 
+               double distance = Math.hypot(dx, dy);
+
+               if (distance > drag_far)
+                       dragged = true;
+
+               if (transform == null) {
+                       debug("Transform not set in drag\n");
+                       return;
+               }
+
                AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointInt(width() / 2 - dx, height() / 2 - dy));
                centre(new_centre);
                drag_start = new AltosPointInt(x, y);
@@ -383,6 +426,17 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 
        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) {
+                               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) {
@@ -415,6 +469,12 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
                        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);