Merge pull request #165 from geoadmin/release/2.6.0

Release 2.6.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Open Swiss Maps SDK
 
+## Version 2.6.0
+- Update [mapscore to 2.6.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.6.0)
+- Update [gps-layer to 2.6.0](https://github.com/openmobilemaps/layer-gps/releases/tag/2.6.0)
+
 ## Version 2.5.1
 - Update [mapscore to 2.5.1](https://github.com/openmobilemaps/maps-core/releases/tag/2.5.1)
 - Update [gps-layer to 2.5.1](https://github.com/openmobilemaps/layer-gps/releases/tag/2.5.1)

Package.resolved

@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/openmobilemaps/layer-gps.git",
         "state": {
           "branch": null,
-          "revision": "fdebc3bd536009f8699e273787b5cd8a70577bec",
-          "version": "2.5.1"
+          "revision": "688ac7788709ccb5289f8b5848e04db4918a2b27",
+          "version": "2.6.0"
         }
       },
       {
         "package": "MapCore",
         "repositoryURL": "https://github.com/openmobilemaps/maps-core.git",
         "state": {
           "branch": null,
-          "revision": "cea64807bd1b2eb184bf03ac5a6d16d18270b063",
-          "version": "2.5.1"
+          "revision": "dc937f74b084606d7a4bb31c6195cb3785a5e3eb",
+          "version": "2.6.0"
         }
       },
       {

Package.swift

@@ -23,8 +23,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.5.1"),
-        .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: "2.5.1")
+        .package(url: "https://github.com/openmobilemaps/maps-core.git", from: "2.6.0"),
+        .package(url: "https://github.com/openmobilemaps/layer-gps.git", from: "2.6.0")
     ],
     targets: [
         .target(

android/README.md

@@ -41,7 +41,7 @@
 To add the OpenSwissMaps SDK to your Android project, add the following line to your build.gradle
 ```
 dependencies {
-  implementation 'ch.admin.geo.openswissmaps:openswissmaps-sdk:2.5.1'
+  implementation 'ch.admin.geo.openswissmaps:openswissmaps-sdk:2.6.0'
 }
 ```
 Make sure you have mavenCentral() listed in your project repositories. 

android/build.gradle

@@ -188,8 +188,8 @@ dependencies {
 	implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
 	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
-	api "io.openmobilemaps:mapscore:2.5.1"
-	api "io.openmobilemaps:layer-gps:2.5.1"
+	api "io.openmobilemaps:mapscore:2.6.0"
+	api "io.openmobilemaps:layer-gps:2.6.0"
 	implementation "ch.ubique.android:djinni-support-lib:1.0.7"
 
 	testImplementation 'junit:junit:4.13.2'

android/gradle.properties

@@ -29,8 +29,8 @@ android.enableR8.fullMode=false
 GROUP=ch.admin.geo.openswissmaps
 POM_ARTIFACT_ID=openswissmaps-sdk
 
-VERSION_NAME=2.5.1
-VERSION_CODE=2050100
+VERSION_NAME=2.6.0
+VERSION_CODE=2060000
 
 PUBLISH_VARIANT=release
 

android/src/main/java/ch/admin/geo/openswissmaps/util/SwisstopoMapRenderHelper.kt

@@ -6,7 +6,13 @@ import io.openmobilemaps.mapscore.map.util.MapViewRenderState
 import io.openmobilemaps.mapscore.shared.graphics.common.Vec2I
 import io.openmobilemaps.mapscore.shared.map.coordinates.RectCoord
 import io.openmobilemaps.mapscore.shared.map.loader.LoaderInterface
+import io.openmobilemaps.mapscore.shared.map.scheduling.ExecutionEnvironment
+import io.openmobilemaps.mapscore.shared.map.scheduling.TaskConfig
+import io.openmobilemaps.mapscore.shared.map.scheduling.TaskInterface
+import io.openmobilemaps.mapscore.shared.map.scheduling.TaskPriority
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class SwisstopoMapRenderHelper : MapRenderHelper() {
 
@@ -29,7 +35,15 @@ class SwisstopoMapRenderHelper : MapRenderHelper() {
 			mapRenderer.setupMap(loaders)
 			onSetupMap(mapRenderer)
 
-			render(mapRenderer, renderBounds, renderTimeoutSeconds, onStateUpdate)
+			mapRenderer.requireMapInterface().getScheduler().addTask(object : TaskInterface() {
+				override fun getConfig() = TaskConfig("render_task_start", 0, TaskPriority.NORMAL, ExecutionEnvironment.GRAPHICS)
+
+				override fun run() {
+					coroutineScope.launch(Dispatchers.Default) {
+						render(mapRenderer, renderBounds, renderTimeoutSeconds, onStateUpdate, true)
+					}
+				}
+			})
 		}
 	}
 

ios/README.md

@@ -48,7 +48,7 @@ Once you have your Swift package set up, adding Open Mobile Maps as a dependency
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/geoadmin/lib-open-swiss-maps-sdk.git", .upToNextMajor(from: "2.5.1"))
+    .package(url: "https://github.com/geoadmin/lib-open-swiss-maps-sdk.git", .upToNextMajor(from: "2.6.0"))
 ]
 ```