Finishing migation of google maps API from v2 to v3