Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Extract maptiler's map ids (#926)

Browse source 
Maptiler custom map ids are only useable by the account that create them. So if we hardcode them forkers won't be able to use the maps even if the bring in their own api key (because they can't access our maps with their api key).

Requires to set our map ids in `local.properties` for local development:
```
services.maptiler.lightMapId=9bc819c8-e627-474a-a348-ec144fe3d810
services.maptiler.darkMapId=dea61faf-292b-4774-9660-58fcef89a7f3
```
This commit is contained in:
Marco Romano 2023-07-20 14:29:06 +02:00 • committed by GitHub
parent 188af2ee98
commit 8648e8ba53
6 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapUrls.kt
View file

@ -35,7 +35,7 @@ fun staticMapUrl(
height: Int,
darkMode: Boolean,
): String {
return "${baseUrl(darkMode)}/static/${lon},${lat},${zoom}/${width}x${height}@2x.webp?key=${context.apiKey}&attribution=bottomleft"
return "${context.baseUrl(darkMode)}/static/${lon},${lat},${zoom}/${width}x${height}@2x.webp?key=${context.apiKey}&attribution=bottomleft"
}
/**
@ -60,15 +60,15 @@ private fun tileStyleUrl(
context: Context,
darkMode: Boolean,
): String {
return "${baseUrl(darkMode)}/style.json?key=${context.apiKey}"
return "${context.baseUrl(darkMode)}/style.json?key=${context.apiKey}"
}
private fun baseUrl(darkMode: Boolean) =
private fun Context.baseUrl(darkMode: Boolean) =
"https://api.maptiler.com/maps/" +
if (darkMode)
"dea61faf-292b-4774-9660-58fcef89a7f3"
getString(R.string.maptiler_dark_map_id)
else
"9bc819c8-e627-474a-a348-ec144fe3d810"
getString(R.string.maptiler_light_map_id)
private val Context.apiKey: String
get() = getString(R.string.maptiler_api_key)