ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix map annotation switching

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-11-25 19:19:01 +04:00
parent 4baf8ddbf9
commit 06f3b42cde
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
submodules/LocationUI/Sources/LocationMapNode.swift
View File

@@ -33,6 +33,7 @@ class LocationMapNode: ASDisplayNode, MKMapViewDelegate {
} }
var ignoreRegionChanges = false var ignoreRegionChanges = false
var dragging = false
var beganInteractiveDragging: (() -> Void)? var beganInteractiveDragging: (() -> Void)?
var endedInteractiveDragging: ((CLLocationCoordinate2D) -> Void)? var endedInteractiveDragging: ((CLLocationCoordinate2D) -> Void)?
var annotationSelected: ((LocationPinAnnotation?) -> Void)? var annotationSelected: ((LocationPinAnnotation?) -> Void)?
@@ -93,6 +94,7 @@ class LocationMapNode: ASDisplayNode, MKMapViewDelegate {
for gestureRecognizer in gestureRecognizers { for gestureRecognizer in gestureRecognizers {
if gestureRecognizer.state == .began || gestureRecognizer.state == .ended { if gestureRecognizer.state == .began || gestureRecognizer.state == .ended {
self.dragging = true
self.beganInteractiveDragging?() self.beganInteractiveDragging?()
break break
} }
@@ -100,7 +102,8 @@ class LocationMapNode: ASDisplayNode, MKMapViewDelegate {
} }
func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) { func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
if !self.ignoreRegionChanges, let coordinate = self.mapCenterCoordinate { if self.dragging, let coordinate = self.mapCenterCoordinate {
self.dragging = false
self.endedInteractiveDragging?(coordinate) self.endedInteractiveDragging?(coordinate)
} }
} }
@@ -156,12 +159,12 @@ class LocationMapNode: ASDisplayNode, MKMapViewDelegate {
} }
func mapView(_ mapView: MKMapView, didDeselect view: MKAnnotationView) { func mapView(_ mapView: MKMapView, didDeselect view: MKAnnotationView) {
Queue.mainQueue().async { if let view = view as? LocationPinAnnotationView {
view.setZPosition(-1.0)
}
Queue.mainQueue().after(0.05) {
if mapView.selectedAnnotations.isEmpty { if mapView.selectedAnnotations.isEmpty {
if let view = view as? LocationPinAnnotationView {
view.setZPosition(-1.0)
}
self.annotationSelected?(nil) self.annotationSelected?(nil)
} }
} }