From d4a722571b875016e6752e91f134a6bbcaf08b7f Mon Sep 17 00:00:00 2001
From: Fynn Godau <fynngodau@mailbox.org>
Date: Mon, 16 Jan 2023 11:59:41 +0100
Subject: [PATCH] Fix draggable markers

---
 .../main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt   | 7 ++++++-
 .../kotlin/org/microg/gms/maps/mapbox/model/Marker.kt     | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
index 1ca155ec4..deb3626ad 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
@@ -684,7 +684,12 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
 
                     override fun onAnnotationDrag(annotation: Symbol?) {
                         try {
-                            markers[annotation?.id]?.let { markerDragListener?.onMarkerDrag(it) }
+                            annotation?.let { symbol ->
+                                markers[symbol.id]?.let { marker ->
+                                    marker.setPositionWhileDragging(symbol.latLng.toGms())
+                                    markerDragListener?.onMarkerDrag(marker)
+                                }
+                            }
                         } catch (e: Exception) {
                             Log.w(TAG, e)
                         }
diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt
index 06da36578..2aaf4da31 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/Marker.kt
@@ -87,6 +87,14 @@ class MarkerImpl(private val map: GoogleMapImpl, private val id: String, options
         map.symbolManager?.let { update(it) }
     }
 
+    /**
+     * New position is already reflected on map while if drag is in progress. Calling
+     * `symbolManager.update` would interrupt the drag.
+     */
+    internal fun setPositionWhileDragging(position: LatLng) {
+        this.position = position
+    }
+
     override fun getPosition(): LatLng = position
 
     override fun setTitle(title: String?) {
-- 
GitLab