ed: rename VehicleJourney::shape to VehicleJourney::shape_id