Merge pull request #16 from SciProgCentre/connect_timeout_exception_handling

Connect timeout exception handling
This commit is contained in:
Alexander Nozik 2022-08-26 14:23:51 +03:00 committed by GitHub
commit 6459246eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 64 additions and 54 deletions

View File

@ -132,4 +132,14 @@ public class MapFeatureGroup(
override val zoomRange: IntRange = defaultZoomRange, override val zoomRange: IntRange = defaultZoomRange,
) : MapFeature { ) : MapFeature {
override fun getBoundingBox(zoom: Int): GmcBox? = children.values.mapNotNull { it.getBoundingBox(zoom) }.wrapAll() override fun getBoundingBox(zoom: Int): GmcBox? = children.values.mapNotNull { it.getBoundingBox(zoom) }.wrapAll()
} }
public class MapTextFeature(
public val position: GeodeticMapCoordinates,
public val text: String,
override val zoomRange: IntRange = defaultZoomRange,
public val color: Color,
public val fontConfig: MapTextFeatureFont.() -> Unit,
) : MapFeature {
override fun getBoundingBox(zoom: Int): GmcBox = GmcBox(position, position)
}

View File

@ -143,4 +143,22 @@ public fun MapFeatureBuilder.group(
val map = MapFeatureBuilderImpl(emptyMap()).apply(builder).build() val map = MapFeatureBuilderImpl(emptyMap()).apply(builder).build()
val feature = MapFeatureGroup(map, zoomRange) val feature = MapFeatureGroup(map, zoomRange)
return addFeature(id, feature) return addFeature(id, feature)
} }
public fun MapFeatureBuilder.text(
position: GeodeticMapCoordinates,
text: String,
zoomRange: IntRange = defaultZoomRange,
color: Color = Color.Red,
font: MapTextFeatureFont.() -> Unit = { size = 16f },
id: FeatureId? = null,
): FeatureId = addFeature(id, MapTextFeature(position, text, zoomRange, color, font))
public fun MapFeatureBuilder.text(
position: Pair<Double, Double>,
text: String,
zoomRange: IntRange = defaultZoomRange,
color: Color = Color.Red,
font: MapTextFeatureFont.() -> Unit = { size = 16f },
id: FeatureId? = null,
): FeatureId = addFeature(id, MapTextFeature(position.toCoordinates(), text, zoomRange, color, font))

View File

@ -0,0 +1,5 @@
package center.sciprog.maps.compose
public expect class MapTextFeatureFont {
public var size: Float
}

View File

@ -1,35 +0,0 @@
package center.sciprog.maps.compose
import androidx.compose.ui.graphics.Color
import center.sciprog.maps.coordinates.GeodeticMapCoordinates
import center.sciprog.maps.coordinates.GmcBox
import org.jetbrains.skia.Font
public class MapTextFeature(
public val position: GeodeticMapCoordinates,
public val text: String,
override val zoomRange: IntRange = defaultZoomRange,
public val color: Color,
public val fontConfig: Font.() -> Unit,
) : MapFeature {
override fun getBoundingBox(zoom: Int): GmcBox = GmcBox(position, position)
}
public fun MapFeatureBuilder.text(
position: GeodeticMapCoordinates,
text: String,
zoomRange: IntRange = defaultZoomRange,
color: Color = Color.Red,
font: Font.() -> Unit = { size = 16f },
id: FeatureId? = null,
): FeatureId = addFeature(id, MapTextFeature(position, text, zoomRange, color, font))
public fun MapFeatureBuilder.text(
position: Pair<Double, Double>,
text: String,
zoomRange: IntRange = defaultZoomRange,
color: Color = Color.Red,
font: Font.() -> Unit = { size = 16f },
id: FeatureId? = null,
): FeatureId = addFeature(id, MapTextFeature(position.toCoordinates(), text, zoomRange, color, font))

View File

@ -0,0 +1,5 @@
package center.sciprog.maps.compose
import org.jetbrains.skia.Font
public actual typealias MapTextFeatureFont = Font

View File

@ -195,20 +195,21 @@ public actual fun MapView(
for (j in verticalIndices) { for (j in verticalIndices) {
for (i in horizontalIndices) { for (i in horizontalIndices) {
val id = TileId(zoom, i, j) val id = TileId(zoom, i, j)
//start all try {
val deferred = loadTileAsync(id) //start all
//wait asynchronously for it to finish val deferred = loadTileAsync(id)
launch { //wait asynchronously for it to finish
try { launch {
mapTiles += deferred.await() mapTiles += deferred.await()
} catch (ex: Exception) { }
if (ex !is CancellationException) { } catch (ex: Exception) {
//displaying the error is maps responsibility if (ex !is CancellationException) {
logger.error(ex) { "Failed to load tile with id=$id" } //displaying the error is maps responsibility
} logger.error(ex) { "Failed to load tile with id=$id" }
} }
} }
} }
} }
} }
} }
@ -232,6 +233,7 @@ public actual fun MapView(
feature.size, feature.size,
center = feature.center.toOffset() center = feature.center.toOffset()
) )
is MapRectangleFeature -> drawRect( is MapRectangleFeature -> drawRect(
feature.color, feature.color,
topLeft = feature.center.toOffset() - Offset( topLeft = feature.center.toOffset() - Offset(
@ -240,6 +242,7 @@ public actual fun MapView(
), ),
size = feature.size.toSize() size = feature.size.toSize()
) )
is MapLineFeature -> drawLine(feature.color, feature.a.toOffset(), feature.b.toOffset()) is MapLineFeature -> drawLine(feature.color, feature.a.toOffset(), feature.b.toOffset())
is MapArcFeature -> { is MapArcFeature -> {
val topLeft = feature.oval.topLeft.toOffset() val topLeft = feature.oval.topLeft.toOffset()
@ -252,6 +255,7 @@ public actual fun MapView(
drawPath(path, color = feature.color, style = Stroke()) drawPath(path, color = feature.color, style = Stroke())
} }
is MapBitmapImageFeature -> drawImage(feature.image, feature.position.toOffset()) is MapBitmapImageFeature -> drawImage(feature.image, feature.position.toOffset())
is MapVectorImageFeature -> { is MapVectorImageFeature -> {
val offset = feature.position.toOffset() val offset = feature.position.toOffset()
@ -262,6 +266,7 @@ public actual fun MapView(
} }
} }
} }
is MapTextFeature -> drawIntoCanvas { canvas -> is MapTextFeature -> drawIntoCanvas { canvas ->
val offset = feature.position.toOffset() val offset = feature.position.toOffset()
canvas.nativeCanvas.drawString( canvas.nativeCanvas.drawString(
@ -272,17 +277,20 @@ public actual fun MapView(
feature.color.toPaint() feature.color.toPaint()
) )
} }
is MapDrawFeature -> { is MapDrawFeature -> {
val offset = feature.position.toOffset() val offset = feature.position.toOffset()
translate(offset.x, offset.y) { translate(offset.x, offset.y) {
feature.drawFeature(this) feature.drawFeature(this)
} }
} }
is MapFeatureGroup -> { is MapFeatureGroup -> {
feature.children.values.forEach { feature.children.values.forEach {
drawFeature(zoom, it) drawFeature(zoom, it)
} }
} }
is MapPointsFeature -> { is MapPointsFeature -> {
val points = feature.points.map { it.toOffset() } val points = feature.points.map { it.toOffset() }
drawPoints( drawPoints(
@ -292,6 +300,7 @@ public actual fun MapView(
pointMode = feature.pointMode pointMode = feature.pointMode
) )
} }
else -> { else -> {
logger.error { "Unrecognized feature type: ${feature::class}" } logger.error { "Unrecognized feature type: ${feature::class}" }
} }

View File

@ -24,7 +24,7 @@ import kotlin.io.path.*
public class OpenStreetMapTileProvider( public class OpenStreetMapTileProvider(
private val client: HttpClient, private val client: HttpClient,
private val cacheDirectory: Path, private val cacheDirectory: Path,
parallelism: Int = 1, parallelism: Int = 4,
cacheCapacity: Int = 200, cacheCapacity: Int = 200,
) : MapTileProvider { ) : MapTileProvider {
private val semaphore = Semaphore(parallelism) private val semaphore = Semaphore(parallelism)
@ -37,7 +37,7 @@ public class OpenStreetMapTileProvider(
/** /**
* Download and cache the tile image * Download and cache the tile image
*/ */
private fun CoroutineScope.downloadImageAsync(id: TileId) = async(Dispatchers.IO) { private fun CoroutineScope.downloadImageAsync(id: TileId): Deferred<ImageBitmap> = async(Dispatchers.IO) {
id.cacheFilePath()?.let { path -> id.cacheFilePath()?.let { path ->
if (path.exists()) { if (path.exists()) {
@ -54,9 +54,7 @@ public class OpenStreetMapTileProvider(
semaphore.withPermit { semaphore.withPermit {
val url = id.osmUrl() val url = id.osmUrl()
val byteArray = client.get(url).readBytes() val byteArray = client.get(url).readBytes()
logger.debug { "Finished downloading map tile with id $id from $url" } logger.debug { "Finished downloading map tile with id $id from $url" }
id.cacheFilePath()?.let { path -> id.cacheFilePath()?.let { path ->
logger.debug { "Caching map tile $id to $path" } logger.debug { "Caching map tile $id to $path" }
@ -79,11 +77,11 @@ public class OpenStreetMapTileProvider(
//collect the result asynchronously //collect the result asynchronously
return async { return async {
val image = try { val image: ImageBitmap = try {
imageDeferred.await() imageDeferred.await()
} catch (ex: Exception) { } catch (ex: Exception) {
cache.remove(tileId) cache.remove(tileId)
if(ex !is CancellationException) { if (ex !is CancellationException) {
logger.error(ex) { "Failed to load tile image with id=$tileId" } logger.error(ex) { "Failed to load tile image with id=$tileId" }
} }
throw ex throw ex
@ -96,4 +94,4 @@ public class OpenStreetMapTileProvider(
public companion object { public companion object {
private val logger = KotlinLogging.logger("OpenStreetMapCache") private val logger = KotlinLogging.logger("OpenStreetMapCache")
} }
} }