Refactoring and fixing moving center of map to differente city