Real satellite maps, what bus is coming, and a livelier bus screen

- MapLibre (open source) maps: Esri World Imagery for the satellite view,
  or LINZ's NZ aerials with a free Basemaps key; OpenFreeMap streets
- Bus route map is now a live satellite preview that opens full screen,
  with buses gliding between GPS fixes; tap one for what it is
- Trains: Diagram / Satellite / Map switch shows every train at its real
  GPS position
- Bus model from the vehicle label via assets/fleet.tsv (e.g. TR3884 ->
  Tranzurban CRRC eD12 MAX); the scene draws double-deckers and electrics
- Stops-away track with the last stop the bus passed, animated countdowns,
  pull to refresh, next-bus summary, Rangitoto and Maungakiekie backdrops

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011C2fAvFFcMRkaF7qSvRA1v

Author: claude

.github/workflows/build.yml

@@ -33,6 +33,7 @@ jobs:
       - name: Build
         env:
           AT_API_KEY: ${{ secrets.AT_API_KEY }}
+          LINZ_API_KEY: ${{ secrets.LINZ_API_KEY }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
         run: gradle :app:assembleRelease --no-daemon --stacktrace
 
@@ -41,7 +42,7 @@ jobs:
         continue-on-error: true
         env:
           AT_API_KEY: ${{ secrets.AT_API_KEY }}
-        run: python3 tools/fleet_survey.py --raw
+        run: python3 tools/fleet_survey.py
 
       - name: Name the APK
         run: cp app/build/outputs/apk/release/app-release.apk AKL-Live.apk

.github/workflows/screenshots.yml

@@ -39,6 +39,7 @@ jobs:
         if: inputs.apk == 'build'
         env:
           AT_API_KEY: ${{ secrets.AT_API_KEY }}
+          LINZ_API_KEY: ${{ secrets.LINZ_API_KEY }}
         run: |
           gradle :app:assembleRelease --no-daemon --stacktrace
           cp app/build/outputs/apk/release/app-release.apk AKL-Live.apk

app/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
 // built-in API key (enter one in the app's settings instead).
 val runNumber = (System.getenv("GITHUB_RUN_NUMBER") ?: "1").toInt()
 val atKey = System.getenv("AT_API_KEY") ?: ""
+val linzKey = System.getenv("LINZ_API_KEY") ?: ""
 val keystore = file("release.p12")
 
 android {
@@ -21,6 +22,9 @@ android {
         versionCode = runNumber
         versionName = "1.0.$runNumber"
         buildConfigField("String", "AT_API_KEY", "\"$atKey\"")
+        buildConfigField("String", "LINZ_API_KEY", "\"$linzKey\"")
+        // the map's native code: 64-bit phones (and the x86_64 emulator in CI)
+        ndk { abiFilters += listOf("arm64-v8a", "x86_64") }
     }
 
     signingConfigs {
@@ -68,4 +72,6 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
     implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
+    // open-source vector/raster maps (the satellite and street views)
+    implementation("org.maplibre.gl:android-sdk:12.3.1")
 }

app/src/main/assets/fleet.tsv

@@ -0,0 +1,20 @@
+# What bus is coming: AT's realtime feed labels every bus with its operator's
+# code and fleet number ("TR3884", "NB5014"). This maps fleet number ranges to
+# the model. tools/fleet_survey.py (a step in every CI build) lists the ranges
+# on the road that aren't covered here yet.
+#
+# Tab-separated: prefix, first, last, model, power (electric|diesel), decks (1|2)
+# Sources: AT Metro Wiki model pages, operator announcements, and the ranges
+# the survey sees running each route.
+
+# Tranzurban: Scania + BCI double-deckers from 2018 (NX2), CRRCs for the
+# Northwestern from 2024-25 (eT12 on the 11T/11W, eD12 on the WX1)
+TR	3300	3399	Scania K320UB	diesel	1
+TR	3500	3599	BCI CitiRider FBC6123	diesel	2
+TR	3810	3829	CRRC eT12 MAX	electric	1
+TR	3860	3889	CRRC eD12 MAX	electric	2
+
+# NZ Bus (Kinetic): the Enviro200 fleet, then CRRC electrics from 2022-23
+NB	4001	4354	Alexander Dennis Enviro200	diesel	1
+NB	5752	5786	CRRC eT12 MAX	electric	1
+NB	5800	5842	CRRC eT12 MAX	electric	1

app/src/main/java/nz/aryan/akllive/AppViewModel.kt

@@ -20,6 +20,8 @@ import nz.aryan.akllive.data.StopBoard
 import nz.aryan.akllive.data.TrainRepo
 import nz.aryan.akllive.data.TrainState
 import nz.aryan.akllive.data.TripDetail
+import nz.aryan.akllive.data.Fleet
+import nz.aryan.akllive.ui.Basemap
 import kotlin.math.atan2
 import kotlin.math.hypot
 
@@ -42,6 +44,14 @@ class Prefs(ctx: Context) {
         get() = p.getBoolean("keepOn", false)
         set(v) = p.edit().putBoolean("keepOn", v).apply()
     val keyIsBuiltIn get() = p.getString("key", null).isNullOrBlank() && BuildConfig.AT_API_KEY.isNotBlank()
+    /** LINZ Basemaps key for NZ's sharpest aerials; without one the satellite view uses Esri's imagery. */
+    var linzKey: String
+        get() = p.getString("linz", null)?.takeIf { it.isNotBlank() } ?: BuildConfig.LINZ_API_KEY
+        set(v) = p.edit().putString("linz", v.trim()).apply()
+    val linzIsBuiltIn get() = p.getString("linz", null).isNullOrBlank() && BuildConfig.LINZ_API_KEY.isNotBlank()
+    var basemap: Basemap
+        get() = if (p.getString("basemap", null) == "streets") Basemap.Streets else Basemap.Satellite
+        set(v) = p.edit().putString("basemap", if (v == Basemap.Streets) "streets" else "satellite").apply()
 }
 
 class AppViewModel(app: Application) : AndroidViewModel(app) {
@@ -54,6 +64,14 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
     val boards: StateFlow<List<StopBoard>> = _boards
     private val _busError = MutableStateFlow<String?>(null)
     val busError: StateFlow<String?> = _busError
+    /** true from a pull-to-refresh until the buses have reloaded */
+    private val _pulling = MutableStateFlow(false)
+    val pulling: StateFlow<Boolean> = _pulling
+
+    private val _basemap = MutableStateFlow(prefs.basemap)
+    val basemap: StateFlow<Basemap> = _basemap
+    private val _linzKey = MutableStateFlow(prefs.linzKey)
+    val linzKey: StateFlow<String> = _linzKey
 
     private val _trains = MutableStateFlow(TrainState())
     val trains: StateFlow<TrainState> = _trains
@@ -67,6 +85,7 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
     @Volatile private var visible = false
 
     init {
+        Fleet.load(app)
         viewModelScope.launch { loop(30_000) { refreshBuses() } }
         viewModelScope.launch { loop(15_000) { refreshTrains() } }
     }
@@ -79,6 +98,16 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
 
     fun refresh() { kick.tryEmit(Unit) }
 
+    fun pullRefresh() {
+        _pulling.value = true
+        refresh()
+    }
+
+    fun setBasemap(b: Basemap) {
+        prefs.basemap = b
+        _basemap.value = b
+    }
+
     private suspend fun loop(every: Long, work: suspend () -> Unit) {
         while (true) {
             while (!visible) delay(400)
@@ -98,6 +127,7 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
         }
         _boards.value = out
         _busError.value = out.firstNotNullOfOrNull { it.error }
+        _pulling.value = false
     }
 
     private suspend fun refreshTrains() {
@@ -146,8 +176,12 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
         }
     }
 
-    fun saveSettings(key: String, stops: String, route: String, place: String) {
+    fun saveSettings(key: String, stops: String, route: String, place: String, linz: String) {
         if (key.isNotBlank()) prefs.apiKey = key
+        if (linz.isNotBlank()) {
+            prefs.linzKey = linz
+            _linzKey.value = prefs.linzKey
+        }
         prefs.stops = stops.split(',', ' ').map { it.trim() }.filter { it.isNotEmpty() }
         prefs.route = route
         prefs.place = place

app/src/main/java/nz/aryan/akllive/data/Fleet.kt

@@ -0,0 +1,54 @@
+package nz.aryan.akllive.data
+
+import android.content.Context
+
+/** A bus's make and model (see assets/fleet.tsv). */
+class BusModel(val name: String, val electric: Boolean, val doubleDeck: Boolean) {
+    /** "CRRC eT12 MAX" -> "eT12 MAX", for tight spots. */
+    val short: String get() = MAKES.firstOrNull { name.startsWith(it) }?.let { name.removePrefix(it).trim() } ?: name
+
+    private companion object {
+        val MAKES = listOf("Alexander Dennis", "ADL", "BCI", "CRRC", "Geely", "Scania", "Yutong")
+    }
+}
+
+/** Who runs a bus and what it is, worked out from AT's vehicle label ("TR3884"). */
+class BusInfo(val operator: String?, val fleetNo: String, val model: BusModel?)
+
+object Fleet {
+    /** AT's operator codes, as they appear at the front of a vehicle label. */
+    private val OPERATORS = mapOf(
+        "NB" to "NZ Bus", "GB" to "Go Bus", "RT" to "Ritchies", "HE" to "Howick & Eastern",
+        "TR" to "Tranzurban", "BA" to "Bayes", "WB" to "Waiheke Bus Co",
+    )
+    private val LABEL = Regex("^([A-Za-z]{1,3})\\s*0*(\\d+)$")
+
+    private class Range(val prefix: String, val first: Int, val last: Int, val model: BusModel)
+
+    @Volatile private var ranges: List<Range> = emptyList()
+
+    fun load(ctx: Context) {
+        if (ranges.isNotEmpty()) return
+        ranges = try {
+            ctx.assets.open("fleet.tsv").bufferedReader().useLines { lines ->
+                lines.filter { it.isNotBlank() && !it.startsWith("#") }.mapNotNull { line ->
+                    val p = line.split('\t')
+                    if (p.size < 6) return@mapNotNull null
+                    Range(p[0].uppercase(), p[1].toInt(), p[2].toInt(),
+                          BusModel(p[3], p[4] == "electric", p[5].trim() == "2"))
+                }.toList()
+            }
+        } catch (e: Exception) {
+            emptyList()
+        }
+    }
+
+    /** Operator and model for a vehicle label; null if it isn't a bus fleet number. */
+    fun info(label: String): BusInfo? {
+        val m = LABEL.find(label.trim()) ?: return null
+        val prefix = m.groupValues[1].uppercase()
+        val num = m.groupValues[2].toIntOrNull() ?: return null
+        val model = ranges.firstOrNull { it.prefix == prefix && num in it.first..it.last }?.model
+        return BusInfo(OPERATORS[prefix], label.trim(), model)
+    }
+}