Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Location accuracy should be nullable

Browse source
This commit is contained in:
ganfra 2026-02-26 15:54:41 +01:00
parent b49fd7b467
commit 29f9640053
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
features/location/api/src/main/kotlin/io/element/android/features/location/api/Location.kt
View file

@ -19,7 +19,7 @@ private const val GEO_URI_REGEX = """geo:(?<latitude>-?\d+(?:\.\d+)?),(?<longitu
data class Location( data class Location(
val lat: Double, val lat: Double,
val lon: Double, val lon: Double,
val accuracy: Float, val accuracy: Float? = null,
) : Parcelable { ) : Parcelable {
companion object { companion object {
fun fromGeoUri(geoUri: String): Location? { fun fromGeoUri(geoUri: String): Location? {
@ -27,12 +27,15 @@ data class Location(
return Location( return Location(
lat = result.groups["latitude"]?.value?.toDoubleOrNull() ?: return null, lat = result.groups["latitude"]?.value?.toDoubleOrNull() ?: return null,
lon = result.groups["longitude"]?.value?.toDoubleOrNull() ?: return null, lon = result.groups["longitude"]?.value?.toDoubleOrNull() ?: return null,
accuracy = result.groups["uncertainty"]?.value?.toFloatOrNull() ?: 0f, accuracy = result.groups["uncertainty"]?.value?.toFloatOrNull(),
) )
} }
} }
fun toGeoUri(): String { fun toGeoUri(): String = buildString {
return "geo:$lat,$lon;u=$accuracy" append("geo:$lat,$lon")
if (accuracy != null) {
append(";u=$accuracy")
}
} }
} }

13
features/location/api/src/test/kotlin/io/element/android/features/location/api/LocationKtTest.kt
View file

@ -33,13 +33,13 @@ internal class LocationKtTest {
assertThat(Location.fromGeoUri("geo:1.234,5.678")).isEqualTo(Location( assertThat(Location.fromGeoUri("geo:1.234,5.678")).isEqualTo(Location(
lat = 1.234, lat = 1.234,
lon = 5.678, lon = 5.678,
accuracy = 0f, accuracy = null,
)) ))
assertThat(Location.fromGeoUri("geo:1,5")).isEqualTo(Location( assertThat(Location.fromGeoUri("geo:1,5")).isEqualTo(Location(
lat = 1.0, lat = 1.0,
lon = 5.0, lon = 5.0,
accuracy = 0f, accuracy = null,
)) ))
assertThat(Location.fromGeoUri("geo:1.234,5.678;u=3000")).isEqualTo(Location( assertThat(Location.fromGeoUri("geo:1.234,5.678;u=3000")).isEqualTo(Location(
@ -68,8 +68,15 @@ internal class LocationKtTest {
} }
@Test @Test
fun `encode geoUri - returns geoUri from a Location`() { fun `encode geoUri - returns geoUri from a Location without accuracy`() {
assertThat(Location(1.0, 2.0, null).toGeoUri())
.isEqualTo("geo:1.0,2.0")
}
@Test
fun `encode geoUri - returns geoUri from a Location with accuracy`() {
assertThat(Location(1.0, 2.0, 3.0f).toGeoUri()) assertThat(Location(1.0, 2.0, 3.0f).toGeoUri())
.isEqualTo("geo:1.0,2.0;u=3.0") .isEqualTo("geo:1.0,2.0;u=3.0")
} }
} }