Rename Solution#map to Solution#city_map