CP 1125

plugin-annotation/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+### mapbox-android-plugin-annotation-v9:0.9.0 - XXX
+#### Bugs
+- Consumable events for click listeners [1124](https://github.com/mapbox/mapbox-plugins-android/pull/1124)
+- Support multiple manager to be draggable [1125](https://github.com/mapbox/mapbox-plugins-android/pull/1125)
+- End of drag event is consumed [1141](https://github.com/mapbox/mapbox-plugins-android/pull/1141)
+
 ### mapbox-android-plugin-annotation-v9:0.8.0 - March 5, 2020
 #### Features
 - Switching all plugins to AndroidX [#1100](https://github.com/mapbox/mapbox-plugins-android/pull/1100)

plugin-annotation/scripts/annotation_manager.java.ejs

@@ -74,11 +74,11 @@ public class <%- camelize(type) %>Manager extends AnnotationManager<<%- camelize
    */
   @UiThread
   public <%- camelize(type) %>Manager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions) {
-    this(mapView, mapboxMap, style, new <%- camelize(type) %>ElementProvider(), belowLayerId, geoJsonOptions, new DraggableAnnotationController<<%- camelize(type) %>, On<%- camelize(type) %>DragListener>(mapView, mapboxMap));
+    this(mapView, mapboxMap, style, new <%- camelize(type) %>ElementProvider(), belowLayerId, geoJsonOptions, DraggableAnnotationController.getInstance(mapView, mapboxMap));
   }
 
   @VisibleForTesting
-  <%- camelize(type) %>Manager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<<%- camelize(type) %>Layer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController<<%- camelize(type) %>, On<%- camelize(type) %>DragListener> draggableAnnotationController) {
+  <%- camelize(type) %>Manager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<<%- camelize(type) %>Layer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController draggableAnnotationController) {
     super(mapView, mapboxMap, style, coreElementProvider, draggableAnnotationController, belowLayerId, geoJsonOptions);
   }
 

plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.*;
 
 public class <%- camelize(type) %>ManagerTest {
 
-  private DraggableAnnotationController<<%- camelize(type) %>, On<%- camelize(type) %>DragListener> draggableAnnotationController = mock(DraggableAnnotationController.class);
+  private DraggableAnnotationController draggableAnnotationController = mock(DraggableAnnotationController.class);
   private MapView mapView = mock(MapView.class);
   private MapboxMap mapboxMap = mock(MapboxMap.class);
   private Style style = mock(Style.class);

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java

@@ -51,7 +51,6 @@ public abstract class AnnotationManager<
   final Map<String, PropertyValue> constantPropertyUsageMap = new HashMap<>();
   Expression layerFilter;
 
-  private final DraggableAnnotationController<T, D> draggableAnnotationController;
   private final List<D> dragListeners = new ArrayList<>();
   private final List<U> clickListeners = new ArrayList<>();
   private final List<V> longClickListeners = new ArrayList<>();
@@ -63,25 +62,26 @@ public abstract class AnnotationManager<
   private Style style;
   private String belowLayerId;
   private CoreElementProvider<L> coreElementProvider;
+  private DraggableAnnotationController draggableAnnotationController;
 
   @UiThread
   protected AnnotationManager(MapView mapView, final MapboxMap mapboxMap, Style style,
                               CoreElementProvider<L> coreElementProvider,
-                              DraggableAnnotationController<T, D> draggableAnnotationController,
+                              DraggableAnnotationController draggableAnnotationController,
                               String belowLayerId, final GeoJsonOptions geoJsonOptions) {
     this.mapboxMap = mapboxMap;
     this.style = style;
     this.belowLayerId = belowLayerId;
     this.coreElementProvider = coreElementProvider;
+    this.draggableAnnotationController = draggableAnnotationController;
 
     if (!style.isFullyLoaded()) {
       throw new RuntimeException("The style has to be non-null and fully loaded.");
     }
 
     mapboxMap.addOnMapClickListener(mapClickResolver = new MapClickResolver());
     mapboxMap.addOnMapLongClickListener(mapClickResolver);
-    this.draggableAnnotationController = draggableAnnotationController;
-    draggableAnnotationController.injectAnnotationManager(this);
+    draggableAnnotationController.addAnnotationManager(this);
 
     initializeSourcesAndLayers(geoJsonOptions);
 
@@ -332,6 +332,7 @@ List<D> getDragListeners() {
   public void onDestroy() {
     mapboxMap.removeOnMapClickListener(mapClickResolver);
     mapboxMap.removeOnMapLongClickListener(mapClickResolver);
+    draggableAnnotationController.removeAnnotationManager(this);
     dragListeners.clear();
     clickListeners.clear();
     longClickListeners.clear();

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java

@@ -68,11 +68,11 @@ public CircleManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @No
    */
   @UiThread
   public CircleManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions) {
-    this(mapView, mapboxMap, style, new CircleElementProvider(), belowLayerId, geoJsonOptions, new DraggableAnnotationController<Circle, OnCircleDragListener>(mapView, mapboxMap));
+    this(mapView, mapboxMap, style, new CircleElementProvider(), belowLayerId, geoJsonOptions, DraggableAnnotationController.getInstance(mapView, mapboxMap));
   }
 
   @VisibleForTesting
-  CircleManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<CircleLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController<Circle, OnCircleDragListener> draggableAnnotationController) {
+  CircleManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<CircleLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController draggableAnnotationController) {
     super(mapView, mapboxMap, style, coreElementProvider, draggableAnnotationController, belowLayerId, geoJsonOptions);
   }
 

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java

@@ -5,28 +5,54 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.annotation.VisibleForTesting;
+
 import com.mapbox.android.gestures.AndroidGesturesManager;
 import com.mapbox.android.gestures.MoveDistancesObject;
 import com.mapbox.android.gestures.MoveGestureDetector;
 import com.mapbox.geojson.Geometry;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.List;
+
+@UiThread
+final class DraggableAnnotationController {
+
+  private static DraggableAnnotationController INSTANCE = null;
+
+  public static DraggableAnnotationController getInstance(MapView mapView, MapboxMap mapboxMap) {
+    if (INSTANCE == null || INSTANCE.mapView != mapView || INSTANCE.mapboxMap != mapboxMap) {
+      INSTANCE = new DraggableAnnotationController(mapView, mapboxMap);
+    }
+    return INSTANCE;
+  }
+
+  private static void clearInstance() {
+    if (INSTANCE != null) {
+      INSTANCE.mapView = null;
+      INSTANCE.mapboxMap = null;
+      INSTANCE = null;
+    }
+  }
 
-final class DraggableAnnotationController<T extends Annotation, D extends OnAnnotationDragListener<T>> {
-  private final MapboxMap mapboxMap;
-  private AnnotationManager<?, T, ?, D, ?, ?> annotationManager;
+  private MapView mapView;
+  private MapboxMap mapboxMap;
+  private List<AnnotationManager> annotationManagers = new ArrayList<>();
 
   private final int touchAreaShiftX;
   private final int touchAreaShiftY;
   private final int touchAreaMaxX;
   private final int touchAreaMaxY;
 
   @Nullable
-  private T draggedAnnotation;
+  private Annotation draggedAnnotation;
+  @Nullable
+  private AnnotationManager draggedAnnotationManager;
 
   @SuppressLint("ClickableViewAccessibility")
   DraggableAnnotationController(MapView mapView, MapboxMap mapboxMap) {
@@ -39,6 +65,7 @@ public DraggableAnnotationController(MapView mapView, MapboxMap mapboxMap,
                                        final AndroidGesturesManager androidGesturesManager,
                                        int touchAreaShiftX, int touchAreaShiftY,
                                        int touchAreaMaxX, int touchAreaMaxY) {
+    this.mapView = mapView;
     this.mapboxMap = mapboxMap;
     this.touchAreaShiftX = touchAreaShiftX;
     this.touchAreaShiftY = touchAreaShiftY;
@@ -50,27 +77,37 @@ public DraggableAnnotationController(MapView mapView, MapboxMap mapboxMap,
     mapView.setOnTouchListener(new View.OnTouchListener() {
       @Override
       public boolean onTouch(View v, MotionEvent event) {
+        // Using active gesture manager
         Annotation oldAnnotation = draggedAnnotation;
         androidGesturesManager.onTouchEvent(event);
         // if drag is started or drag is finished, don't pass motion events further
-        return draggedAnnotation != null || oldAnnotation != draggedAnnotation;
+        return draggedAnnotation != null || oldAnnotation != null;
       }
     });
   }
 
-  void injectAnnotationManager(AnnotationManager<?, T, ?, D, ?, ?> annotationManager) {
-    this.annotationManager = annotationManager;
+  void addAnnotationManager(AnnotationManager annotationManager) {
+    this.annotationManagers.add(annotationManager);
+  }
+
+  void removeAnnotationManager(AnnotationManager annotationManager) {
+    this.annotationManagers.remove(annotationManager);
+    if (annotationManagers.isEmpty()) {
+      clearInstance();
+    }
   }
 
   void onSourceUpdated() {
-    stopDragging(draggedAnnotation);
+    stopDragging(draggedAnnotation, draggedAnnotationManager);
   }
 
   boolean onMoveBegin(MoveGestureDetector detector) {
-    if (detector.getPointersCount() == 1) {
-      T annotation = annotationManager.queryMapForFeatures(detector.getFocalPoint());
-      if (annotation != null) {
-        return startDragging(annotation);
+    for (AnnotationManager annotationManager : annotationManagers) {
+      if (detector.getPointersCount() == 1) {
+        Annotation annotation = annotationManager.queryMapForFeatures(detector.getFocalPoint());
+        if (annotation != null && startDragging(annotation, annotationManager)) {
+          return true;
+        }
       }
     }
     return false;
@@ -79,7 +116,7 @@ boolean onMoveBegin(MoveGestureDetector detector) {
   boolean onMove(MoveGestureDetector detector) {
     if (draggedAnnotation != null && (detector.getPointersCount() > 1 || !draggedAnnotation.isDraggable())) {
       // Stopping the drag when we don't work with a simple, on-pointer move anymore
-      stopDragging(draggedAnnotation);
+      stopDragging(draggedAnnotation, draggedAnnotationManager);
       return true;
     }
 
@@ -93,7 +130,7 @@ boolean onMove(MoveGestureDetector detector) {
       PointF pointF = new PointF(x, y);
 
       if (pointF.x < 0 || pointF.y < 0 || pointF.x > touchAreaMaxX || pointF.y > touchAreaMaxY) {
-        stopDragging(draggedAnnotation);
+        stopDragging(draggedAnnotation, draggedAnnotationManager);
         return true;
       }
 
@@ -105,11 +142,9 @@ boolean onMove(MoveGestureDetector detector) {
         draggedAnnotation.setGeometry(
           shiftedGeometry
         );
-        annotationManager.internalUpdateSource();
-        if (!annotationManager.getDragListeners().isEmpty()) {
-          for (D d : annotationManager.getDragListeners()) {
-            d.onAnnotationDrag(draggedAnnotation);
-          }
+        draggedAnnotationManager.internalUpdateSource();
+        for (OnAnnotationDragListener d : (List<OnAnnotationDragListener>) draggedAnnotationManager.getDragListeners()) {
+          d.onAnnotationDrag(draggedAnnotation);
         }
         return true;
       }
@@ -120,31 +155,29 @@ boolean onMove(MoveGestureDetector detector) {
 
   void onMoveEnd() {
     // Stopping the drag when move ends
-    stopDragging(draggedAnnotation);
+    stopDragging(draggedAnnotation, draggedAnnotationManager);
   }
 
-  boolean startDragging(@NonNull T annotation) {
+  boolean startDragging(@NonNull Annotation annotation, @NonNull AnnotationManager annotationManager) {
     if (annotation.isDraggable()) {
-      if (!annotationManager.getDragListeners().isEmpty()) {
-        for (D d : annotationManager.getDragListeners()) {
-          d.onAnnotationDragStarted(annotation);
-        }
+      for (OnAnnotationDragListener d : (List<OnAnnotationDragListener>) annotationManager.getDragListeners()) {
+        d.onAnnotationDragStarted(annotation);
       }
       draggedAnnotation = annotation;
+      draggedAnnotationManager = annotationManager;
       return true;
     }
     return false;
   }
 
-  void stopDragging(@Nullable T annotation) {
-    if (annotation != null) {
-      if (!annotationManager.getDragListeners().isEmpty()) {
-        for (D d : annotationManager.getDragListeners()) {
-          d.onAnnotationDragFinished(annotation);
-        }
+  void stopDragging(@Nullable Annotation annotation, @Nullable AnnotationManager annotationManager) {
+    if (annotation != null && annotationManager != null) {
+      for (OnAnnotationDragListener d : (List<OnAnnotationDragListener>) annotationManager.getDragListeners()) {
+        d.onAnnotationDragFinished(annotation);
       }
     }
     draggedAnnotation = null;
+    draggedAnnotationManager = null;
   }
 
   private class AnnotationMoveGestureListener implements MoveGestureDetector.OnMoveGestureListener {
@@ -164,4 +197,4 @@ public void onMoveEnd(MoveGestureDetector detector, float velocityX, float veloc
       DraggableAnnotationController.this.onMoveEnd();
     }
   }
-}
+}

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java

@@ -67,11 +67,11 @@ public FillManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonN
    */
   @UiThread
   public FillManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions) {
-    this(mapView, mapboxMap, style, new FillElementProvider(), belowLayerId, geoJsonOptions, new DraggableAnnotationController<Fill, OnFillDragListener>(mapView, mapboxMap));
+    this(mapView, mapboxMap, style, new FillElementProvider(), belowLayerId, geoJsonOptions, DraggableAnnotationController.getInstance(mapView, mapboxMap));
   }
 
   @VisibleForTesting
-  FillManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<FillLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController<Fill, OnFillDragListener> draggableAnnotationController) {
+  FillManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<FillLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController draggableAnnotationController) {
     super(mapView, mapboxMap, style, coreElementProvider, draggableAnnotationController, belowLayerId, geoJsonOptions);
   }
 

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java

@@ -70,11 +70,11 @@ public LineManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonN
    */
   @UiThread
   public LineManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions) {
-    this(mapView, mapboxMap, style, new LineElementProvider(), belowLayerId, geoJsonOptions, new DraggableAnnotationController<Line, OnLineDragListener>(mapView, mapboxMap));
+    this(mapView, mapboxMap, style, new LineElementProvider(), belowLayerId, geoJsonOptions, DraggableAnnotationController.getInstance(mapView, mapboxMap));
   }
 
   @VisibleForTesting
-  LineManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<LineLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController<Line, OnLineDragListener> draggableAnnotationController) {
+  LineManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<LineLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController draggableAnnotationController) {
     super(mapView, mapboxMap, style, coreElementProvider, draggableAnnotationController, belowLayerId, geoJsonOptions);
   }
 

plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java

@@ -90,11 +90,11 @@ public SymbolManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @No
    */
   @UiThread
   public SymbolManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions) {
-    this(mapView, mapboxMap, style, new SymbolElementProvider(), belowLayerId, geoJsonOptions, new DraggableAnnotationController<Symbol, OnSymbolDragListener>(mapView, mapboxMap));
+    this(mapView, mapboxMap, style, new SymbolElementProvider(), belowLayerId, geoJsonOptions, DraggableAnnotationController.getInstance(mapView, mapboxMap));
   }
 
   @VisibleForTesting
-  SymbolManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<SymbolLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController<Symbol, OnSymbolDragListener> draggableAnnotationController) {
+  SymbolManager(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, @NonNull Style style, @NonNull CoreElementProvider<SymbolLayer> coreElementProvider, @Nullable String belowLayerId, @Nullable GeoJsonOptions geoJsonOptions, DraggableAnnotationController draggableAnnotationController) {
     super(mapView, mapboxMap, style, coreElementProvider, draggableAnnotationController, belowLayerId, geoJsonOptions);
   }
 

plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java

@@ -32,7 +32,7 @@
 
 public class CircleManagerTest {
 
-  private DraggableAnnotationController<Circle, OnCircleDragListener> draggableAnnotationController = mock(DraggableAnnotationController.class);
+  private DraggableAnnotationController draggableAnnotationController = mock(DraggableAnnotationController.class);
   private MapView mapView = mock(MapView.class);
   private MapboxMap mapboxMap = mock(MapboxMap.class);
   private Style style = mock(Style.class);