layerOnTapController is laid out, but functionality is partial.
Dani's map stuff and Joni's route fixing merged