feat(ui/map): switch to protomaps
has POIs and also just looks a bit prettier :3
This commit is contained in:
parent
a79c95829e
commit
8925c943ab
2 changed files with 6 additions and 1 deletions
|
|
@ -8,4 +8,5 @@ object Constants {
|
||||||
// TODO
|
// TODO
|
||||||
const val devMode: Boolean = false
|
const val devMode: Boolean = false
|
||||||
const val updateKey: String = ""
|
const val updateKey: String = ""
|
||||||
|
const val protomapsKey: String = ""
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package moe.lava.banksia.ui.map
|
package moe.lava.banksia.ui.map
|
||||||
|
|
||||||
|
import androidx.compose.foundation.isSystemInDarkTheme
|
||||||
import androidx.compose.foundation.layout.WindowInsets
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
import androidx.compose.foundation.layout.add
|
import androidx.compose.foundation.layout.add
|
||||||
import androidx.compose.foundation.layout.asPaddingValues
|
import androidx.compose.foundation.layout.asPaddingValues
|
||||||
|
|
@ -9,6 +10,7 @@ import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import kotlinx.serialization.json.JsonObject
|
import kotlinx.serialization.json.JsonObject
|
||||||
|
import moe.lava.banksia.Constants
|
||||||
import moe.lava.banksia.ui.map.mappers.routeColorExpression
|
import moe.lava.banksia.ui.map.mappers.routeColorExpression
|
||||||
import moe.lava.banksia.ui.platform.BanksiaTheme
|
import moe.lava.banksia.ui.platform.BanksiaTheme
|
||||||
import org.maplibre.compose.camera.CameraPosition
|
import org.maplibre.compose.camera.CameraPosition
|
||||||
|
|
@ -42,9 +44,11 @@ internal fun MapLibreMaps(
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val variant = if (isSystemInDarkTheme()) "dark" else "light"
|
||||||
|
|
||||||
MaplibreMap(
|
MaplibreMap(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
baseStyle = BaseStyle.Uri("https://tiles.openfreemap.org/styles/positron"),
|
baseStyle = BaseStyle.Uri("https://api.protomaps.com/styles/v5/$variant/en.json?key=${Constants.protomapsKey}"),
|
||||||
cameraState = camPos,
|
cameraState = camPos,
|
||||||
options = MapOptions(
|
options = MapOptions(
|
||||||
ornamentOptions = OrnamentOptions(
|
ornamentOptions = OrnamentOptions(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue