altosdroid: Select tracker by clicking on map

[fw/altos] / altoslib / AltosMap.java

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index 59420d4b389bf7c2c4b27142419bdbd320ddd3c6..8d12a18094007c7cbf30b555c1a52acf49598227 100644 (file)
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -166,6 +166,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();
@@ -176,6 +177,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;
        }
@@ -367,6 +391,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;
@@ -374,6 +402,11 @@ 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;
@@ -386,6 +419,12 @@ 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)
+                       map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
        }
 
        private void line_start(int x, int y) {
@@ -418,6 +457,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);