Fix fixing real-time vehicle tracking

Changes

Previous release reduced vehicle traking to trip_id only, this to support trip-only data sources.
The 'fix' also removed the route-id tracking and thus reduced tracking for route-based sources.

Fixed