Combining feature aggregation and geometric similarity for re-identification of patterned animals