altosdroid: Pop up menu of nearby trackers on map click

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosMapOffline.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 5240d61ce75476ce4942889f1dcf3aed35d064b4..0bf6ab20c7a458dbc1732b0a633f67873b32c155 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -253,6 +253,8 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
        public void select_object(AltosLatLon latlon) {
                if (map.transform == null)
                        return;
+               ArrayList<Integer>      near = new ArrayList<Integer>();
+
                for (Rocket rocket : sorted_rockets()) {
                        if (rocket.position == null) {
                                debug("rocket %d has no position\n", rocket.serial);
@@ -262,10 +264,11 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
                        debug("check select %d distance %g width %d\n", rocket.serial, distance, rocket_bitmap.getWidth());
                        if (distance < rocket_bitmap.getWidth() * 2.0) {
                                debug("selecting %d\n", rocket.serial);
-                               altos_droid.select_tracker(rocket.serial);
-                               break;
+                               near.add(rocket.serial);
                        }
                }
+               if (near.size() != 0)
+                       altos_droid.touch_trackers(near.toArray(new Integer[0]));
        }
 
        class Line {
@@ -359,7 +362,6 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 
        @Override
        protected void onDraw(Canvas view_canvas) {
-               debug("onDraw");
                if (map == null) {
                        debug("MapView draw without map\n");
                        return;