Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aat-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
targetSdk = 33

// Version Code can not be taken from from variable (f-droid version checker fail)
versionCode = 44
versionCode = 45
versionName = appVersionName
applicationId = appId
}
Expand Down
2 changes: 1 addition & 1 deletion aat-gtk/flatpak/ch.bailu.aat.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
"type": "git",
"url": "https://github.com/bailuk/AAT.git",
"commit": "42f12ab62c1ba9dc305461c1ef252b382d35c9ae"
"commit": "3b8e89bf405fd7967c0923014ed00fc3f21bbfb1"
},
"gradle-sources.json"
],
Expand Down
9 changes: 9 additions & 0 deletions aat-gtk/flatpak/ch.bailu.aat.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@
<content_rating type="oars-1.1"/>
<launchable type="desktop-id">ch.bailu.aat.desktop</launchable>
<releases>
<release version="1.30.1" date="2026-03-01">
<url type="details">https://github.com/bailuk/AAT/releases/tag/v1.30.1</url>
<description>
<p>v1.30.1 (45)</p>
<ul>
<li>Fix gpx-list crash when there is an empty gpx file</li>
</ul>
</description>
</release>
<release version="1.30" date="2026-02-16">
<url type="details">https://github.com/bailuk/AAT/releases/tag/v1.30</url>
<description>
Expand Down
2 changes: 1 addition & 1 deletion aat-lib/src/main/java/ch/bailu/aat_lib/Configuration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object Configuration {
const val appContact = "aat@bailu.ch"
const val mapsForgeVersion = "0.24.1"
const val jupiterVersion = "5.14.0"
const val appVersionName = "v1.30"
const val appVersionName = "v1.30.1"
const val focVersion = "1.3"
const val appCopyright = "© 2011-2026 Lukas Bai, GNU GPLv3 or later\n© Map and data OSM contributors ODbL 1.0"
const val appId = "ch.bailu.aat"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ class BoundingBoxE6 {
val longitudeSpanE6: Int
get() = abs(lonWestE6 - lonEastE6)
val center: LatLongE6
get() = LatLongE6(latSouthE6 + latitudeSpanE6 / 2, lonWestE6 + longitudeSpanE6 / 2)
get() {
val la = validate(latSouthE6 + latitudeSpanE6 / 2, MIN_LA, MAX_LA)
val lo = validate(lonWestE6 + longitudeSpanE6 / 2, MIN_LO, MAX_LO)
return LatLongE6(la, lo)
}

private fun validate() {
latNorthE6 = validate(latNorthE6, MIN_LA, MAX_LA)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ class GpxInformationDbSummary(private val directory: Foc, cursor: DbResultSet) :
}

private fun addEntryToList(entry: GpxInformation) {
val point = GpxPoint(
entry.getBoundingBox().center,
0f, entry.getTimeStamp()
)

val point = GpxPoint(entry.getBoundingBox().center, 0f, entry.getTimeStamp())
list.appendToCurrentSegment(point, GpxAttributesNull.NULL)
maxSpeed.add(entry.getSpeed())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,19 @@ class BoundingE6Test {
fun nullBounding() {
val boundingBoxE6 = BoundingBoxE6.NULL_BOX
assertEquals(false, boundingBoxE6.hasBounding())

val center = boundingBoxE6.center
val boundingBox = boundingBoxE6.toBoundingBox()
val center1 = boundingBox.centerPoint
assertEquals(0, center1.latitudeE6)
assertEquals(0, center1.longitudeE6)
assertEquals(0.0, center1.latitude)
assertEquals(0.0, center1.longitude)

val center2 = center.toLatLong()
assertEquals(90000000, center2.latitudeE6)
assertEquals(180000000, center2.longitudeE6)
assertEquals(90.0, center2.latitude)
assertEquals(180.0, center2.longitude)
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mapsForgeVersion=0.24.1
appName=AAT
appLongName=AAT Activity Tracker
appContact=aat@bailu.ch
appVersionName=v1.30
appVersionName=v1.30.1
appWebsite=https://github.com/bailuk/AAT
appId=ch.bailu.aat

Expand Down
3 changes: 3 additions & 0 deletions metadata/en-US/changelogs/45.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
v1.30.1 (45)

- Fix gpx-list crash when there is an empty gpx file