@@ -355,7 +355,8 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
                 net.searchStops(t, 8).forEach { out += SearchHit.StopHit(it) }
             }
         }
-        try { Places.search(t).take(6).forEach { out += SearchHit.PlaceHit(it) } } catch (_: Exception) { }
+        val near = near()
+        try { Places.search(t, near?.first, near?.second).take(6).forEach { out += SearchHit.PlaceHit(it) } } catch (_: Exception) { }
         return out
     }
 
@@ -410,6 +411,26 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
 
     // ======================= location =======================
 
+    /** the last fix [here] got, to rank nearby places first */
+    @Volatile private var lastHere: Location? = null
+
+    /** Roughly where you are, without asking: the last fix, the phone's last known one, or home. */
+    @SuppressLint("MissingPermission")
+    fun near(): Pair<Double, Double>? {
+        lastHere?.takeIf { System.currentTimeMillis() - it.time < 30 * 60_000 }?.let { return it.latitude to it.longitude }
+        val ctx = getApplication<Application>()
+        if (ContextCompat.checkSelfPermission(ctx, android.Manifest.permission.ACCESS_COARSE_LOCATION) ==
+            android.content.pm.PackageManager.PERMISSION_GRANTED) {
+            val lm = ctx.getSystemService(LocationManager::class.java)
+            val fix = try {
+                listOf(LocationManager.FUSED_PROVIDER, LocationManager.NETWORK_PROVIDER, LocationManager.GPS_PROVIDER)
+                    .mapNotNull { p -> runCatching { lm?.getLastKnownLocation(p) }.getOrNull() }.maxByOrNull { it.time }
+            } catch (_: Exception) { null }
+            if (fix != null) return fix.latitude to fix.longitude
+        }
+        return _settings.value.home?.let { it.lat to it.lon }
+    }
+
     /** Where the phone is, if location is allowed and on (null otherwise). */
     @SuppressLint("MissingPermission")
     suspend fun here(): Location? {
@@ -424,11 +445,11 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
             lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER) -> LocationManager.NETWORK_PROVIDER
             else -> return null
         }
-        lm.getLastKnownLocation(provider)?.takeIf { System.currentTimeMillis() - it.time < 120_000 }?.let { return it }
+        lm.getLastKnownLocation(provider)?.takeIf { System.currentTimeMillis() - it.time < 120_000 }?.let { lastHere = it; return it }
         val d = CompletableDeferred<Location?>()
         LocationManagerCompat.getCurrentLocation(lm, provider, android.os.CancellationSignal(),
                                                  ContextCompat.getMainExecutor(ctx)) { d.complete(it) }
-        return withTimeoutOrNull(12_000) { d.await() } ?: lm.getLastKnownLocation(provider)
+        return (withTimeoutOrNull(12_000) { d.await() } ?: lm.getLastKnownLocation(provider))?.also { lastHere = it }
     }
 
     // ======================= bus spotting =======================
 
@@ -170,20 +170,23 @@ object Places {
         return Place(name, where.joinToString(", ").ifEmpty { "Auckland" }, lat, lon, PlaceKind.Place)
     }
 
-    /** Addresses and places matching the text, Auckland first. */
+    /** Addresses and places matching the text, nearest [lat], [lon] first (the city if unknown). */
     @Suppress("UNCHECKED_CAST")
-    suspend fun search(q: String): List<Place> {
+    suspend fun search(q: String, lat: Double? = null, lon: Double? = null): List<Place> {
         val t = q.trim()
         if (t.length < 3) return emptyList()
-        (cache["s:$t"] as? List<Place>)?.let { return it }
-        val j = httpJson("https://photon.komoot.io/api/?q=${URLEncoder.encode(t, "UTF-8")}&lat=-36.87&lon=174.76" +
-                         "&limit=8&bbox=$BBOX&lang=en") as? JSONObject ?: return emptyList()
+        val la = lat ?: -36.87
+        val lo = lon ?: 174.76
+        val key = "s:$t@%.2f,%.2f".format(la, lo)
+        (cache[key] as? List<Place>)?.let { return it }
+        val j = httpJson("https://photon.komoot.io/api/?q=${URLEncoder.encode(t, "UTF-8")}&lat=$la&lon=$lo" +
+                         "&location_bias_scale=0.5&limit=8&bbox=$BBOX&lang=en") as? JSONObject ?: return emptyList()
         val out = ArrayList<Place>()
         j.arr("features").objects { f ->
             val c = f.obj("geometry")?.optJSONArray("coordinates") ?: return@objects
             out += label(f, c.optDouble(1), c.optDouble(0))
         }
-        cache["s:$t"] = out
+        cache[key] = out
         return out
     }
 
 
@@ -61,7 +61,10 @@ data class StopBoard(
     val departures: List<BusDeparture> = emptyList(),
     val updated: Long = 0,
     val error: String? = null,
-)
+) {
+    /** "to Britomart", or the stop's name when nothing says where its buses go */
+    val towards: String get() = if (headsign.isNotEmpty()) "to $headsign" else name.ifEmpty { "Stop $code" }
+}
 
 /** A train placed on the schematic map. */
 data class Train(
 
@@ -60,6 +60,8 @@ internal suspend fun tripUpdates(api: AtApi, tripIds: Collection<String>): Map<S
 
 class BusRepo(private val api: AtApi) {
     private val stops = HashMap<String, JSONObject>()                  // code -> attributes
+    /** where buses from each stop were last going, for when none are due (late at night) */
+    private val lastHead = HashMap<String, String>()
     private val schedule = HashMap<String, Pair<Long, List<BusDeparture>>>()
 
     suspend fun board(code: String, route: String): StopBoard {
@@ -103,7 +105,8 @@ class BusRepo(private val api: AtApi) {
             lat = attr.optDouble("stop_lat"),
             lon = attr.optDouble("stop_lon"),
             route = shown.firstOrNull()?.route ?: route,
-            headsign = shown.firstOrNull()?.headsign ?: trips.firstOrNull()?.headsign ?: "",
+            headsign = (shown.firstOrNull()?.headsign ?: trips.firstOrNull()?.headsign)?.also { lastHead[code] = it }
+                ?: lastHead[code] ?: RouteData.ROUTES[code]?.first?.removePrefix("to ") ?: "",
             departures = shown,
             updated = now,
         )
 
@@ -189,6 +189,39 @@ private fun Network.build(rk: Int, e: Int, arrive: Int, tau: Array<IntArray>, pT
     return RawIt(rk, arrive, legs)
 }
 
+/**
+ * The options worth showing, best first. RAPTOR finds the earliest arrivals,
+ * which at night can mean "leave at 3 am and wait three hours for the first
+ * train": those go when a much shorter trip gets there about as soon.
+ * Near-duplicates (same times give or take two minutes, more changes) go too.
+ * Best is door-to-door time, plus four minutes a change, plus half of
+ * how much later than the earliest it arrives (or earlier than the latest it
+ * leaves, arriving by a time).
+ */
+private fun rank(found: List<RawIt>, arriveBy: Boolean): List<RawIt> {
+    if (found.isEmpty()) return found
+    val slack = 120
+    fun dur(x: RawIt) = x.arrive - x.leaveAt()
+    val minArrive = found.minOf { it.arrive }
+    val maxLeave = found.maxOf { it.leaveAt() }
+    fun cost(x: RawIt): Double = dur(x) + 240.0 * maxOf(0, x.rides - 1) +
+        0.5 * (if (arriveBy) maxLeave - x.leaveAt() else x.arrive - minArrive)
+    val order = found.withIndex().associate { (i, x) -> x to i }
+    fun better(b: RawIt, a: RawIt) = cost(b) < cost(a) || (cost(b) == cost(a) && order.getValue(b) < order.getValue(a))
+    val kept = found.filter { a ->
+        found.none { b ->
+            if (b === a) return@none false
+            // as good in every way, give or take two minutes, and better overall
+            val same = b.arrive <= a.arrive + slack && b.leaveAt() >= a.leaveAt() - slack && b.rides <= a.rides && better(b, a)
+            // far shorter, and gets there (or leaves) within 45 minutes of it
+            val wasteful = dur(a) - dur(b) >= 30 * 60 && dur(b) <= dur(a) * 0.6 &&
+                (if (arriveBy) b.leaveAt() >= a.leaveAt() - 45 * 60 else b.arrive <= a.arrive + 45 * 60)
+            same || wasteful
+        }
+    }
+    return kept.sortedBy { cost(it) }
+}
+
 /**
  * Journeys from [from] to [to]. [time] is epoch seconds (leave at, or arrive
  * by); [dayStart] is the epoch second of this network's service-day midnight.
@@ -226,8 +259,9 @@ fun Network.plan(from: GeoPoint, to: GeoPoint, time: Long, dayStart: Long, arriv
         found.sortWith(compareByDescending<RawIt> { it.leaveAt() }.thenBy { it.arrive })
     } else {
         var at = t
-        for (i in 0 until 8) {
-            if (found.size >= count) break
+        // a few more than asked for: some get ranked out as wasteful
+        for (i in 0 until 10) {
+            if (found.size >= count + 3) break
             val res = raptor(access, egress, at, o, secPerM)
             if (res.isEmpty()) break
             addAll(res)
@@ -236,13 +270,7 @@ fun Network.plan(from: GeoPoint, to: GeoPoint, time: Long, dayStart: Long, arriv
         }
         found.sortWith(compareBy<RawIt> { it.arrive }.thenByDescending { it.leaveAt() })
     }
-    // drop options that are worse in every way than another one
-    val kept = found.filter { a ->
-        found.none { b ->
-            b !== a && b.arrive <= a.arrive && b.leaveAt() >= a.leaveAt() && b.rides <= a.rides &&
-                (b.arrive < a.arrive || b.leaveAt() > a.leaveAt() || b.rides < a.rides)
-        }
-    }
+    val kept = rank(found, arriveBy)
     return PlanResult(kept.take(count).map { describe(it, from, to, dayStart) }, direct.roundToInt(), walkOnly)
 }
 
 
@@ -39,6 +39,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.platform.LocalView
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavGraph.Companion.findStartDestination
@@ -57,7 +58,7 @@ private class Tab(val route: String, val label: String, val on: ImageVector, val
 
 private val TABS = listOf(
     Tab("home", "Home", Icons.Rounded.Home, Icons.Outlined.Home),
-    Tab("plan", "Directions", Icons.Rounded.Directions, Icons.Outlined.Directions),
+    Tab("plan", "Plan", Icons.Rounded.Directions, Icons.Outlined.Directions),
     Tab("live", "Live", Icons.Rounded.Map, Icons.Outlined.Map),
     Tab("trains", "Trains", Icons.Rounded.Train, Icons.Outlined.Train),
     Tab("more", "More", Icons.Rounded.Apps, Icons.Outlined.Apps),
@@ -115,7 +116,7 @@ fun AklApp(vm: AppViewModel, deepLink: StateFlow<String?>, consumeLink: () -> Un
                                             BadgedBox(badge = { Badge { Text("$mine") } }) { Icon(if (on) t.on else t.off, null) }
                                         } else Icon(if (on) t.on else t.off, null)
                                     },
-                                    label = { Text(t.label) },
+                                    label = { Text(t.label, maxLines = 1, softWrap = false, overflow = TextOverflow.Ellipsis) },
                                 )
                             }
                         }
 
@@ -183,7 +183,7 @@ fun BusCard(b: StopBoard, now: Long, frameT: State<Float>, index: Int, weather:
                 Column(Modifier.weight(1f)) {
                     // a soft shadow keeps the text readable over clouds and sun
                     val lift = TextStyle(shadow = Shadow(Color.Black.copy(alpha = 0.7f), Offset(0f, 1.5f), 8f))
-                    Text("to ${b.headsign.ifEmpty { "…" }}", color = Color.White, fontWeight = FontWeight.Bold,
+                    Text(b.towards, color = Color.White, fontWeight = FontWeight.Bold,
                          fontSize = 19.sp, style = lift)
                     Text(b.name.ifEmpty { "Stop ${b.code}" } + " · stop ${b.code}", color = Color.White,
                          fontSize = 12.sp, fontWeight = FontWeight.SemiBold, style = lift)
 
@@ -335,7 +335,7 @@ private fun NextUp(boards: List<StopBoard>, s: Settings, now: Long) {
                     Box(Modifier.size(10.dp).background(DirColors[i % 2], CircleShape))
                     Spacer(Modifier.width(10.dp))
                     Column {
-                        Text("to ${b.headsign.ifEmpty { "…" }}", style = MaterialTheme.typography.labelMedium,
+                        Text(b.towards, style = MaterialTheme.typography.labelMedium,
                              color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1)
                         Text(big, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Black, maxLines = 1)
                         Text(small, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1)