New struct Map_tile to wrap all tile data (terrain, resources, etc).  Make City::display_map() use City_map::get_glyph().