[ios[ Adapt GesturesManager/onMapTap and onMapLongPress (#620)

Author: maios

ios/Classes/Extensions.swift

@@ -374,6 +374,14 @@ extension CGPoint {
         return ScreenCoordinate(x: x, y: y)
     }
 }
+
+extension MapboxMaps.MapContentGestureContext {
+
+    func toFLTMapContentGestureContext() -> MapContentGestureContext {
+        MapContentGestureContext(touchPosition: point.toFLTScreenCoordinate(), point: Point(coordinate))
+    }
+}
+
 extension MapboxMaps.CoordinateBoundsZoom {
     func toFLTCoordinateBoundsZoom() -> CoordinateBoundsZoom {
         return CoordinateBoundsZoom(bounds: self.bounds.toFLTCoordinateBounds(), zoom: zoom)

ios/Classes/GesturesController.swift

@@ -2,26 +2,16 @@ import Foundation
 @_spi(Experimental) import MapboxMaps
 import Flutter
 
-final class GesturesController: NSObject, GesturesSettingsInterface, UIGestureRecognizerDelegate, GestureManagerDelegate {
+final class GesturesController: NSObject, GesturesSettingsInterface, UIGestureRecognizerDelegate {
 
+    private var cancelables: Set<AnyCancelable> = []
     private var onGestureListener: GestureListener?
+    private let mapView: MapView
 
-    func gestureManager(_ gestureManager: MapboxMaps.GestureManager, didBegin gestureType: MapboxMaps.GestureType) {}
-
-    func gestureManager(_ gestureManager: MapboxMaps.GestureManager, didEnd gestureType: MapboxMaps.GestureType, willAnimate: Bool) {
-        guard gestureType == .singleTap else {
-            return
-        }
-
-        let touchPoint = gestureManager.singleTapGestureRecognizer.location(in: mapView)
-        let point = Point(mapView.mapboxMap.coordinate(for: touchPoint))
-        let context = MapContentGestureContext(touchPosition: touchPoint.toFLTScreenCoordinate(), point: point)
-
-        onGestureListener?.onTap(context: context, completion: { _ in })
+    init(withMapView mapView: MapView) {
+        self.mapView = mapView
     }
 
-    func gestureManager(_ gestureManager: MapboxMaps.GestureManager, didEndAnimatingFor gestureType: MapboxMaps.GestureType) {}
-
     @objc private func onMapPan(_ sender: UIPanGestureRecognizer) {
         guard sender.state == .began || sender.state == .changed || sender.state == .ended else {
             return
@@ -34,16 +24,6 @@ final class GesturesController: NSObject, GesturesSettingsInterface, UIGestureRe
         onGestureListener?.onScroll(context: context, completion: { _ in })
     }
 
-    @objc private func onMapLongTap(_ sender: UITapGestureRecognizer) {
-        guard sender.state == .ended else { return }
-
-        let touchPoint = sender.location(in: mapView)
-        let point = Point(mapView.mapboxMap.coordinate(for: touchPoint))
-        let context = MapContentGestureContext(touchPosition: touchPoint.toFLTScreenCoordinate(), point: point)
-
-        onGestureListener?.onLongTap(context: context, completion: { _ in })
-    }
-
     func updateSettings(settings: GesturesSettings) throws {
         if let panEnabled = settings.scrollEnabled {
             mapView.gestures.options.panEnabled = panEnabled
@@ -124,23 +104,23 @@ final class GesturesController: NSObject, GesturesSettingsInterface, UIGestureRe
 
     func addListeners(messenger: FlutterBinaryMessenger) {
         removeListeners()
-        gestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(onMapLongTap))
-        mapView.addGestureRecognizer(gestureRecognizer!)
-        mapView.gestures.delegate = self
-        onGestureListener = GestureListener(binaryMessenger: messenger)
         mapView.gestures.panGestureRecognizer.addTarget(self, action: #selector(onMapPan))
-    }
 
-    func removeListeners() {
-        if let gestureRecognizer = self.gestureRecognizer {
-            mapView.removeGestureRecognizer(gestureRecognizer)
+        onGestureListener = GestureListener(binaryMessenger: messenger)
+
+        mapView.gestures.onMapTap.observe { [weak self] context in
+            guard let self else { return }
+            self.onGestureListener?.onTap(context: context.toFLTMapContentGestureContext()) { _ in }
+        }
+        .store(in: &cancelables)
+        mapView.gestures.onMapLongPress.observe { [weak self] context in
+            guard let self else { return }
+            self.onGestureListener?.onLongTap(context: context.toFLTMapContentGestureContext()) { _ in }
         }
+        .store(in: &cancelables)
     }
 
-    private var mapView: MapView
-    private var gestureRecognizer: UIGestureRecognizer?
-
-    init(withMapView mapView: MapView) {
-        self.mapView = mapView
+    func removeListeners() {
+        cancelables = []
     }
 }