Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c25bcfbb authored by Ellen Poe's avatar Ellen Poe
Browse files

Merge branch 'ellenhp/update_deps' into 'main' 

Update dependency versions for December

See merge request e/os/cardinal!52
parents 560c42b5 3c621dca

cardinal-android/app/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ plugins { 
    alias(libs.plugins.hilt)

    alias(libs.plugins.cargo.ndk)

    alias(libs.plugins.detekt)

    kotlin("plugin.serialization") version "2.2.10"

    kotlin("plugin.serialization") version "2.2.21"

}



android {

cardinal-android/app/src/main/java/earth/maps/cardinal/data/BoundingBox.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ package earth.maps.cardinal.data 
data class BoundingBox(

    val north: Double, val south: Double, val east: Double, val west: Double

) {

    fun toGeoJsonBoundingBox(): io.github.dellisd.spatialk.geojson.BoundingBox {

        return io.github.dellisd.spatialk.geojson.BoundingBox(

    fun toGeoJsonBoundingBox(): org.maplibre.spatialk.geojson.BoundingBox {

        return org.maplibre.spatialk.geojson.BoundingBox(

            north = north,

            south = south,

            west = west,

cardinal-android/app/src/main/java/earth/maps/cardinal/data/Place.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


package earth.maps.cardinal.data



import io.github.dellisd.spatialk.geojson.Position

import org.maplibre.spatialk.geojson.Position



data class Place(

    val id: String? = null,

cardinal-android/app/src/main/java/earth/maps/cardinal/data/PolylineUtils.kt

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


package earth.maps.cardinal.data



import io.github.dellisd.spatialk.geojson.Position

import org.maplibre.spatialk.geojson.Position





/**

 * Utility functions for working with encoded polylines and route geometry.

cardinal-android/app/src/main/java/earth/maps/cardinal/data/ViewportPreferences.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package earth.maps.cardinal.data 
import android.content.Context

import android.content.SharedPreferences

import org.maplibre.compose.camera.CameraPosition

import org.maplibre.spatialk.geojson.Position



/**

 * Helper class to save and load viewport preferences using SharedPreferences.
@@ -68,7 +69,7 @@ class ViewportPreferences(context: Context) { 
        val tilt = prefs.getDouble(KEY_TILT, 0.0)



        return CameraPosition(

            target = io.github.dellisd.spatialk.geojson.Position(longitude, latitude),

            target = Position(longitude, latitude),

            zoom = zoom,

            bearing = bearing,

            tilt = tilt