Added new feature to draw routes with multiple points

Added function to draw custom markers with Kotlin DSL Canvas API

.gitignore

@@ -1,6 +1,6 @@
 build/
 .gradle/
 .idea/
-*.iml
+/*.iml
 
 mapCache/

.space.kts

@@ -0,0 +1,45 @@
+import kotlin.io.path.readText
+
+job("Build") {
+    gradlew("openjdk:11", "build")
+}
+
+job("Publish") {
+    startOn {
+        gitPush { enabled = false }
+    }
+    container("openjdk:11") {
+        env["SPACE_USER"] = Secrets("space_user")
+        env["SPACE_TOKEN"] = Secrets("space_token")
+        kotlinScript { api ->
+
+            val spaceUser = System.getenv("SPACE_USER")
+            val spaceToken = System.getenv("SPACE_TOKEN")
+
+            // write version to the build directory
+            api.gradlew("version")
+
+            //read version from build file
+            val version = java.nio.file.Path.of("build/project-version.txt").readText()
+
+            val revisionSuffix = if (version.endsWith("SNAPSHOT")) {
+                "-" + api.gitRevision().take(7)
+            } else {
+                ""
+            }
+
+            api.space().projects.automation.deployments.start(
+                project = api.projectIdentifier(),
+                targetIdentifier = TargetIdentifier.Key("maps-kt"),
+                version = version+revisionSuffix,
+                // automatically update deployment status based on a status of a job
+                syncWithAutomationJob = true
+            )
+            api.gradlew(
+                "publishAllPublicationsToSpaceRepository",
+                "-Ppublishing.space.user=\"$spaceUser\"",
+                "-Ppublishing.space.token=\"$spaceToken\"",
+            )
+        }
+    }
+}

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -0,0 +1 @@
+This repository is a work-in-progress implementation of Map-with-markers component for Compose-Multiplatform

build.gradle.kts

@@ -1,58 +1,90 @@
-import org.jetbrains.compose.compose
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-
 plugins {
-    kotlin("multiplatform")
-    id("org.jetbrains.compose")
-    `maven-publish`
-}
-
-group = "center.sciptog"
-version = "1.0-SNAPSHOT"
-
-repositories {
-    google()
-    mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    base
 }
 
 val ktorVersion by extra("2.0.3")
 
-kotlin {
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-        }
-        withJava()
-    }
-    sourceSets {
-        commonMain{
-            dependencies{
-                api(compose.runtime)
-                api(compose.foundation)
-                api(compose.material)
-                api("io.ktor:ktor-client-core:$ktorVersion")
-                implementation("io.ktor:ktor-client-cio:$ktorVersion")
-                implementation("io.github.microutils:kotlin-logging:2.1.23")
-            }
-        }
-        val jvmMain by getting {
-            dependencies {
-                implementation(compose.desktop.currentOs)
-                implementation("ch.qos.logback:logback-classic:1.2.11")
-            }
-        }
-        val jvmTest by getting
+allprojects {
+    group = "center.sciprog"
+    version = "0.1.0-SNAPSHOT"
+}
+
+tasks.create("version") {
+    group = "publishing"
+    val versionFile = project.buildDir.resolve("project-version.txt")
+    outputs.file(versionFile)
+    doLast {
+        versionFile.createNewFile()
+        versionFile.writeText(project.version.toString())
+        println(project.version)
     }
 }
 
-compose.desktop {
-    application {
-        mainClass = "MainKt"
-        nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "maps-kt-compose"
-            packageVersion = "1.0.0"
+subprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+
+    plugins.withId("maven-publish") {
+
+        configure<PublishingExtension> {
+            val vcs = "https://github.com/mipt-npm/maps-kt"
+
+            // Process each publication we have in this project
+            publications {
+                withType<MavenPublication> {
+                    pom {
+                        name.set(project.name)
+                        description.set(project.description)
+                        url.set(vcs)
+
+                        licenses {
+                            license {
+                                name.set("The Apache Software License, Version 2.0")
+                                url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                                distribution.set("repo")
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id.set("SPC")
+                                name.set("Scientific programming centre")
+                                organization.set("MIPT")
+                                organizationUrl.set("https://sciprog.center/")
+                            }
+                        }
+
+                        scm {
+                            url.set(vcs)
+                            tag.set(project.version.toString())
+                        }
+                    }
+                }
+            }
+
+            val spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven"
+            val spaceUser: String? = project.findProperty("publishing.space.user") as? String
+            val spaceToken: String? = project.findProperty("publishing.space.token") as? String
+
+            if (spaceUser != null && spaceToken != null) {
+                project.logger.info("Adding mipt-npm Space publishing to project [${project.name}]")
+
+                repositories.maven {
+                    name = "space"
+                    url = uri(spaceRepo)
+
+                    credentials {
+                        username = spaceUser
+                        password = spaceToken
+                    }
+                }
+            }
         }
     }
 }
+
+
+

demo/build.gradle.kts

@@ -0,0 +1,40 @@
+import org.jetbrains.compose.compose
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
+}
+
+val ktorVersion: String by rootProject.extra
+
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+        withJava()
+    }
+    sourceSets {
+        val jvmMain by getting {
+            dependencies {
+                implementation(projects.mapsKtCompose)
+                implementation(compose.desktop.currentOs)
+                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("ch.qos.logback:logback-classic:1.2.11")
+            }
+        }
+        val jvmTest by getting
+    }
+}
+
+compose.desktop {
+    application {
+        mainClass = "MainKt"
+        nativeDistributions {
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            packageName = "maps-kt-compose"
+            packageVersion = "1.0.0"
+        }
+    }
+}

demo/src/jvmMain/kotlin/Main.kt

@@ -6,6 +6,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.runtime.*
+import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
@@ -53,12 +54,33 @@ fun App() {
             ) {
                 val pointOne = 55.568548 to 37.568604
                 val pointTwo = 55.929444 to 37.518434
+                val pointThree = 55.742465 to 37.615812
 
                 image(pointOne, Icons.Filled.Home)
 
                 //remember feature Id
-                val circleId: FeatureId = circle(pointTwo)
+                val circleId: FeatureId = circle(
+                    centerCoordinates = pointTwo,
+                )
 
+                route(
+                    route = listOf(
+                        55.742465 to 37.615812,
+                        55.742713 to 37.616370,
+                        55.742815 to 37.616659,
+                        55.742320 to 37.617132,
+                        55.742086 to 37.616566,
+                        55.741715 to 37.616716
+                    )
+                )
+
+                custom(position = pointThree) {
+                    drawRect(
+                        color = Color.Red,
+                        topLeft = it,
+                        size = Size(20f, 20f)
+                    )
+                }
                 line(pointOne, pointTwo)
                 text(pointOne, "Home")
 

gradle.properties

@@ -1,4 +1,5 @@
 kotlin.code.style=official
 kotlin.version=1.6.10
+compose.version=1.1.1
 agp.version=4.2.2
-compose.version=1.1.1
+android.useAndroidX=true

maps-kt-compose/build.gradle.kts

@@ -0,0 +1,29 @@
+import org.jetbrains.compose.compose
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
+    `maven-publish`
+}
+
+val ktorVersion: String by rootProject.extra
+
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+    }
+    sourceSets {
+        commonMain{
+            dependencies{
+                api(projects.mapsKtCore)
+                api(compose.foundation)
+                api("io.ktor:ktor-client-core:$ktorVersion")
+            }
+        }
+        val jvmMain by getting
+        val jvmTest by getting
+    }
+}

maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/FeatureBuilder.kt

@@ -3,9 +3,13 @@ package centre.sciprog.maps.compose
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.snapshots.SnapshotStateMap
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.vector.ImageVector
+import centre.sciprog.maps.GeodeticMapCoordinates
+import centre.sciprog.maps.GmcBox
 
 typealias FeatureId = String
 
@@ -15,11 +19,12 @@ interface FeatureBuilder {
     fun build(): SnapshotStateMap<FeatureId, MapFeature>
 }
 
-internal class MapFeatureBuilder(initialFeatures: Map<FeatureId,MapFeature>) : FeatureBuilder {
+internal class MapFeatureBuilder(initialFeatures: Map<FeatureId, MapFeature>) : FeatureBuilder {
 
     private val content: SnapshotStateMap<FeatureId, MapFeature> = mutableStateMapOf<FeatureId, MapFeature>().apply {
         putAll(initialFeatures)
     }
+
     private fun generateID(feature: MapFeature): FeatureId = "@feature[${feature.hashCode().toUInt()}]"
 
     override fun addFeature(id: FeatureId?, feature: MapFeature): FeatureId {
@@ -31,6 +36,14 @@ internal class MapFeatureBuilder(initialFeatures: Map<FeatureId,MapFeature>) : F
     override fun build(): SnapshotStateMap<FeatureId, MapFeature> = content
 }
 
+fun FeatureBuilder.route(
+    route: List<Pair<Double, Double>>,
+    zoomRange: IntRange = defaultZoomRange,
+    stroke: Float = 2f,
+    color: Color = Color.Red,
+    id: FeatureId? = null
+) = addFeature(id, MapRouteFeature(route.map { it.toCoordinates() }, zoomRange, stroke, color))
+
 fun FeatureBuilder.circle(
     centerCoordinates: Pair<Double, Double>,
     zoomRange: IntRange = defaultZoomRange,
@@ -41,6 +54,21 @@ fun FeatureBuilder.circle(
     id, MapCircleFeature(centerCoordinates.toCoordinates(), zoomRange, size, color)
 )
 
+fun FeatureBuilder.custom(
+    position: Pair<Double, Double>,
+    id: FeatureId? = null,
+    customFeatureBuilder: DrawScope.(Offset) -> Unit,
+) = addFeature(id, object : MapCustomFeature(position = position.toCoordinates()) {
+    override fun drawFeature(drawScope: DrawScope, offset: Offset) {
+        customFeatureBuilder(drawScope, offset)
+    }
+
+    override fun getBoundingBox(zoom: Int): GmcBox {
+        return GmcBox(position.toCoordinates(), position.toCoordinates())
+    }
+
+})
+
 fun FeatureBuilder.line(
     aCoordinates: Pair<Double, Double>,
     bCoordinates: Pair<Double, Double>,

maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/LruCache.kt

@@ -1,4 +1,4 @@
-package centre.sciprog.maps
+package centre.sciprog.maps.compose
 
 import kotlin.jvm.Synchronized
 
@@ -9,32 +9,14 @@ internal class LruCache<K, V>(
     private val cache = linkedMapOf<K, V>()
 
     @Synchronized
-    fun getCache() = cache.toMap()
-
-    @Synchronized
-    fun put(key: K, value: V) = internalPut(key, value)
-
-    @Synchronized
-    operator fun get(key: K) = internalGet(key)
-
-    @Synchronized
-    fun remove(key: K) {
-        cache.remove(key)
+    fun put(key: K, value: V){
+        if (cache.size >= capacity) {
+            cache.remove(cache.iterator().next().key)
+        }
+        cache[key] = value
     }
 
-    @Synchronized
-    fun getOrPut(key: K, callback: () -> V): V {
-        val internalGet = internalGet(key)
-        return internalGet ?: callback().also { internalPut(key, it) }
-    }
-
-    @Synchronized
-    fun clear(newCapacity: Int? = null) {
-        cache.clear()
-        capacity = newCapacity ?: capacity
-    }
-
-    private fun internalGet(key: K): V? {
+    operator fun get(key: K): V? {
         val value = cache[key]
         if (value != null) {
             cache.remove(key)
@@ -43,11 +25,18 @@ internal class LruCache<K, V>(
         return value
     }
 
-    private fun internalPut(key: K, value: V) {
-        if (cache.size >= capacity) {
-            cache.remove(cache.iterator().next().key)
-        }
-        cache[key] = value
+    @Synchronized
+    fun remove(key: K) {
+        cache.remove(key)
+    }
+
+    @Synchronized
+    fun getOrPut(key: K, factory: () -> V): V = get(key) ?: factory().also { put(key, it) }
+
+    @Synchronized
+    fun reset(newCapacity: Int? = null) {
+        cache.clear()
+        capacity = newCapacity ?: capacity
     }
 
 }

maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/MapFeature.kt

@@ -1,9 +1,11 @@
 package centre.sciprog.maps.compose
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
@@ -31,6 +33,25 @@ class MapFeatureSelector(val selector: (zoom: Int) -> MapFeature) : MapFeature(d
 
 }
 
+abstract class MapCustomFeature(
+    zoomRange: IntRange = defaultZoomRange,
+    val position: GeodeticMapCoordinates
+) : MapFeature(zoomRange) {
+    abstract fun drawFeature(drawScope: DrawScope, offset: Offset)
+}
+
+class MapRouteFeature(
+    val route: List<GeodeticMapCoordinates>,
+    zoomRange: IntRange = defaultZoomRange,
+    val stroke: Float = 2f,
+    val color: Color = Color.Red
+) : MapFeature(zoomRange) {
+    override fun getBoundingBox(zoom: Int): GmcBox {
+        return GmcBox(route.first(), route.last())
+    }
+
+}
+
 class MapCircleFeature(
     val center: GeodeticMapCoordinates,
     zoomRange: IntRange = defaultZoomRange,
@@ -68,7 +89,7 @@ class MapBitmapImageFeature(
 }
 
 
-class MapVectorImageFeature (
+class MapVectorImageFeature(
     val position: GeodeticMapCoordinates,
     val painter: Painter,
     val size: Size,

maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/MapTileProvider.kt

@@ -2,6 +2,7 @@ package centre.sciprog.maps.compose
 
 import androidx.compose.ui.graphics.ImageBitmap
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlin.math.floor
 
 data class TileId(
@@ -16,7 +17,7 @@ data class MapTile(
 )
 
 interface MapTileProvider {
-    suspend fun loadTileAsync(tileIds: List<TileId>, scope: CoroutineScope, onTileLoad: (mapTile: MapTile) -> Unit)
+    fun CoroutineScope.loadTileAsync(tileId: TileId): Deferred<MapTile>
 
     val tileSize: Int get() = DEFAULT_TILE_SIZE
 

maps-kt-compose/src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt

@@ -9,14 +9,13 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.*
-import androidx.compose.ui.graphics.nativeCanvas
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.pointer.*
 import androidx.compose.ui.unit.*
 import centre.sciprog.maps.*
+import io.ktor.utils.io.CancellationException
+import kotlinx.coroutines.launch
 import mu.KotlinLogging
 import org.jetbrains.skia.Font
 import org.jetbrains.skia.Paint
@@ -28,6 +27,19 @@ private fun Color.toPaint(): Paint = Paint().apply {
     color = toArgb()
 }
 
+private fun IntRange.intersect(other: IntRange) = max(first, other.first)..min(last, other.last)
+
+internal fun MapViewPoint.move(deltaX: Double, deltaY: Double): MapViewPoint {
+    val newCoordinates = GeodeticMapCoordinates.ofRadians(
+        (focus.latitude + deltaY / scaleFactor).coerceIn(
+            -MercatorProjection.MAXIMUM_LATITUDE,
+            MercatorProjection.MAXIMUM_LATITUDE
+        ),
+        focus.longitude + deltaX / scaleFactor
+    )
+    return MapViewPoint(newCoordinates, zoom)
+}
+
 private val logger = KotlinLogging.logger("MapView")
 
 /**
@@ -148,39 +160,42 @@ actual fun MapView(
 
     // Load tiles asynchronously
     LaunchedEffect(viewPoint, canvasSize) {
-        val indexRange = 0 until 2.0.pow(zoom).toInt()
+        with(mapTileProvider) {
+            val indexRange = 0 until 2.0.pow(zoom).toInt()
 
-        val left = centerCoordinates.x - canvasSize.width.value / 2 / tileScale
-        val right = centerCoordinates.x + canvasSize.width.value / 2 / tileScale
-        val horizontalIndices = mapTileProvider.toIndex(left)
-            .rangeTo(mapTileProvider.toIndex(right))
-            .intersect(indexRange)
+            val left = centerCoordinates.x - canvasSize.width.value / 2 / tileScale
+            val right = centerCoordinates.x + canvasSize.width.value / 2 / tileScale
+            val horizontalIndices: IntRange = (toIndex(left)..toIndex(right)).intersect(indexRange)
 
-        val top = (centerCoordinates.y + canvasSize.height.value / 2 / tileScale)
-        val bottom = (centerCoordinates.y - canvasSize.height.value / 2 / tileScale)
-        val verticalIndices = mapTileProvider.toIndex(bottom)
-            .rangeTo(mapTileProvider.toIndex(top))
-            .intersect(indexRange)
+            val top = (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)
 
-        mapTiles.clear()
+            mapTiles.clear()
 
-        val tileIds = verticalIndices
-            .flatMap { j ->
-                horizontalIndices
-                    .asSequence()
-                    .map { TileId(zoom, it, j) }
+            for (j in verticalIndices) {
+                for (i in horizontalIndices) {
+                    val id = TileId(zoom, i, j)
+                    //start all
+                    val deferred = loadTileAsync(id)
+                    //wait asynchronously for it to finish
+                    launch {
+                        try {
+                            mapTiles += deferred.await()
+                        } catch (ex: Exception) {
+                            if (ex !is CancellationException) {
+                                //displaying the error is maps responsibility
+                                logger.error(ex) { "Failed to load tile with id=$id" }
+                            }
+                        }
+                    }
+                }
             }
-
-        mapTileProvider.loadTileAsync(
-            tileIds = tileIds,
-            scope = this
-        ) { mapTiles += it }
-
+        }
     }
 
-    // d
-    Canvas(canvasModifier) {
 
+    Canvas(canvasModifier) {
         fun WebMercatorCoordinates.toOffset(): Offset = Offset(
             (canvasSize.width / 2 + (x.dp - centerCoordinates.x.dp) * tileScale.toFloat()).toPx(),
             (canvasSize.height / 2 + (y.dp - centerCoordinates.y.dp) * tileScale.toFloat()).toPx()
@@ -218,7 +233,19 @@ actual fun MapView(
                         feature.color.toPaint()
                     )
                 }
-
+                is MapCustomFeature -> {
+                    val offset = feature.position.toOffset()
+                    feature.drawFeature(this, offset)
+                }
+                is MapRouteFeature -> {
+                    val points = feature.route.map { it.toOffset() }
+                    drawPoints(
+                        points = points,
+                        color = feature.color,
+                        pointMode = PointMode.Polygon,
+                        strokeWidth = feature.stroke
+                    )
+                }
             }
         }
 

maps-kt-compose/src/jvmMain/kotlin/centre/sciprog/maps/compose/OpenStreetMapTileProvider.kt

@@ -2,12 +2,16 @@ package centre.sciprog.maps.compose
 
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.toComposeImageBitmap
-import centre.sciprog.maps.LruCache
-import io.ktor.client.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import kotlinx.coroutines.*
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.statement.readBytes
+import io.ktor.utils.io.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import mu.KotlinLogging
 import org.jetbrains.skia.Image
 import java.net.URL
@@ -34,6 +38,7 @@ class OpenStreetMapTileProvider(
      * Download and cache the tile image
      */
     private fun CoroutineScope.downloadImageAsync(id: TileId) = async(Dispatchers.IO) {
+
         id.cacheFilePath()?.let { path ->
             if (path.exists()) {
                 try {
@@ -45,47 +50,48 @@ class OpenStreetMapTileProvider(
             }
         }
 
-        val url = id.osmUrl()
-        val byteArray = client.get(url).readBytes()
+        //semaphore works only for actual download
+        semaphore.withPermit {
+            val url = id.osmUrl()
+            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 ->
-            logger.debug { "Caching map tile $id to $path" }
+            id.cacheFilePath()?.let { path ->
+                logger.debug { "Caching map tile $id to $path" }
 
-            path.parent.createDirectories()
-            path.writeBytes(byteArray)
+                path.parent.createDirectories()
+                path.writeBytes(byteArray)
+            }
+
+            Image.makeFromEncoded(byteArray).toComposeImageBitmap()
+        }
+    }
+
+    override fun CoroutineScope.loadTileAsync(
+        tileId: TileId,
+    ): Deferred<MapTile> {
+
+        //start image download
+        val imageDeferred = cache.getOrPut(tileId) {
+            downloadImageAsync(tileId)
         }
 
-        Image.makeFromEncoded(byteArray).toComposeImageBitmap()
+        //collect the result asynchronously
+        return async {
+            val image = try {
+                imageDeferred.await()
+            } catch (ex: Exception) {
+                cache.remove(tileId)
+                if(ex !is CancellationException) {
+                    logger.error(ex) { "Failed to load tile image with id=$tileId" }
+                }
+                throw ex
+            }
+            MapTile(tileId, image)
+        }
     }
 
-    override suspend fun loadTileAsync(
-        tileIds: List<TileId>,
-        scope: CoroutineScope,
-        onTileLoad: (mapTile: MapTile) -> Unit,
-    ) {
-        tileIds
-            .forEach { id ->
-                try {
-                    scope.launch {
-                        semaphore.acquire()
-                        try {
-                            val image = cache.getOrPut(id) { downloadImageAsync(id) }
-                            val result = MapTile(id, image.await())
-                            onTileLoad(result)
-                        } catch (e: Exception) {
-                            cache.remove(id)
-                            throw e
-                        } finally {
-                            semaphore.release()
-                        }
-                    }
-                } catch (ex: Exception) {
-                    logger.error(ex) { "Failed to load tile $id" }
-                }
-            }
-    }
 
     companion object {
         private val logger = KotlinLogging.logger("OpenStreetMapCache")

maps-kt-core/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+    kotlin("multiplatform")
+    `maven-publish`
+}
+
+val ktorVersion: String by rootProject.extra
+
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+    }
+    js(IR){
+        browser()
+    }
+    sourceSets {
+        commonMain{
+            dependencies{
+                api("io.github.microutils:kotlin-logging:2.1.23")
+            }
+        }
+        val jvmMain by getting
+        val jvmTest by getting
+    }
+}

maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/GmcBox.kt

@@ -1,14 +1,12 @@
 package centre.sciprog.maps
 
-import androidx.compose.ui.unit.DpSize
-import centre.sciprog.maps.compose.MapFeature
 import kotlin.math.*
 
 class GmcBox(val a: GeodeticMapCoordinates, val b: GeodeticMapCoordinates)
 
 fun GmcBox(latitudes: ClosedFloatingPointRange<Double>, longitudes: ClosedFloatingPointRange<Double>) = GmcBox(
-    Gmc.ofRadians(latitudes.start, longitudes.start),
-    Gmc.ofRadians(latitudes.endInclusive, longitudes.endInclusive)
+    GeodeticMapCoordinates.ofRadians(latitudes.start, longitudes.start),
+    GeodeticMapCoordinates.ofRadians(latitudes.endInclusive, longitudes.endInclusive)
 )
 
 val GmcBox.center

maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/MapViewPoint.kt

@@ -1,7 +1,6 @@
 package centre.sciprog.maps
 
 import kotlin.math.pow
-import kotlin.math.roundToInt
 
 /**
  * Observable position on the map. Includes observation coordinate and [zoom] factor
@@ -13,20 +12,6 @@ data class MapViewPoint(
     val scaleFactor by lazy { WebMercatorProjection.scaleFactor(zoom) }
 }
 
-/**
- *
- */
-internal fun MapViewPoint.move(deltaX: Double, deltaY: Double): MapViewPoint {
-    val newCoordinates = GeodeticMapCoordinates.ofRadians(
-        (focus.latitude + deltaY / scaleFactor).coerceIn(
-            -MercatorProjection.MAXIMUM_LATITUDE,
-            MercatorProjection.MAXIMUM_LATITUDE
-        ),
-        focus.longitude + deltaX / scaleFactor
-    )
-    return MapViewPoint(newCoordinates, zoom)
-}
-
 fun MapViewPoint.move(delta: GeodeticMapCoordinates): MapViewPoint {
     val newCoordinates = GeodeticMapCoordinates.ofRadians(
         (focus.latitude + delta.latitude).coerceIn(

settings.gradle.kts

@@ -1,4 +1,7 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+rootProject.name = "maps-kt"
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 pluginManagement {
     repositories {
         google()
@@ -9,9 +12,17 @@ pluginManagement {
 
     plugins {
         kotlin("multiplatform").version(extra["kotlin.version"] as String)
+        kotlin("android").version(extra["kotlin.version"] as String)
+        id("com.android.application").version(extra["agp.version"] as String)
+        id("com.android.library").version(extra["agp.version"] as String)
         id("org.jetbrains.compose").version(extra["compose.version"] as String)
     }
 }
 
-rootProject.name = "maps-kt-compose"
+
+include(
+    ":maps-kt-core",
+    ":maps-kt-compose",
+    ":demo"
+)