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

Use asset geo location for story location picking

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-07-31 22:49:14 +02:00
parent 8805c0b7bd
commit 8201e493f3
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/LocationUI/Sources/LocationPickerControllerNode.swift
View File

@@ -449,9 +449,16 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
}
)
let venuesLocation: Signal<CLLocation?, NoError>
if let initialLocation = controller.initialLocation {
venuesLocation = .single(CLLocation(coordinate: initialLocation, altitude: 0.0, horizontalAccuracy: 1.0, verticalAccuracy: 1.0, timestamp: Date()))
} else {
venuesLocation = throttledUserLocation(userLocation)
}
let venues: Signal<([(TelegramMediaMap, String)], Int64)?, NoError> = .single(nil)
|> then(
throttledUserLocation(userLocation)
venuesLocation
|> mapToSignal { location -> Signal<([(TelegramMediaMap, String)], Int64)?, NoError> in
if let location = location, location.horizontalAccuracy > 0 {
return combineLatest(nearbyVenues(context: context, story: source == .story, latitude: location.coordinate.latitude, longitude: location.coordinate.longitude), personalVenues)
@@ -573,7 +580,11 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
switch strongSelf.mode {
case .share:
if source == .story {
title = "Add My Current Location"
if strongSelf.controller?.initialLocation != nil {
title = "Add This Location"
} else {
title = "Add My Current Location"
}
} else {
title = presentationData.strings.Map_SendMyCurrentLocation
}
@@ -635,7 +646,9 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
let previousUserLocation = previousUserLocation.swap(userLocation)
switch state.selectedLocation {
case .none:
if let userLocation = userLocation {
if let initialLocation = strongSelf.controller?.initialLocation {
strongSelf.headerNode.mapNode.setMapCenter(coordinate: initialLocation, animated: false)
} else if let userLocation = userLocation {
strongSelf.headerNode.mapNode.setMapCenter(coordinate: userLocation.coordinate, isUserLocation: true, animated: previousUserLocation != nil)
}
strongSelf.headerNode.mapNode.resetAnnotationSelection()
@@ -848,7 +861,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
self.locationManager.manager.stopUpdatingHeading()
}
func locationManager(_ manager: CLLocationManager, didUpdateHeading newHeading: CLHeading) {
self.headerNode.mapNode.userHeading = CGFloat(newHeading.magneticHeading)
}