Computer-aided mapping