Merge pull request #161 from geoadmin/release/2.3.0

Release 2.3.0
geoadmin · Jul 18, 2024 · fa58c53 · fa58c53
2 parents 4d1b0ff + 2f9ed1b
commit fa58c53
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Open Swiss Maps SDK
 
-## Version 2.1.0 (11.06.2024)
+## Version 2.3.0
+- update [mapscore to 2.3.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.3.0)
+- update [gps-layer to 2.3.0](https://github.com/openmobilemaps/layer-gps/releases/tag/2.3.0)
+
+## Version 2.2.0 (11.06.2024)
 - update [mapscore to 2.2.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.2.0)
 - update [gps-layer to 2.2.0](https://github.com/openmobilemaps/layer-gps/releases/tag/2.2.0)
 

diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/openmobilemaps/layer-gps.git",
         "state": {
           "branch": null,
-          "revision": "5c834f4cdc68f39436d78a155263d50a93e2bfc4",
-          "version": "2.2.0"
+          "revision": "18c9ed44f82b29a5537c5c42e879f313c3359453",
+          "version": "2.3.0"
         }
       },
       {
         "package": "MapCore",
         "repositoryURL": "https://github.com/openmobilemaps/maps-core.git",
         "state": {
           "branch": null,
-          "revision": "ba0a088cd692b3d33714a961da2ffdfc854d5e48",
-          "version": "2.2.0"
+          "revision": "9af34563358f90ced1f3d531375af1d7775bf0dd",
+          "version": "2.3.0"
         }
       },
       {

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

diff --git a/android/build.gradle b/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.2.0"
-	api "io.openmobilemaps:layer-gps:2.2.0"
+	api "io.openmobilemaps:mapscore:2.3.0"
+	api "io.openmobilemaps:layer-gps:2.3.0"
 	implementation "ch.ubique.android:djinni-support-lib:1.0.7"
 
 	testImplementation 'junit:junit:4.13.2'

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -29,8 +29,8 @@ android.enableR8.fullMode=false
 GROUP=ch.admin.geo.openswissmaps
 POM_ARTIFACT_ID=openswissmaps-sdk
 
-VERSION_NAME=2.2.0
-VERSION_CODE=2020000
+VERSION_NAME=2.3.0
+VERSION_CODE=2030000
 
 PUBLISH_VARIANT=release
 

diff --git a/android/src/main/java/ch/admin/geo/openswissmaps/util/SwisstopoOffscreenMapRenderer.kt b/android/src/main/java/ch/admin/geo/openswissmaps/util/SwisstopoOffscreenMapRenderer.kt
@@ -29,7 +29,7 @@ class SwisstopoOffscreenMapRenderer(context: Context, coroutineScope: CoroutineS
 		WmtsCapabilitiesResource.create(str)
 	}
 
-	var baseLayerZoomInfo = Tiled2dMapZoomInfo(1.0f, 0, false, false, true, true)
+	var baseLayerZoomInfo = Tiled2dMapZoomInfo(1.0f, 0, 0, false, false, true, true)
 	var baseLayer: Tiled2dMapRasterLayerInterface? = null
 		private set
 

diff --git a/ios/README.md b/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.2.0"))
+    .package(url: "https://github.com/geoadmin/lib-open-swiss-maps-sdk.git", .upToNextMajor(from: "2.3.0"))
 ]
 ```
 

diff --git a/shared/src/OpenSwissMapsSharedModule.cpp b/shared/src/OpenSwissMapsSharedModule.cpp
@@ -11,5 +11,5 @@
  #include "OpenSwissMapsSharedModule.h"
 
 std::string OpenSwissMapsSharedModule::version() {
-    return "2.2.0";
+    return "2.3.0";
 }
diff --git a/shared/src/layers/config/SwisstopoTiledLayerConfigFactory.cpp b/shared/src/layers/config/SwisstopoTiledLayerConfigFactory.cpp
@@ -177,7 +177,7 @@ SwisstopoTiledLayerConfigFactory::createRasterTileLayerConfigWithBaseUrl(Swissto
     auto configuration = WmtsLayerDescription(identifier, "", "", dimensions, SwisstopoTiledLayerConfigHelper::getBounds(), "2056", url + identifier +
                                               "/default/{Time}/2056/{TileMatrix}/{TileCol}/{TileRow}." + extension, "image/"+extension);
 
-    auto finalZoomInfo = zoomInfo.has_value() ? *zoomInfo : Tiled2dMapZoomInfo(0.65, numDrawPreviousLayers, true, false, true, true);
+    auto finalZoomInfo = zoomInfo.has_value() ? *zoomInfo : Tiled2dMapZoomInfo(0.65, numDrawPreviousLayers, 0, true, false, true, true);
 
     return createRasterTiledLayerConfigFromMetadata(configuration, maxZoom, finalZoomInfo);
 }