Restore interactions for map
Work in progress to add layer api