ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add location's description in timeline (#1236)

Browse Source 
* Refactor location URLs

* Add description in LocationRoomTimelineView

* Amend preview text

* Cleanup code
This commit is contained in:
Alfonso Grillo
2023-07-05 10:27:59 +02:00
committed by GitHub
parent b294278170
commit ce14d13962
5 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/MapLibre/MapTilerStaticMap.swift
+8 -10
View File
@@ -17,28 +17,26 @@
import CoreLocation
struct MapTilerStaticMap: MapTilerStaticMapProtocol {
private let lightURL: String
private let darkURL: String
private let lightURL: URL
private let darkURL: URL
private let key: String
init(key: String, lightURL: String, darkURL: String) {
init(key: String, lightURL: URL, darkURL: URL) {
self.lightURL = lightURL
self.darkURL = darkURL
self.key = key
}
func staticMapURL(for style: MapTilerStyle, coordinates: CLLocationCoordinate2D, zoomLevel: Double, size: CGSize, attribution: MapTilerAttributionPlacement) -> URL? {
var path: String
var url: URL
switch style {
case .light:
path = lightURL
url = lightURL
case .dark:
path = darkURL
url = darkURL
}
path.append(String(format: "/static/%f,%f,%f/%dx%d@2x.png", coordinates.longitude, coordinates.latitude, zoomLevel, Int(size.width), Int(size.height)))
guard var url = URL(string: path) else { return nil }
url.appendPathComponent(String(format: "static/%f,%f,%f/%dx%d@2x.png", coordinates.longitude, coordinates.latitude, zoomLevel, Int(size.width), Int(size.height)), conformingTo: .png)
url.append(queryItems: [.init(name: "attribution", value: attribution.rawValue)])
let authorization = MapTilerAuthorization(key: key)
return authorization.authorizeURL(url)
ElementX/Sources/Other/MapLibre/MapTilerStyleBuilder.swift
+7 -9
View File
@@ -17,28 +17,26 @@
import Foundation
struct MapTilerStyleBuilder: MapTilerStyleBuilderProtocol {
private let lightURL: String
private let darkURL: String
private let lightURL: URL
private let darkURL: URL
private let key: String
init(lightURL: String, darkURL: String, key: String) {
init(lightURL: URL, darkURL: URL, key: String) {
self.lightURL = lightURL
self.darkURL = darkURL
self.key = key
}
func dynamicMapURL(for style: MapTilerStyle) -> URL? {
var path: String
var url: URL
switch style {
case .light:
path = lightURL
url = lightURL
case .dark:
path = darkURL
url = darkURL
}
path.append("/style.json")
guard let url = URL(string: path) else { return nil }
url.appendPathComponent("style.json", conformingTo: .json)
let authorization = MapTilerAuthorization(key: key)
return authorization.authorizeURL(url)
}