merge andi's car simulation with mapviewer