mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Various fixes
This commit is contained in:
parent
267d0d92ea
commit
492abd5a15
@ -70,39 +70,13 @@ public struct ReverseGeocodedPlacemark {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private let regions = [
|
||||
(
|
||||
CLLocationCoordinate2D(latitude: 46.046331, longitude: 32.398307),
|
||||
CLLocationCoordinate2D(latitude: 44.326515, longitude: 36.613495)
|
||||
)
|
||||
]
|
||||
|
||||
private func shouldDisplayActualCountryName(latitude: Double, longitude: Double) -> Bool {
|
||||
let coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
|
||||
let point = MKMapPoint(coordinate)
|
||||
for region in regions {
|
||||
let p1 = MKMapPoint(region.0)
|
||||
let p2 = MKMapPoint(region.1)
|
||||
let rect = MKMapRect(x: min(p1.x, p2.x), y: min(p1.y, p2.y), width: abs(p1.x - p2.x), height: abs(p1.y - p2.y))
|
||||
if rect.contains(point) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
public func reverseGeocodeLocation(latitude: Double, longitude: Double, locale: Locale? = nil) -> Signal<ReverseGeocodedPlacemark?, NoError> {
|
||||
return Signal { subscriber in
|
||||
let geocoder = CLGeocoder()
|
||||
geocoder.reverseGeocodeLocation(CLLocation(latitude: latitude, longitude: longitude), preferredLocale: locale, completionHandler: { placemarks, _ in
|
||||
if let placemarks, let placemark = placemarks.first {
|
||||
var countryName = placemark.country
|
||||
var countryCode = placemark.isoCountryCode
|
||||
if !shouldDisplayActualCountryName(latitude: latitude, longitude: longitude) {
|
||||
countryName = nil
|
||||
countryCode = nil
|
||||
}
|
||||
let countryName = placemark.country
|
||||
let countryCode = placemark.isoCountryCode
|
||||
let result: ReverseGeocodedPlacemark
|
||||
if placemark.thoroughfare == nil && placemark.locality == nil && placemark.country == nil {
|
||||
result = ReverseGeocodedPlacemark(name: placemark.name, street: placemark.name, city: nil, country: nil, countryCode: nil)
|
||||
|
Loading…
x
Reference in New Issue
Block a user