Add ability to use multiple tiled layers

Author: SPC-code

build.gradle.kts

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

demo/maps-wasm/build.gradle.kts

@@ -1,4 +1,6 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -9,7 +11,6 @@ plugins {
 //val ktorVersion: String by rootProject.extra
 
 kotlin {
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         browser()
         binaries.executable()

demo/scheme/build.gradle.kts

@@ -6,24 +6,27 @@ plugins {
     alias(spclibs.plugins.compose.jb)
 }
 
-val ktorVersion: String by rootProject.extra
-
 kotlin {
     jvm()
     jvmToolchain(17)
     sourceSets {
-        val jvmMain by getting {
+        commonMain {
             dependencies {
-                implementation(projects.mapsKtScheme)
                 implementation(compose.desktop.currentOs)
-                implementation("ch.qos.logback:logback-classic:1.2.11")
+                implementation(compose.components.resources)
+            }
+        }
+
+        jvmMain{
+            dependencies {
+                implementation(projects.mapsKtScheme)
+                implementation(spclibs.logback.classic)
             }
         }
-        val jvmTest by getting
     }
 }
 
-compose{
+compose {
     desktop {
         application {
             mainClass = "MainKt"
@@ -35,4 +38,8 @@ compose{
             }
         }
     }
+
+    resources {
+        generateResClass = always
+    }
 }

…cheme/src/jvmMain/resources/SPC-logo.png …n/composeResources/drawable/SPC-logo.pngdemo/scheme/src/jvmMain/resources/SPC-logo.png renamed to demo/scheme/src/commonMain/composeResources/drawable/SPC-logo.png demo/scheme/src/jvmMain/resources/SPC-logo.png renamed to demo/scheme/src/commonMain/composeResources/drawable/SPC-logo.png

@@ -6,18 +6,20 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import org.jetbrains.compose.resources.painterResource
 import space.kscience.kmath.geometry.Angle
 import space.kscience.maps.features.*
 import space.kscience.maps.scheme.*
 import space.kscience.maps.svg.exportToPng
 import space.kscience.maps.svg.exportToSvg
+import space.kscience.scheme.generated.resources.Res
+import space.kscience.scheme.generated.resources.middle_earth
 import java.awt.Desktop
 import java.nio.file.Files
 
@@ -28,7 +30,7 @@ fun App() {
         val scope = rememberCoroutineScope()
 
         val features = FeatureStore.remember(XYCoordinateSpace) {
-            background(1600f, 1200f) { painterResource("middle-earth.jpg") }
+            background(1600f, 1200f) { painterResource(Res.drawable.middle_earth) }
             circle(410.52737 to 868.7676).color(Color.Blue)
             text(410.52737 to 868.7676, "Shire").color(Color.Blue)
             circle(1132.0881 to 394.99127).color(Color.Red)

…heme/src/jvmMain/resources/joker2023.png …/composeResources/drawable/joker2023.pngdemo/scheme/src/jvmMain/resources/joker2023.png renamed to demo/scheme/src/commonMain/composeResources/drawable/joker2023.png demo/scheme/src/jvmMain/resources/joker2023.png renamed to demo/scheme/src/commonMain/composeResources/drawable/joker2023.png

@@ -2,16 +2,23 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
+import org.jetbrains.compose.resources.painterResource
 import space.kscience.maps.features.*
 import space.kscience.maps.scheme.*
 import space.kscience.maps.scheme.XYCoordinateSpace.Rectangle
+import space.kscience.scheme.generated.resources.Res
+import space.kscience.scheme.generated.resources.SPC_logo
+import space.kscience.scheme.generated.resources.joker2023
 
 
 fun main() = application {
-    Window(onCloseRequest = ::exitApplication, title = "Joker2023 demo", icon = painterResource("SPC-logo.png")) {
+    Window(
+        onCloseRequest = ::exitApplication,
+        title = "Joker2023 demo",
+        icon = painterResource(Res.drawable.SPC_logo)
+    ) {
         MaterialTheme {
 
             SchemeView(
@@ -22,7 +29,7 @@ fun main() = application {
                     }
                 )
             ) {
-                background(1734f, 724f, id = "background") { painterResource("joker2023.png") }
+                background(1734f, 724f, id = "background") { painterResource(Res.drawable.joker2023) }
                 group(id = "hall_1") {
                     polygon(
                         listOf(
@@ -66,9 +73,9 @@ fun main() = application {
                     icon(XY(815.60535, 342.71313), Icons.Default.Face).color(Color.Red)
                     icon(XY(743.751, 381.09064), Icons.Default.Face).color(Color.Red)
                     icon(XY(1349.6648, 417.36014), Icons.Default.Face).color(Color.Red)
-                    icon(XY (1362.4658, 287.21667), Icons.Default.Face).color(Color.Red)
+                    icon(XY(1362.4658, 287.21667), Icons.Default.Face).color(Color.Red)
                     icon(XY(208.24274, 317.08566), Icons.Default.Face).color(Color.Red)
-                    icon(XY (293.5827, 319.21915), Icons.Default.Face).color(Color.Red)
+                    icon(XY(293.5827, 319.21915), Icons.Default.Face).color(Color.Red)
                 }
             }
         }

…e/src/jvmMain/resources/middle-earth.jpg …mposeResources/drawable/middle-earth.jpgdemo/scheme/src/jvmMain/resources/middle-earth.jpg renamed to demo/scheme/src/commonMain/composeResources/drawable/middle-earth.jpg demo/scheme/src/jvmMain/resources/middle-earth.jpg renamed to demo/scheme/src/commonMain/composeResources/drawable/middle-earth.jpg

@@ -2,4 +2,4 @@ kotlin.code.style=official
 
 org.gradle.jvmargs=-Xmx4096m
 
-toolsVersion=0.16.0-kotlin-2.1.0
+toolsVersion=0.17.1-kotlin-2.1.20

demo/scheme/src/jvmMain/kotlin/Main.kt

@@ -15,18 +15,18 @@ kscience {
     commonMain{
         api(projects.mapsKtCore)
         api(projects.mapsKtFeatures)
+        api(dependencies.platform(spclibs.ktor.bom))
         api(compose.foundation)
-        api(project.dependencies.platform(spclibs.ktor.bom))
     }
     jvmMain{
         api("io.ktor:ktor-client-cio")
     }
     jvmTest{
-        implementation("io.ktor:ktor-client-cio")
-        implementation(compose.desktop.currentOs)
         implementation(spclibs.kotlinx.coroutines.test)
 
         implementation(spclibs.logback.classic)
+
+        implementation(compose.desktop.currentOs)
     }
 }
 
@@ -39,7 +39,3 @@ readme {
         id = "osm",
     ) { "OpenStreetMap tile provider." }
 }
-
-//tasks.getByName<Copy>("downloadWix"){
-//    duplicatesStrategy = DuplicatesStrategy.WARN
-//}