merge Map class with Location class