Fix text measurement outside of screen bug

Author: SPC-code

CHANGELOG.md

@@ -7,6 +7,7 @@
 - PNG export
 
 ### Changed
+- Features are now sealed. New `CustomFeature` is not drawn by default draw.
 - avoid drawing features with VisibleAttribute false
 - Move SVG export to `features` and make it usable for maps as well
 - Kotlin 2.1
@@ -16,9 +17,11 @@
 ### Removed
 
 ### Fixed
+- Text measurement outside of screen errors
 - Add alpha attribute comprehension for all standard features.
 - Package name for SerializeableAttribute
 
+
 ### Security
 
 ## 0.3.0 - 2024-06-04

build.gradle.kts

@@ -9,7 +9,7 @@ val kmathVersion: String by extra("0.4.0")
 
 allprojects {
     group = "space.kscience"
-    version = "0.4.0-dev-6"
+    version = "0.4.0-dev-7"
 
     repositories {
         mavenLocal()

maps-kt-compose/src/commonMain/kotlin/space/kscience/maps/compose/MapView.kt

@@ -13,7 +13,6 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.supervisorScope
 import org.jetbrains.skia.Image
 import space.kscience.attributes.Attributes
 import space.kscience.maps.coordinates.Gmc
@@ -75,20 +74,14 @@ public fun MapView(
                 for (j in verticalIndices) {
                     for (i in horizontalIndices) {
                         val id = TileId(intZoom, i, j)
-                        //ensure that failed tiles do not fail the application
-                        supervisorScope {
-                            //start all
-                            val deferred = loadTileAsync(id)
-                            //wait asynchronously for it to finish
-                            launch {
-                                try {
-                                    val tile = deferred.await()
-                                    tiles[tile.id] = tile.image
-                                } catch (ex: Exception) {
-                                    //displaying the error is maps responsibility
-                                    if (ex !is CancellationException) {
-                                        logger.error(ex) { "Failed to load tile with id=$id" }
-                                    }
+                        launch {
+                            try {
+                                val tile = loadTileAsync(id).await()
+                                tiles[tile.id] = tile.image
+                            } catch (ex: Exception) {
+                                //displaying the error is maps responsibility
+                                if (ex !is CancellationException) {
+                                    logger.error(ex) { "Failed to load tile with id=$id" }
                                 }
                             }
                         }

maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/FeatureDrawScope.kt

@@ -49,8 +49,8 @@ public abstract class FeatureDrawScope<T : Any>(
 
     public abstract fun drawText(text: String, position: Offset, attributes: Attributes)
 
-    public companion object{
-        public val logger: KLogger =  KotlinLogging.logger("FeatureDrawScope")
+    public companion object {
+        public val logger: KLogger = KotlinLogging.logger("FeatureDrawScope")
     }
 }
 
@@ -64,12 +64,14 @@ public class ComposeFeatureDrawScope<T : Any>(
     private val painterCache: Map<PainterFeature<T>, Painter>,
     private val textMeasurer: TextMeasurer?,
 ) : FeatureDrawScope<T>(state), DrawScope by drawScope {
+
     override fun drawText(text: String, position: Offset, attributes: Attributes) {
-        try {
-            //TODO don't draw text that is not on screen
-            drawText(textMeasurer ?: error("Text measurer not defined"), text, position)
-        } catch (ex: Exception) {
-            logger.error(ex) { "Failed to measure text" }
+        if (position.x in 0f..size.width && position.y in 0f..size.height) {
+            try {
+                drawText(textMeasurer ?: error("Text measurer not defined"), text, position)
+            } catch (ex: Exception) {
+                logger.error(ex) { "Failed to measure text" }
+            }
         }
     }
 
@@ -82,7 +84,7 @@ public class ComposeFeatureDrawScope<T : Any>(
 }
 
 @Composable
-public fun <T: Any> FeatureSet<T>.pointerCache(): Map<PainterFeature<T>, Painter> = key(features) {
+public fun <T : Any> FeatureSet<T>.pointerCache(): Map<PainterFeature<T>, Painter> = key(features) {
     features.values.filterIsInstance<PainterFeature<T>>().associateWith { it.getPainter() }
 }