Enable drag annotation while changing the annotation to draggable in …

…long click (#990)
mapbox · Dec 16, 2021 · 1f5b9f8 · 1f5b9f8
1 parent fe87eab
commit 1f5b9f8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 19 deletions.
diff --git a/...main/java/com/mapbox/maps/testapp/examples/markersandcallouts/CircleAnnotationActivity.kt b/...main/java/com/mapbox/maps/testapp/examples/markersandcallouts/CircleAnnotationActivity.kt
@@ -31,6 +31,7 @@ class CircleAnnotationActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     binding = ActivityAnnotationBinding.inflate(layoutInflater)
     setContentView(binding.root)
+    Toast.makeText(this, "Long click a circle to start dragging.", Toast.LENGTH_LONG).show()
     annotationPlugin = binding.mapView.annotations
     circleAnnotationManager = annotationPlugin.createCircleAnnotationManager().apply {
       addClickListener(
@@ -40,6 +41,14 @@ class CircleAnnotationActivity : AppCompatActivity() {
           false
         }
       )
+      addLongClickListener(
+        OnCircleAnnotationLongClickListener {
+          it.isDraggable = true
+          Toast.makeText(this@CircleAnnotationActivity, "long click: ${it.id}", Toast.LENGTH_SHORT)
+            .show()
+          false
+        }
+      )
       binding.mapView.getMapboxMap().loadStyleUri(nextStyle) {
         addInteractionListener(
           object : OnCircleAnnotationInteractionListener {
@@ -64,7 +73,7 @@ class CircleAnnotationActivity : AppCompatActivity() {
           .withPoint(Point.fromLngLat(CIRCLE_LONGITUDE, CIRCLE_LATITUDE))
           .withCircleColor(Color.YELLOW)
           .withCircleRadius(12.0)
-          .withDraggable(true)
+          .withDraggable(false)
         create(circleAnnotationOptions)
 
         // random add circles across the globe
@@ -76,7 +85,7 @@ class CircleAnnotationActivity : AppCompatActivity() {
               .withPoint(AnnotationUtils.createRandomPoint())
               .withCircleColor(color)
               .withCircleRadius(8.0)
-              .withDraggable(true)
+              .withDraggable(false)
           )
         }
         create(circleAnnotationOptionsList)

diff --git a/plugin-annotation/src/main/java/com/mapbox/maps/plugin/annotation/AnnotationManagerImpl.kt b/plugin-annotation/src/main/java/com/mapbox/maps/plugin/annotation/AnnotationManagerImpl.kt
@@ -398,7 +398,10 @@ abstract class AnnotationManagerImpl<G : Geometry, T : Annotation<G>, S : Annota
       dragSource?.let { geoJsonSource ->
         dragLayer?.let { layer ->
           if (!style.styleSourceExists(geoJsonSource.sourceId) || !style.styleLayerExists(layer.layerId)) {
-            Logger.e(TAG, "Can't update dragSource: drag source or layer has not been added to style.")
+            Logger.e(
+              TAG,
+              "Can't update dragSource: drag source or layer has not been added to style."
+            )
             return@getStyle
           }
           addIconToStyle(style, dragAnnotationMap.values)
@@ -675,19 +678,31 @@ abstract class AnnotationManagerImpl<G : Geometry, T : Annotation<G>, S : Annota
           stopDragging()
           return true
         }
-        val shiftedGeometry: G? = delegateProvider.let {
+
+        if (annotationMap.containsKey(annotation.id)) {
+          // Delete the dragging annotation from original source and add it to drag source
+          annotationMap.remove(annotation.id)
+          dragAnnotationMap[annotation.id] = annotation
+          updateSource()
+        }
+
+        delegateProvider.let {
           annotation.getOffsetGeometry(
             it.mapCameraManagerDelegate, moveObject
           )
-        }
-        shiftedGeometry?.let { geometry ->
+        }?.let { geometry ->
           annotation.geometry = geometry
           updateDragSource()
           dragListeners.forEach {
             it.onAnnotationDrag(annotation)
           }
           return true
         }
+
+        /* The dragging annotation has been removed from original source,
+         update drag source to make sure it is shown in drag layer.
+         */
+        updateDragSource()
       }
       return false
     }
@@ -701,19 +716,9 @@ abstract class AnnotationManagerImpl<G : Geometry, T : Annotation<G>, S : Annota
     }
 
     private fun startDragging(annotation: T): Boolean {
-      if (annotation.isDraggable) {
-        dragListeners.forEach { it.onAnnotationDragStarted(annotation) }
-        draggingAnnotation = annotation
-        if (annotationMap.containsKey(annotation.id)) {
-          // Delete the dragging annotation from original source and add it to drag source
-          annotationMap.remove(annotation.id)
-          dragAnnotationMap[annotation.id] = annotation
-          updateSource()
-          updateDragSource()
-        }
-        return true
-      }
-      return false
+      dragListeners.forEach { it.onAnnotationDragStarted(annotation) }
+      draggingAnnotation = annotation
+      return true
     }
 
     private fun stopDragging() {