Merge pull request #3127 from mapbox/3115-multiple-infowindows

3115 multiple infowindows + leave open while panning

5 files changed, 137 insertions, 57 deletions

diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
index 0f9668be8f..5d4fa91e0b 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
@@ -18,10 +18,13 @@ import java.lang.ref.WeakReference;
 /**
  * A tooltip view
  */
-final class InfoWindow {
+public class InfoWindow {
 
     private WeakReference<Marker> mBoundMarker;
     private WeakReference<MapView> mMapView;
+    private float mMarkerHeightOffset;
+    private float mViewWidthOffset;
+    private PointF mCoordinates;
     private boolean mIsVisible;
     protected View mView;
 
@@ -86,22 +89,26 @@ final class InfoWindow {
         MapView.LayoutParams lp = new MapView.LayoutParams(MapView.LayoutParams.WRAP_CONTENT, MapView.LayoutParams.WRAP_CONTENT);
         mView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
 
-        // Calculate default Android x,y coordinate
-        PointF coords = mMapView.get().toScreenLocation(position);
-        float x = coords.x - (mView.getMeasuredWidth() / 2) + offsetX;
-        float y = coords.y - mView.getMeasuredHeight() + offsetY;
-
-        // get right/left popup window
-        float rightSideInfowWindow = x + mView.getMeasuredWidth();
-        float leftSideInfoWindow = x;
+        // Calculate y-offset for update method
+        mMarkerHeightOffset = -mView.getMeasuredHeight() + offsetY;
 
-        // get right/left map view
-        final float mapRight = mMapView.get().getRight();
-        final float mapLeft = mMapView.get().getLeft();
+        // Calculate default Android x,y coordinate
+        mCoordinates = mMapView.get().toScreenLocation(position);
+        float x = mCoordinates.x - (mView.getMeasuredWidth() / 2) + offsetX;
+        float y = mCoordinates.y - mView.getMeasuredHeight() + offsetY;
 
         if (mView instanceof InfoWindowView) {
             // only apply repositioning/margin for InfoWindowView
             Resources resources = mMapView.get().getContext().getResources();
+
+            // get right/left popup window
+            float rightSideInfowWindow = x + mView.getMeasuredWidth();
+            float leftSideInfoWindow = x;
+
+            // get right/left map view
+            final float mapRight = mMapView.get().getRight();
+            final float mapLeft = mMapView.get().getLeft();
+
             float marginHorizontal = resources.getDimension(R.dimen.infowindow_margin);
             float tipViewOffset = resources.getDimension(R.dimen.infowindow_tipview_width) / 2;
             float tipViewMarginLeft = mView.getMeasuredWidth() / 2 - tipViewOffset;
@@ -129,7 +136,6 @@ final class InfoWindow {
             if (outOfBoundsRight && mapRight - rightSideInfowWindow < marginHorizontal) {
                 x -= marginHorizontal - (mapRight - rightSideInfowWindow);
                 tipViewMarginLeft += marginHorizontal - (mapRight - rightSideInfowWindow) - tipViewOffset;
-
                 leftSideInfoWindow = x;
             }
 
@@ -137,7 +143,6 @@ final class InfoWindow {
             if (outOfBoundsLeft && leftSideInfoWindow - mapLeft < marginHorizontal) {
                 x += marginHorizontal - (leftSideInfoWindow - mapLeft);
                 tipViewMarginLeft -= (marginHorizontal - (leftSideInfoWindow - mapLeft)) - tipViewOffset;
-
             }
 
             // Adjust tipView
@@ -149,6 +154,9 @@ final class InfoWindow {
         mView.setX(x);
         mView.setY(y);
 
+        // Calculate x-offset for update method
+        mViewWidthOffset = x - mCoordinates.x - offsetX;
+
         close(); //if it was already opened
         mMapView.get().addView(mView, lp);
         mIsVisible = true;
@@ -196,7 +204,7 @@ final class InfoWindow {
     }
 
     private void onClose() {
-        mMapView.get().deselectMarker();
+        mMapView.get().deselectMarker(getBoundMarker());
     }
 
     InfoWindow setBoundMarker(Marker boundMarker) {
@@ -226,4 +234,15 @@ final class InfoWindow {
                 .getIdentifier("id/infowindow_subdescription", null, packageName);
         mImageId = context.getResources().getIdentifier("id/infowindow_image", null, packageName);
     }
+
+    public void update() {
+        MapView mapView = mMapView.get();
+        Marker marker = mBoundMarker.get();
+        if (mapView != null && marker != null) {
+            mCoordinates = mapView.toScreenLocation(marker.getPosition());
+            mView.setX(mCoordinates.x + mViewWidthOffset);
+            mView.setY(mCoordinates.y + mMarkerHeightOffset);
+        }
+    }
+
 }
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
index 4f43f9bfa2..ed8e0d98e4 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
@@ -79,9 +79,9 @@ public final class Marker extends Annotation {
     /**
      * Do not use this method. Used internally by the SDK.
      */
-    public void showInfoWindow() {
+    public InfoWindow showInfoWindow() {
         if (getMapView() == null) {
-            return;
+            return null;
         }
 
         MapView.InfoWindowAdapter infoWindowAdapter = getMapView().getInfoWindowAdapter();
@@ -91,17 +91,18 @@ public final class Marker extends Annotation {
             if (content != null) {
                 infoWindow = new InfoWindow(content, getMapView());
                 showInfoWindow(infoWindow);
-                return;
+                return infoWindow;
             }
         }
 
         getInfoWindow().adaptDefaultMarker(this);
-        showInfoWindow(getInfoWindow());
+        return showInfoWindow(getInfoWindow());
     }
 
-    private void showInfoWindow(InfoWindow iw) {
+    private InfoWindow showInfoWindow(InfoWindow iw) {
         iw.open(this, getPosition(), 0, topOffsetPixels);
         infoWindowShown = true;
+        return iw;
     }
 
     private InfoWindow getInfoWindow() {
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index 3755a86dd5..0e4d487af6 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -56,6 +56,7 @@ import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
 import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.annotations.Annotation;
+import com.mapbox.mapboxsdk.annotations.InfoWindow;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Polygon;
@@ -202,7 +203,8 @@ public final class MapView extends FrameLayout {
     // Every annotation that has been added to the map
     private final List<Annotation> mAnnotations = new ArrayList<>();
     private List<Marker> mMarkersNearLastTap = new ArrayList<>();
-    private Marker mSelectedMarker;
+    private List<Marker> mSelectedMarkers = new ArrayList<>();
+    private List<InfoWindow> mInfoWindows = new ArrayList<>();
     private InfoWindowAdapter mInfoWindowAdapter;
     private SpriteFactory mSpriteFactory;
     private ArrayList<Sprite> mSprites = new ArrayList<>();
@@ -239,6 +241,7 @@ public final class MapView extends FrameLayout {
     private boolean mZoomEnabled = true;
     private boolean mScrollEnabled = true;
     private boolean mRotateEnabled = true;
+    private boolean mAllowConcurrentMultipleOpenInfoWindows = false;
     private String mStyleUrl;
 
     //
@@ -849,10 +852,6 @@ public final class MapView extends FrameLayout {
         addOnMapChangedListener(new OnMapChangedListener() {
             @Override
             public void onMapChanged(@MapChange int change) {
-                if ((change == REGION_WILL_CHANGE) || (change == REGION_WILL_CHANGE_ANIMATED)) {
-                    deselectMarker();
-                }
-
                 if (change == DID_FINISH_LOADING_MAP) {
                     reloadSprites();
                     reloadMarkers();
@@ -1337,6 +1336,30 @@ public final class MapView extends FrameLayout {
     }
 
     //
+    // InfoWindows
+    //
+
+    /**
+     * Changes whether the map allows concurrent multiple infowindows to be shown.
+     *
+     * @param allow If true, map allows concurrent multiple infowindows to be shown.
+     */
+    @UiThread
+    public void setAllowConcurrentMultipleOpenInfoWindows(boolean allow) {
+        this.mAllowConcurrentMultipleOpenInfoWindows = allow;
+    }
+
+    /**
+     * Returns whether the map allows concurrent multiple infowindows to be shown.
+     *
+     * @return If true, map allows concurrent multiple infowindows to be shown.
+     */
+    @UiThread
+    public boolean isAllowConcurrentMultipleOpenInfoWindows() {
+        return this.mAllowConcurrentMultipleOpenInfoWindows;
+    }
+
+    //
     // Debug
     //
 
@@ -2047,7 +2070,8 @@ public final class MapView extends FrameLayout {
 
     /**
      * Selects a marker. The selected marker will have it's info window opened.
-     * Any other open info windows will be closed.
+     * Any other open info windows will be closed unless isAllowConcurrentMultipleOpenInfoWindows()
+     * is true.
      * <p/>
      * Selecting an already selected marker will have no effect.
      *
@@ -2060,12 +2084,14 @@ public final class MapView extends FrameLayout {
             return;
         }
 
-        if (marker == mSelectedMarker) {
+        if (mSelectedMarkers.contains(marker)) {
             return;
         }
 
         // Need to deselect any currently selected annotation first
-        deselectMarker();
+        if (!isAllowConcurrentMultipleOpenInfoWindows()) {
+            deselectMarkers();
+        }
 
         boolean handledDefaultClick = false;
         if (mOnMarkerClickListener != null) {
@@ -2074,26 +2100,46 @@ public final class MapView extends FrameLayout {
         }
 
         if (!handledDefaultClick) {
-            // default behaviour
-            // Can't do this as InfoWindow will get hidden
-            //setCenterCoordinate(marker.getPosition(), true);
-            marker.showInfoWindow();
+            // default behaviour show InfoWindow
+            mInfoWindows.add(marker.showInfoWindow());
         }
 
-        mSelectedMarker = marker;
+        mSelectedMarkers.add(marker);
     }
 
     /**
-     * Deselects any currently selected marker. The selected marker will have it's info window closed.
+     * Deselects any currently selected marker. All markers will have it's info window closed.
      */
     @UiThread
-    public void deselectMarker() {
-        if (mSelectedMarker != null) {
-            if (mSelectedMarker.isInfoWindowShown()) {
-                mSelectedMarker.hideInfoWindow();
-                mSelectedMarker = null;
+    public void deselectMarkers() {
+        if (mSelectedMarkers.isEmpty()) {
+            return;
+        }
+
+        for (Marker marker : mSelectedMarkers) {
+            if (marker.isInfoWindowShown()) {
+                marker.hideInfoWindow();
             }
         }
+
+        // Removes all selected markers from the list
+        mSelectedMarkers.clear();
+    }
+
+    /**
+     * Deselects a currently selected marker. The selected marker will have it's info window closed.
+     */
+    @UiThread
+    public void deselectMarker(@NonNull Marker marker) {
+        if (!mSelectedMarkers.contains(marker)) {
+            return;
+        }
+
+        if (marker.isInfoWindowShown()) {
+            marker.hideInfoWindow();
+        }
+
+        mSelectedMarkers.remove(marker);
     }
 
     //
@@ -2171,8 +2217,8 @@ public final class MapView extends FrameLayout {
      */
     @UiThread
     @Nullable
-    public Marker getSelectedMarker() {
-        return mSelectedMarker;
+    public List<Marker> getSelectedMarkers() {
+        return mSelectedMarkers;
     }
 
     private void adjustTopOffsetPixels() {
@@ -2186,12 +2232,12 @@ public final class MapView extends FrameLayout {
             }
         }
 
-        if (mSelectedMarker != null) {
-            if (mSelectedMarker.isInfoWindowShown()) {
-                Marker temp = mSelectedMarker;
+        for (Marker marker : mSelectedMarkers) {
+            if (marker.isInfoWindowShown()) {
+                Marker temp = marker;
                 temp.hideInfoWindow();
                 temp.showInfoWindow();
-                mSelectedMarker = temp;
+                marker = temp;
             }
         }
     }
@@ -2272,6 +2318,9 @@ public final class MapView extends FrameLayout {
         public void onSurfaceTextureUpdated(SurfaceTexture surface) {
             mCompassView.update(getDirection());
             mUserLocationView.update();
+            for (InfoWindow infoWindow : mInfoWindows) {
+                infoWindow.update();
+            }
         }
     }
 
@@ -2482,19 +2531,24 @@ public final class MapView extends FrameLayout {
                 Collections.sort(nearbyMarkers);
 
                 if (nearbyMarkers == mMarkersNearLastTap) {
+
+                    // TODO: We still need to adapt this logic to the new mSelectedMarkers list,
+                    // though the basic functionality is there.
+
                     // the selection candidates haven't changed; cycle through them
-                    if (mSelectedMarker != null && (mSelectedMarker.getId() == mMarkersNearLastTap.get(mMarkersNearLastTap.size() - 1).getId())) {
-                        // the selected marker is the last in the set; cycle back to the first
-                        // note: this could be the selected marker if only one in set
-                        newSelectedMarkerId = mMarkersNearLastTap.get(0).getId();
-                    } else if (mSelectedMarker != null) {
-                        // otherwise increment the selection through the candidates
-                        long result = mMarkersNearLastTap.indexOf(mSelectedMarker);
-                        newSelectedMarkerId = mMarkersNearLastTap.get((int) result + 1).getId();
-                    } else {
+//                    if (mSelectedMarker != null
+//                            && (mSelectedMarker.getId() == mMarkersNearLastTap.get(mMarkersNearLastTap.size() - 1).getId())) {
+//                        // the selected marker is the last in the set; cycle back to the first
+//                        // note: this could be the selected marker if only one in set
+//                        newSelectedMarkerId = mMarkersNearLastTap.get(0).getId();
+//                    } else if (mSelectedMarker != null) {
+//                        // otherwise increment the selection through the candidates
+//                        long result = mMarkersNearLastTap.indexOf(mSelectedMarker);
+//                        newSelectedMarkerId = mMarkersNearLastTap.get((int) result + 1).getId();
+//                    } else {
                         // no current selection; select the first one
                         newSelectedMarkerId = mMarkersNearLastTap.get(0).getId();
-                    }
+//                    }
                 } else {
                     // start tracking a new set of nearby markers
                     mMarkersNearLastTap = nearbyMarkers;
@@ -2515,7 +2569,7 @@ public final class MapView extends FrameLayout {
                     Annotation annotation = mAnnotations.get(i);
                     if (annotation instanceof Marker) {
                         if (annotation.getId() == newSelectedMarkerId) {
-                            if (mSelectedMarker == null || annotation.getId() != mSelectedMarker.getId()) {
+                            if (mSelectedMarkers.isEmpty() || !mSelectedMarkers.contains(annotation)) {
                                 selectMarker((Marker) annotation);
                             }
                             break;
@@ -2525,7 +2579,7 @@ public final class MapView extends FrameLayout {
 
             } else {
                 // deselect any selected marker
-                deselectMarker();
+                deselectMarkers();
 
                 // notify app of map click
                 if (mOnMapClickListener != null) {
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java
index f53f923b0e..5764b67017 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java
@@ -35,6 +35,9 @@ public class InfoWindowActivity extends AppCompatActivity {
         mMapView.setAccessToken(ApiAccess.getToken(this));
         mMapView.onCreate(savedInstanceState);
 
+        // Enable to let concurrent multiple infowindows to be shown.
+        //mMapView.setAllowConcurrentMultipleOpenInfoWindows(true);
+
         mMapView.addMarker(new MarkerOptions()
                 .title("Intersection")
                 .snippet("H St NW with 15th St NW")
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
index e78d3f2736..293893069b 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
@@ -63,6 +63,9 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
             }
         });
 
+        // Enable to let concurrent multiple infowindows to be shown.
+        //mMapView.setAllowConcurrentMultipleOpenInfoWindows(true);
+
         mMapView.addMarker(generateMarker("Andorra", 42.505777, 1.52529, "#F44336"));
         mMapView.addMarker(generateMarker("Luxembourg", 49.815273, 6.129583, "#3F51B5"));
         mMapView.addMarker(generateMarker("Monaco", 43.738418, 7.424616, "#673AB7"));