feat(route): every road is a row, and the one chosen is the one handed over

CP-057 rule 6 was never met: the comparison card was text, and Go always
sent the routed road. The second ORS road and the motorway-free road are now
rows like the routed one, chained, with their charge against it and its band.
One button per road re-plans the screen on it - stops, charger search, speed
what-if, drift companion - and Go hands that road's pathway to the car.

Past 100 km as the crow flies the second road is not asked for: ORS refuses
the whole request there, so it cost a refused request and a retry. The card
says so, and labels every figure estimated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: malys

CHANGELOG.md

@@ -12,6 +12,10 @@ All notable changes follow [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - **The consumption model trains on SWI68.** The 2026-10-16 bundle refused it for a negative
   weather term alone; the fit now drops that term instead, so the eco verdict, speed what-if,
   route what-if and energy breakdown can fill in.
+- **Route choices can be chosen (CP-057).** The second road the routing service sends back is a
+  row of the comparison, with its stops and its charge against the routed road; one button per
+  road re-plans the screen on it, and *Go* hands that road to the car. Past 100 km the second
+  road is no longer asked for, which saves a refused request and its retry.
 - **"This vehicle never publishes battery power" is gone on SWI68.** The pack fallback reads it;
   the screens now say it is not validated yet.
 

README.md

@@ -140,8 +140,9 @@ temporary file on USB. No archive copy accumulates on AAOS.
   (see [Configuration](#configuration)); without one, every other screen still works.
 - On that same plan: what slowing down would change. Where the road ahead is fast, the app
   shows what 130, 120, 110, 100 and 90 km/h would save in charge and cost in minutes, and
-  names the mildest slowdown that removes the charging stop. A second road comes back with the
-  same request and is compared on distance, time and charge. It never recommends a speed.
+  names the mildest slowdown that removes the charging stop. A second road, and a motorway-free
+  one when the plan needs a stop, are compared on distance, time and charge; pick one and the
+  plan and the hand-off to the car follow it. It never recommends a speed or a road.
 - A battery page: the pack's state of health measured rather than declared, how long since its
   charge gauge last had a full charge to anchor itself on, what the pack has been subjected to,
   and what the last charge cost — points gained, duration, and approximate energy and mean power

app/src/main/java/com/evsuite/chargepilot/ChargeStopActivity.kt

@@ -172,6 +172,16 @@
                 android:textAppearance="@style/Text.EV.Body"
                 android:visibility="gone" />
 
+            <!-- One button per road, filled in code. Choosing one re-plans the trip on it, and
+                 "Go" then hands that road to the car (CP-057 rule 6). -->
+            <LinearLayout
+                android:id="@+id/roadChoiceActions"
+                android:layout_width="1400dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_sm"
+                android:orientation="horizontal"
+                android:visibility="gone" />
+
             <TextView
                 android:id="@+id/chargeStopAttribution"
                 android:layout_width="1400dp"

app/src/main/res/layout/activity_charge_stop.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- One road of CP-057's comparison. Outlined, a 72dp target, and the chosen one says so in
+     its label rather than in a colour. -->
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.EV.Button.Outlined"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:layout_marginEnd="@dimen/spacing_md"
+    android:minHeight="72dp" />

app/src/main/res/layout/item_road_choice.xml

@@ -304,8 +304,6 @@ Consommation %6$s %% par km</string>
     <string name="charge_stop_grade">Montée et descente : %1$s %% de charge estimés, ± %2$s. Modélisé d’après le profil de l’itinéraire, jamais mesuré.</string>
     <string name="route_what_if_headline">À %1$d km/h vous n’auriez pas besoin de recharger, pour environ %2$d min de plus sur la route.</string>
     <string name="route_what_if_row">%1$d km/h sur %2$s km · +%3$d min · économise %4$s à %5$s %% de charge estimés</string>
-    <string name="route_what_if_alternative">Par %1$s : %2$s km, %3$s min, %4$s à %5$s %% de charge estimés.</string>
-    <string name="route_what_if_alternative_unnamed">Autre route : %1$s km, %2$s min, %3$s à %4$s %% de charge estimés.</string>
     <string name="route_what_if_unavailable_model">Ralentir : pas de comparaison. Ce micrologiciel n’a jamais entraîné de modèle de consommation.</string>
     <string name="route_what_if_unavailable_temperature">Ralentir : pas de comparaison. Aucune température extérieure exploitable.</string>
     <string name="route_what_if_unavailable_road">Ralentir : pas de comparaison. Rien sur cet itinéraire n’est parcouru assez vite pour ralentir.</string>
@@ -367,20 +365,29 @@ Consommation %6$s %% par km</string>
     <string name="charge_stop_charger">%1$s\u2009· à %2$s km · %3$s kW · %4$s</string>
     <!-- CP-057. Trois façons d’aller au même endroit. Chaque ligne porte une charge et un
          temps, ou aucun des deux : une économie sans son prix est un conseil déguisé en fait. -->
-    <string name="route_choices_title">Trois façons d\u2019y aller</string>
-    <string name="route_choices_planned">Itinéraire calculé · %1$s km · %2$s min</string>
+    <string name="route_choices_title">Façons d\u2019y aller</string>
     <string name="route_choices_slower">À %1$d km/h sur les sections rapides · %2$s km · +%3$s min</string>
-    <string name="route_choices_no_motorway">Sans autoroute · %1$s km · %2$s min · %3$s</string>
     <string name="route_choices_stop">un arrêt de recharge après %1$s km, environ %2$s %% restants en y arrivant</string>
     <string name="route_choices_stop_unknown">un arrêt de recharge après %1$s km</string>
     <string name="route_choices_no_stop">pas d\u2019arrêt de recharge, environ %1$s %% restants à l\u2019arrivée</string>
     <string name="route_choices_removes_stop">pas d\u2019arrêt de recharge</string>
     <string name="route_choices_refused">non calculable : %1$s</string>
     <string name="route_choices_slower_absent">Aucune vitesse sur cette route ne supprime l\u2019arrêt de recharge.</string>
     <string name="route_choices_no_motorway_absent">Aucune route sans autoroute n\u2019est revenue pour ce trajet.</string>
-    <string name="route_choices_delta_faster">%1$s min de moins</string>
     <string name="route_choices_delta_slower">+%1$s min</string>
     <string name="route_choices_requests">Ce plan a utilisé %1$d requête(s) d\u2019itinéraire sur l\u2019allocation de votre clé.</string>
+    <string name="route_choices_chosen">Choisie · %1$s</string>
+    <string name="route_choices_road">%1$s · %2$s km · %3$s min · %4$s</string>
+    <string name="route_choices_delta_fastest">la plus rapide</string>
+    <string name="route_choices_versus">%1$s km par rapport à l\u2019itinéraire calculé, %2$s à %3$s %% de charge estimés</string>
+    <string name="route_choices_second_not_offered">Au-delà de 100 km, le service d\u2019itinéraire ne propose pas de seconde route.</string>
+    <string name="route_choices_estimated">Tous ces chiffres sont estimés à partir de vos trajets enregistrés, jamais mesurés.</string>
+    <string name="route_choices_action">%1$s</string>
+    <string name="route_choices_action_chosen">Choisie : %1$s</string>
+    <string name="route_choices_name_planned">Itinéraire calculé</string>
+    <string name="route_choices_name_via">Par %1$s</string>
+    <string name="route_choices_name_second">Autre route</string>
+    <string name="route_choices_name_no_motorway">Sans autoroute</string>
     <!-- CP-056. Le passage de relais. La note n’est jamais repliée dans le libellé du bouton :
          un conducteur lit un bouton comme une promesse, et « geo: » ne porte qu’un point. -->
     <string name="charge_stop_navigate">Y aller</string>

app/src/main/res/values-fr/strings.xml

@@ -311,8 +311,6 @@ Spending %6$s %% per km</string>
     <!-- CP-049. Every saving is stated with the delay it costs, in the same sentence. -->
     <string name="route_what_if_headline">At %1$d km/h you would not need to charge, for about %2$d min more on the road.</string>
     <string name="route_what_if_row">%1$d km/h over %2$s km · +%3$d min · saves an estimated %4$s to %5$s %% of charge</string>
-    <string name="route_what_if_alternative">Via %1$s: %2$s km, %3$s min, an estimated %4$s to %5$s %% of charge.</string>
-    <string name="route_what_if_alternative_unnamed">Another road: %1$s km, %2$s min, an estimated %3$s to %4$s %% of charge.</string>
     <string name="route_what_if_unavailable_model">Slowing down: no comparison. This firmware has never trained a consumption model.</string>
     <string name="route_what_if_unavailable_temperature">Slowing down: no comparison. No usable outside-temperature reading.</string>
     <string name="route_what_if_unavailable_road">Slowing down: no comparison. Nothing on this route is driven fast enough to slow down from.</string>
@@ -374,20 +372,29 @@ Spending %6$s %% per km</string>
     <string name="charge_stop_charger">%1$s\u2009· %2$s km along · %3$s kW · %4$s</string>
     <!-- CP-057. Three ways to the same place. Every row carries both a charge and a time, or
          neither: a saving with its price left off is a recommendation wearing a fact's clothes. -->
-    <string name="route_choices_title">Three ways there</string>
-    <string name="route_choices_planned">As routed · %1$s km · %2$s min</string>
+    <string name="route_choices_title">Ways there</string>
     <string name="route_choices_slower">At %1$d km/h on the fast sections · %2$s km · +%3$s min</string>
-    <string name="route_choices_no_motorway">Avoiding motorways · %1$s km · %2$s min · %3$s</string>
     <string name="route_choices_stop">one charging stop after %1$s km, about %2$s %% left on reaching it</string>
     <string name="route_choices_stop_unknown">one charging stop after %1$s km</string>
     <string name="route_choices_no_stop">no charging stop, about %1$s %% left on arrival</string>
     <string name="route_choices_removes_stop">no charging stop</string>
     <string name="route_choices_refused">could not be worked out: %1$s</string>
     <string name="route_choices_slower_absent">No speed on this road removes the charging stop.</string>
     <string name="route_choices_no_motorway_absent">No motorway-free road came back for this trip.</string>
-    <string name="route_choices_delta_faster">%1$s min quicker</string>
     <string name="route_choices_delta_slower">+%1$s min</string>
     <string name="route_choices_requests">This plan used %1$d route request(s) of your key\u2019s allowance.</string>
+    <string name="route_choices_chosen">Chosen · %1$s</string>
+    <string name="route_choices_road">%1$s · %2$s km · %3$s min · %4$s</string>
+    <string name="route_choices_delta_fastest">fastest</string>
+    <string name="route_choices_versus">%1$s km against the routed road, an estimated %2$s to %3$s %% of charge</string>
+    <string name="route_choices_second_not_offered">Past 100 km the routing service offers no second road.</string>
+    <string name="route_choices_estimated">Every figure here is estimated from your recorded trips, never measured.</string>
+    <string name="route_choices_action">%1$s</string>
+    <string name="route_choices_action_chosen">Chosen: %1$s</string>
+    <string name="route_choices_name_planned">As routed</string>
+    <string name="route_choices_name_via">Via %1$s</string>
+    <string name="route_choices_name_second">Other road</string>
+    <string name="route_choices_name_no_motorway">No motorway</string>
     <!-- CP-056. The handoff. Its note is never folded into the button label: a driver reads a
          button as a promise, and "geo:" carries one point, so a route planned through a charging
          stop cannot be pinned by its endpoint. -->