infokiosk.git

diff --git a/roadmap.adoc b/roadmap.adoc
index 6737ded796c84540dd04ffdc291727a257f28727..9c4011cd58808c26504ad64c13d18b157956bed4 100644
--- a/roadmap.adoc
+++ b/roadmap.adoc
@@ -12,10 +12,11 @@ * [:iphone:] fix landscape views (esp with 3-button navigation)
 
 == features
 * [:iphone: :back:] favourites
-** stops
+** joined stops
 ** lines
 ** searches, history, most searched
 ** [:busts_in_silhouette:] stored in accounts?
+* [:busts_in_silhouette:] ampelmännchen
 * [:repeat: :desktop_computer: :arrow_up_down: :iphone:] inexact times from GTFS (`stop_times/timepoint == 1`)
 * [:repeat: :desktop_computer: :arrow_up_down: :iphone:] different times for arrival and departure from GTFS
 * [:repeat: :desktop_computer: :arrow_up_down: :iphone:] more places: stations, platforms, doors, bike-rental stations
@@ -26,11 +27,10 @@ * [:desktop_computer: :arrow_up_down: :iphone: :back:] standard cache support
 ** last updated time of real time data from GTFS-RT/API
 ** duration between updates from config (per feed) or from upstream headers
 ** cache info + etag in headers in TRAFFIC
-** progress bar in clients
 * [:desktop_computer: :arrow_up_down: :iphone:] personal API keys (e.g. in Brussels)
 ** [:busts_in_silhouette:] stored in accounts
 * [:repeat:] new converter: GBFS
-* [:desktop_computer: :arrow_up_down: :iphone: :busts_in_shillouette:] HiveMind
+* [:desktop_computer: :arrow_up_down: :iphone: :busts_in_shilouette:] HiveMind
 ** auto-selecting current vehicle
 * [:iphone:] following vehicles on map
 ** searching on map
@@ -40,9 +40,9 @@ ** feed names, attributions, descriptions
 ** stops, agencies, lines, …
 * [:iphone:] motion
 ** FAB to results
-* :motorway: split `/.well-known/traffic` to servers so each can have own realm/security and API docs
+* [:motorway:] split `/.well-known/traffic` to servers so each can have own realm/security and API docs
 ** put hub in front
-** [:desktop_computer: :arrow_up_down: :iphone:] arrivals to terminus with less visibility
+* [:desktop_computer: :arrow_up_down: :iphone:] arrivals to terminus with less visibility
 * [:desktop_computer: :repeat:] GTFS frequencies
 * [:desktop_computer:] GTFS-RT extensions (Amsterdam?)
 * [:microscope:] integrate https://transitous.org[Transitous]
@@ -58,3 +58,14 @@ * [🧑‍💻] CLI: shuttle
 * [:apple:] iOS: orcharder
 * [:penguin:] Linux phone: ornithologist
 * [:spider_web:] web: ?
+
+
+---
+
+* :desktop_computer: — server
+* :microscope: — research
+* :iphone: — mobile client
+* :arrow_up_down: — TRAFFIC protocol
+* :repeat: — converter
+* :busts_in_shilouette: — accounts
+* :motorway: — proxy/server discovery