[WIP] geotools integration

SPC-code · SPC-code · commit 67469b3d62ec · 2025-05-02T20:30:06.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,8 +5,6 @@ plugins {
     id("space.kscience.gradle.project")
 }
 
-val kmathVersion: String by extra("0.4.0")
-
 allprojects {
     group = "space.kscience"
     version = "0.4.0-dev-7"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,13 @@
+[versions]
+
+kmath = "0.4.2"
+geotools = "32.2"
+attributes = "0.3.0"
+
+[libraries]
+
+kmath-geometry = { module = "space.kscience:kmath-geometry", version.ref = "kmath" }
+gt-geotiff = { module = "org.geotools:gt-geotiff", version.ref = "geotools" }
+gt-shapefile = { module = "org.geotools:gt-shapefile", version.ref = "geotools" }
+gt-epsg-hsql = { module = "org.geotools:gt-epsg-hsql", version.ref = "geotools" }
+attributes-serialization = { module = "space.kscience:attributes-kt-serialization", version.ref = "attributes" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/maps-kt-compose/src/jvmMain/kotlin/space/kscience/maps/compose/mapExport.kt b/maps-kt-compose/src/jvmMain/kotlin/space/kscience/maps/compose/mapExport.kt
@@ -18,6 +18,15 @@ import space.kscience.maps.svg.generateSvg
 import java.nio.file.Path
 import kotlin.io.path.writeBytes
 
+/**
+ * Exports the features of a [FeatureSet] to an SVG file.
+ *
+ * @param viewPoint The `ViewPoint` providing the spatial context (focus and zoom level) for rendering the SVG.
+ * @param painterCache A map associating `PainterFeature` instances with their respective `Painter` objects,
+ * used for rendering the features in the SVG.
+ * @param size The dimensions (`Size`) of the SVG file to generate.
+ * @param path The file path where the generated SVG will be saved.
+ */
 public fun FeatureSet<Gmc>.exportToSvg(
     viewPoint: ViewPoint<Gmc>,
     painterCache: Map<PainterFeature<Gmc>, Painter>,
@@ -34,7 +43,6 @@ public fun FeatureSet<Gmc>.exportToSvg(
 }
 
 public fun FeatureSet<Gmc>.exportToPng(
-    mapTileProvider: MapTileProvider,
     viewPoint: ViewPoint<Gmc>,
     painterCache: Map<PainterFeature<Gmc>, Painter>,
     textMeasurer: TextMeasurer,
diff --git a/maps-kt-core/src/commonMain/kotlin/space/kscience/maps/coordinates/GmcCurve.kt b/maps-kt-core/src/commonMain/kotlin/space/kscience/maps/coordinates/GmcCurve.kt
@@ -4,7 +4,7 @@ import space.kscience.kmath.geometry.*
 import kotlin.math.*
 
 /**
- * A directed straight (geodetic) segment on a spheroid with given start, direction, end point and distance.
+ * A directed straight (geodetic) segment on a spheroid with the given start, direction, end point and distance.
  * @param forward coordinate of a start point with the forward direction
  * @param backward coordinate of an end point with the backward direction
  */
diff --git a/maps-kt-features/build.gradle.kts b/maps-kt-features/build.gradle.kts
@@ -34,10 +34,12 @@ kscience {
         api(compose.foundation)
         api(compose.material)
         api(compose.ui)
-        api("io.github.oshai:kotlin-logging:6.0.3")
+
+        api(libs.attributes.serialization)
+        api("io.github.oshai:kotlin-logging:7.0.7")
     }
 
     jvmMain{
-        api("org.jfree:org.jfree.svg:5.0.4")
+        api("org.jfree:org.jfree.svg:5.0.6")
     }
 }
diff --git a/maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/Feature.kt b/maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/Feature.kt
@@ -19,7 +19,6 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import org.jetbrains.skia.Font
 import space.kscience.attributes.Attributes
-import space.kscience.attributes.NameAttribute
 import space.kscience.kmath.geometry.Angle
 import space.kscience.kmath.nd.Structure2D
 
@@ -315,7 +314,7 @@ public data class VectorIconFeature<T : Any>(
 /**
  * An image that is bound to coordinates and is scaled (and possibly warped) together with them
  *
- * @param rectangle the size of background in scheme size units. The screen units to scheme units ratio equals scale.
+ * @param rectangle the size of the image in scheme size units. The screen units to scheme units ratio equals scale.
  */
 public data class ScalableImageFeature<T : Any>(
     override val space: CoordinateSpace<T>,
diff --git a/maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/drawFeature.kt b/maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/drawFeature.kt
@@ -28,7 +28,7 @@ public fun <T : Any> FeatureDrawScope<T>.drawFeature(
     val color = attributes[ColorAttribute] ?: Color.Red
     val alpha = attributes[AlphaAttribute] ?: 1f
     //avoid drawing invisible features
-    if(attributes[VisibleAttribute] == false) return
+    if (attributes[VisibleAttribute] == false) return
 
     when (feature) {
         is FeatureSelector -> drawFeature(feature.selector(state.zoom), attributes)
diff --git a/maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/mapFeatureAttributes.kt b/maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/mapFeatureAttributes.kt
@@ -6,7 +6,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.input.pointer.PointerEvent
 import androidx.compose.ui.input.pointer.PointerKeyboardModifiers
+import kotlinx.serialization.builtins.serializer
 import space.kscience.attributes.*
+import space.kscience.attributes.serialization.SerializableAttribute
+
+public object NameAttribute : SerializableAttribute<String>("name", String.serializer())
 
 public object ZAttribute : Attribute<Float>
 
diff --git a/maps-kt-features/src/commonTest/kotlin/center/sciprog/attributes/AttributesSerializationTest.kt b/maps-kt-features/src/commonTest/kotlin/center/sciprog/attributes/AttributesSerializationTest.kt
@@ -9,9 +9,10 @@ import kotlinx.serialization.modules.contextual
 import kotlinx.serialization.protobuf.ProtoBuf
 import kotlinx.serialization.serializer
 import space.kscience.attributes.Attributes
-import space.kscience.attributes.AttributesSerializer
-import space.kscience.attributes.NameAttribute
-import space.kscience.attributes.SerializableAttribute
+import space.kscience.attributes.serialization.AttributesSerializer
+import space.kscience.attributes.serialization.SerializableAttribute
+import space.kscience.maps.features.NameAttribute
+
 import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson/GeoJsonPropertiesAttribute.kt b/maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson/GeoJsonPropertiesAttribute.kt
@@ -2,6 +2,6 @@ package space.kscience.maps.geojson
 
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.serializer
-import space.kscience.attributes.SerializableAttribute
+import space.kscience.attributes.serialization.SerializableAttribute
 
 public object GeoJsonPropertiesAttribute : SerializableAttribute<JsonObject>("properties", serializer())
diff --git a/maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson/geoJsonToMap.kt b/maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson/geoJsonToMap.kt
@@ -4,7 +4,6 @@ import androidx.compose.ui.graphics.Color
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.intOrNull
 import kotlinx.serialization.json.jsonPrimitive
-import space.kscience.attributes.NameAttribute
 import space.kscience.maps.coordinates.Gmc
 import space.kscience.maps.features.*
 
diff --git a/maps-kt-geotiff/build.gradle.kts b/maps-kt-geotiff/build.gradle.kts
diff --git a/maps-kt-geotiff/src/main/kotlin/center/sciprog/maps/geotiff/geotiff.kt b/maps-kt-geotiff/src/main/kotlin/center/sciprog/maps/geotiff/geotiff.kt
diff --git a/maps-kt-geotools/build.gradle.kts b/maps-kt-geotools/build.gradle.kts
@@ -0,0 +1,30 @@
+plugins {
+    id("space.kscience.gradle.mpp")
+    `maven-publish`
+}
+
+repositories {
+    maven("https://repo.osgeo.org/repository/release/")
+    exclusiveContent {
+        forRepository {
+            maven("https://repo.osgeo.org/repository/release/")
+        }
+        filter {
+            includeGroup("javax.media")
+        }
+    }
+}
+
+kscience {
+    jvm()
+    useSerialization()
+    commonMain {
+        api(projects.mapsKtCore)
+        api(projects.mapsKtFeatures)
+    }
+    jvmMain {
+        api(libs.gt.geotiff)
+        api(libs.gt.epsg.hsql)
+        api(libs.gt.shapefile)
+    }
+}
diff --git a/maps-kt-geotools/src/jvmMain/kotlin/center/sciprog/maps/geotools/GeoToolsMapProjection.kt b/maps-kt-geotools/src/jvmMain/kotlin/center/sciprog/maps/geotools/GeoToolsMapProjection.kt
@@ -0,0 +1,97 @@
+package center.sciprog.maps.geotools
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem
+import org.geotools.api.referencing.operation.MathTransform
+import org.geotools.geometry.Position2D
+import org.geotools.referencing.CRS
+import space.kscience.kmath.geometry.degrees
+import space.kscience.maps.coordinates.GeodeticMapCoordinates
+import space.kscience.maps.coordinates.MapProjection
+import space.kscience.maps.coordinates.ProjectionCoordinates
+import space.kscience.maps.coordinates.meters
+import java.nio.file.Path
+import kotlin.io.path.extension
+import kotlin.io.path.readText
+
+/**
+ * Represents a map projection using the GeoTools library with a specified Coordinate Reference System (CRS).
+ *
+ * This class provides methods to convert between projection coordinates and geodetic map coordinates using the
+ * specified CRS. The transformation is handled using `MathTransform` instances.
+ *
+ * @param crs The coordinate reference system used for the projection.
+ */
+@Serializable(with = GeoToolsMapProjection.Serializer::class)
+public class GeoToolsMapProjection(
+    public val crs: CoordinateReferenceSystem
+) : MapProjection<ProjectionCoordinates> {
+
+    private val transform: MathTransform = CRS.findMathTransform(crs, crsEPSG4326, true)
+    private val inverted: MathTransform = transform.inverse()
+    override fun toGeodetic(pc: ProjectionCoordinates): GeodeticMapCoordinates {
+        val input = Position2D(pc.x.meters, pc.y.meters)
+        val output = Position2D()
+        transform.transform(input, output)
+        return GeodeticMapCoordinates(output.x.degrees, output.y.degrees)
+    }
+
+    override fun toProjection(gmc: GeodeticMapCoordinates): ProjectionCoordinates {
+        val input = Position2D(gmc.latitude.toDegrees().value, gmc.longitude.toDegrees().value)
+        val output = Position2D()
+        inverted.transform(input, output)
+        return ProjectionCoordinates(output.x.meters, output.y.meters)
+    }
+
+    override fun toString(): String = crs.name.toString()
+
+    public companion object {
+
+        private val crsEPSG4326 by lazy { CRS.decode("EPSG:4326") }
+
+        public val EPSG4326: GeoToolsMapProjection = GeoToolsMapProjection(crsEPSG4326)
+
+        public fun decode(string: String): GeoToolsMapProjection {
+            val crs = if (string.startsWith("file")) {
+                val crsFile = Path.of(string)
+                if (crsFile.extension == "wkt") {
+                    CRS.parseWKT(crsFile.readText())
+                } else {
+                    error("Unknown CRS file: $crsFile")
+                }
+            } else {
+                CRS.decode(string)
+            }
+            return GeoToolsMapProjection(crs)
+        }
+    }
+
+    public object Serializer : KSerializer<GeoToolsMapProjection> {
+
+        @Serializable
+        @SerialName("geoTools")
+        private class Proxy(val wkt: String)
+
+        private val serializer = Proxy.serializer()
+        override val descriptor: SerialDescriptor get() = serializer.descriptor
+
+        override fun deserialize(
+            decoder: Decoder,
+        ): GeoToolsMapProjection {
+            val proxy = decoder.decodeSerializableValue(serializer)
+            return GeoToolsMapProjection(CRS.parseWKT(proxy.wkt))
+        }
+
+        override fun serialize(encoder: Encoder, value: GeoToolsMapProjection) {
+            val proxy = Proxy(value.crs.toWKT())
+            encoder.encodeSerializableValue(serializer, proxy)
+        }
+    }
+}
+
+
diff --git a/maps-kt-geotools/src/jvmMain/kotlin/center/sciprog/maps/geotools/geotiff.kt b/maps-kt-geotools/src/jvmMain/kotlin/center/sciprog/maps/geotools/geotiff.kt
@@ -0,0 +1,64 @@
+package center.sciprog.maps.geotools
+
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.graphics.toComposeImageBitmap
+import org.geotools.api.geometry.Position
+import org.geotools.gce.geotiff.GeoTiffReader
+import org.geotools.util.factory.Hints
+import space.kscience.kmath.geometry.degrees
+import space.kscience.maps.coordinates.Gmc
+import space.kscience.maps.features.*
+import java.awt.image.BufferedImage
+import java.awt.image.RenderedImage
+import java.lang.Boolean
+import java.net.URL
+import kotlin.String
+
+
+private fun RenderedImage.toImageBitmap(): ImageBitmap {
+    // Convert RenderedImage to BufferedImage if needed
+    val bufferedImage = if (this is BufferedImage) {
+        this
+    } else {
+        val bi = BufferedImage(
+            this.width,
+            this.height,
+            BufferedImage.TYPE_INT_ARGB
+        )
+        val graphics = bi.createGraphics()
+        graphics.drawRenderedImage(this, null)
+        graphics.dispose()
+        bi
+    }
+
+    // Convert BufferedImage to Compose ImageBitmap
+    return bufferedImage.toComposeImageBitmap()
+}
+
+private fun Position.toGmc(): Gmc {
+    return Gmc(getOrdinate(0).degrees, getOrdinate(1).degrees)
+}
+
+public fun FeatureGroup<Gmc>.geoTiff(
+    geoTiffUrl: URL,
+    hints: Hints = Hints(Hints.FORCE_LONGITUDE_FIRST_AXIS_ORDER, Boolean.TRUE),
+    id: String? = null,
+): FeatureRef<Gmc, Feature<Gmc>> {
+    val reader = GeoTiffReader(geoTiffUrl, hints)
+    val coverage = reader.read(null)
+    val crs = coverage.coordinateReferenceSystem
+
+
+    val image = coverage.renderedImage.toImageBitmap()
+    val envelope = coverage.envelope2D
+    val rectangle: Rectangle<Gmc> = Rectangle(envelope.lowerCorner.toGmc(), envelope.upperCorner.toGmc())
+
+    return feature(
+        id,
+        ScalableImageFeature<Gmc>(space, rectangle) {
+            BitmapPainter(image)
+        }
+    )
+}
+
diff --git a/maps-kt-geotools/src/jvmMain/kotlin/center/sciprog/maps/geotools/shapeLoader.kt b/maps-kt-geotools/src/jvmMain/kotlin/center/sciprog/maps/geotools/shapeLoader.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
diff --git a/trajectory-kt/build.gradle.kts b/trajectory-kt/build.gradle.kts
diff --git a/trajectory-kt/src/commonMain/kotlin/space/kscience/attributes/SerializableAttribute.kt b/trajectory-kt/src/commonMain/kotlin/space/kscience/attributes/SerializableAttribute.kt

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ plugins {`
`5`	`5`	`id("space.kscience.gradle.project")`
`6`	`6`	`}`
`7`	`7`
`8`		`-val kmathVersion: String by extra("0.4.0")`
`9`		`-`
`10`	`8`	`allprojects {`
`11`	`9`	`group = "space.kscience"`
`12`	`10`	`version = "0.4.0-dev-7"`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,12 @@ kscience {`
`34`	`34`	`api(compose.foundation)`
`35`	`35`	`api(compose.material)`
`36`	`36`	`api(compose.ui)`
`37`		`- api("io.github.oshai:kotlin-logging:6.0.3")`
	`37`	`+`
	`38`	`+ api(libs.attributes.serialization)`
	`39`	`+ api("io.github.oshai:kotlin-logging:7.0.7")`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`jvmMain{`
`41`		`- api("org.jfree:org.jfree.svg:5.0.4")`
	`43`	`+ api("org.jfree:org.jfree.svg:5.0.6")`
`42`	`44`	`}`
`43`	`45`	`}`