Enhanced Vineyard Descriptors combining UAV 2D and 3D Crop Models