kscience/maps-kt
8
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases 1 Wiki Activity

Remove tile flicker on move

Browse Source
This commit is contained in:
Alexander Nozik 2023-03-16 10:54:40 +03:00
parent 4658418517
commit dcee205b7c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maps-kt-compose/src/jvmMain/kotlin/center/sciprog/maps/compose/mapViewJvm.kt
View File

@ -22,6 +22,7 @@ import center.sciprog.maps.features.zoomRange
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.supervisorScope
import mu.KotlinLogging import mu.KotlinLogging
import org.jetbrains.skia.Image
import org.jetbrains.skia.Paint import org.jetbrains.skia.Paint
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.max import kotlin.math.max
@ -47,7 +48,7 @@ public actual fun MapView(
features: FeatureGroup<Gmc>, features: FeatureGroup<Gmc>,
modifier: Modifier, modifier: Modifier,
): Unit = with(viewScope) { ): Unit = with(viewScope) {
val mapTiles = remember(mapTileProvider) { mutableStateListOf<MapTile>() } val mapTiles = remember(mapTileProvider) { mutableStateMapOf<TileId, Image>() }
// Load tiles asynchronously // Load tiles asynchronously
LaunchedEffect(viewPoint, canvasSize) { LaunchedEffect(viewPoint, canvasSize) {
@ -62,8 +63,6 @@ public actual fun MapView(
val bottom = (centerCoordinates.y - canvasSize.height.value / 2 / tileScale) val bottom = (centerCoordinates.y - canvasSize.height.value / 2 / tileScale)
val verticalIndices: IntRange = (toIndex(bottom)..toIndex(top)).intersect(indexRange) val verticalIndices: IntRange = (toIndex(bottom)..toIndex(top)).intersect(indexRange)
mapTiles.clear()
for (j in verticalIndices) { for (j in verticalIndices) {
for (i in horizontalIndices) { for (i in horizontalIndices) {
val id = TileId(intZoom, i, j) val id = TileId(intZoom, i, j)
@ -74,16 +73,20 @@ public actual fun MapView(
//wait asynchronously for it to finish //wait asynchronously for it to finish
launch { launch {
try { try {
mapTiles += deferred.await() val tile = deferred.await()
mapTiles[tile.id] = tile.image
} catch (ex: Exception) { } catch (ex: Exception) {
//displaying the error is maps responsibility //displaying the error is maps responsibility
logger.error(ex) { "Failed to load tile with id=$id" } logger.error(ex) { "Failed to load tile with id=$id" }
} }
} }
} }
mapTiles.keys.filter {
it.zoom != intZoom || it.j !in verticalIndices || it.i !in horizontalIndices
}.forEach {
mapTiles.remove(it)
}
} }
} }
} }
} }