Move gaMapClick in MapService.js and refactoring