Added promises to map and elevationSampler services

Also some minor renaming.