Move Map class into Angular service