move map actor functionality to trait
tidy