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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-08-15 18:56:59 +02:00
parent 267d0d92ea
commit 492abd5a15
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
submodules/Geocoding/Sources/Geocoding.swift
View File

@ -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> { public func reverseGeocodeLocation(latitude: Double, longitude: Double, locale: Locale? = nil) -> Signal<ReverseGeocodedPlacemark?, NoError> {
return Signal { subscriber in return Signal { subscriber in
let geocoder = CLGeocoder() let geocoder = CLGeocoder()
geocoder.reverseGeocodeLocation(CLLocation(latitude: latitude, longitude: longitude), preferredLocale: locale, completionHandler: { placemarks, _ in geocoder.reverseGeocodeLocation(CLLocation(latitude: latitude, longitude: longitude), preferredLocale: locale, completionHandler: { placemarks, _ in
if let placemarks, let placemark = placemarks.first { if let placemarks, let placemark = placemarks.first {
var countryName = placemark.country let countryName = placemark.country
var countryCode = placemark.isoCountryCode let countryCode = placemark.isoCountryCode
if !shouldDisplayActualCountryName(latitude: latitude, longitude: longitude) {
countryName = nil
countryCode = nil
}
let result: ReverseGeocodedPlacemark let result: ReverseGeocodedPlacemark
if placemark.thoroughfare == nil && placemark.locality == nil && placemark.country == nil { if placemark.thoroughfare == nil && placemark.locality == nil && placemark.country == nil {
result = ReverseGeocodedPlacemark(name: placemark.name, street: placemark.name, city: nil, country: nil, countryCode: nil) result = ReverseGeocodedPlacemark(name: placemark.name, street: placemark.name, city: nil, country: nil, countryCode: nil)