Fixed CityMap to conform to new Location definition