Add geometry_type enum back